跟新相关bug

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockout.java

@@ -6,8 +6,10 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Entity
@Table(name="t_mediicine_stockout")
@@ -101,6 +103,9 @@ public class Mediicinestockout extends UuidIdentityEntityWithOperator implements
     */
    private String upNum;
    @Transient
    private List<Mediicinestockoutdetail> mediicinestockoutdetails;
    public Mediicinestockout() {
    }
@@ -240,4 +245,13 @@ public class Mediicinestockout extends UuidIdentityEntityWithOperator implements
    public void setReplenishEquName(String replenishEquName) {
        this.replenishEquName = replenishEquName;
    }
    @Transient
    public List<Mediicinestockoutdetail> getMediicinestockoutdetails() {
        return mediicinestockoutdetails;
    }
    public void setMediicinestockoutdetails(List<Mediicinestockoutdetail> mediicinestockoutdetails) {
        this.mediicinestockoutdetails = mediicinestockoutdetails;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockoutdetail.java

@@ -7,6 +7,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -88,6 +89,9 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
    private String drugId;
    @Transient
    private String total;
    public Mediicinestockoutdetail() {
@@ -220,4 +224,13 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    @Transient
    public String getTotal() {
        return total;
    }
    public void setTotal(String total) {
        this.total = total;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockup.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -88,6 +89,9 @@ public class Mediicinestockup extends UuidIdentityEntityWithOperator implements
     */
    private Integer status;
    @Transient
    private Mediicinestockout mediicinestockout;
    public Mediicinestockup() {
    }
@@ -202,4 +206,13 @@ public class Mediicinestockup extends UuidIdentityEntityWithOperator implements
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public Mediicinestockout getMediicinestockout() {
        return mediicinestockout;
    }
    public void setMediicinestockout(Mediicinestockout mediicinestockout) {
        this.mediicinestockout = mediicinestockout;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinestockoutDao.java

@@ -16,6 +16,10 @@ public interface MediicinestockoutDao extends PagingAndSortingRepository<Mediici
    Integer countByUpNum(String upNum);
    //获取出库单
    @Query("select a from Mediicinestockout a where a.upNum =?1")
    Mediicinestockout selectBydocNum(String upNum);
    @Query(" select id as id from Mediicinestockout where replenishEr = ?1 and replenishEqu = ?2 and receiveState = ?3")

svr/svr-base/src/main/java/com/yihu/jw/base/dao/role/RoleDao.java

@@ -16,6 +16,7 @@ public interface RoleDao extends PagingAndSortingRepository<RoleDO, String>, Jpa
    List<RoleDO> findByNameAndStatus(String name,Integer status);
    List<RoleDO> findByStatus(Integer status);
    List<RoleDO> findByNameAndSaasIdAndStatus(String name,String saasId,Integer status);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -3,7 +3,9 @@ package com.yihu.jw.base.endpoint.a4endpoint;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MediicinestockoutdetailDao;
import com.yihu.jw.base.service.a3service.MedicineServive;
import com.yihu.jw.base.service.a3service.MedicineStockOutService;
import com.yihu.jw.base.service.a3service.MedicinedeviceService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.*;
@@ -38,6 +40,8 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private MedicineStockOutService stockOutService;
    @Value("${wechat.id}")
    private String wechatId;
@@ -853,8 +857,10 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "list", value = "货道、药品、数量、json", required = true)
            @RequestParam(value = "list" ) String json,
            @ApiParam(name = "userId", value = "用户id", required = true)
            @RequestParam(value = "userId") String userId) throws Exception {
        String str = deviceService.batchAddInventory(json, userId);
            @RequestParam(value = "userId") String userId,
            @ApiParam(name = "outDetailId", value = "出库id", required = false)
            @RequestParam(value = "outDetailId",required = false) String outDetailId) throws Exception {
        String str = deviceService.batchAddInventory(json, userId,outDetailId);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineUpEndpoint.java

@@ -159,8 +159,10 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "id", value = "备货单id", required = false)
            @RequestParam(value = "id",required = false) String id,
            @ApiParam(name = "status", value = "导入1，完成 2", required = false)
            @RequestParam(value = "status",required = false) Integer status) throws Exception {
        return success(stockupService.updateStockUpStatus(id,status));
            @RequestParam(value = "status",required = false) Integer status,
            @ApiParam(name = "equNum", value = "设备编码", required = false)
            @RequestParam(value = "equNum",required = false) String equNum) throws Exception {
        return success(stockupService.updateStockUpStatus(id,status,equNum));
    }
    @GetMapping(value = BaseRequestMapping.BaseUp.getUpDetailById)

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

@@ -60,6 +60,12 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private MediicinestockoutDao mediicinestockoutDao;
    @Autowired
    private MediicinestockoutdetailDao mediicinestockoutdetailDao;
    /**
     * 生成备货单
@@ -402,7 +408,24 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
     * @throws Exception
     */
    public List<Mediicinestockup> queryUpListByDeviceIdAndStatus(String replenishEr,String deviceId) throws Exception {
        return upDao.selectUpIdsByReplenishErAndReplenishEquAndStatusList(replenishEr,deviceId);
        List<Mediicinestockup> mediicinestockups = upDao.selectUpIdsByReplenishErAndReplenishEquAndStatusList(replenishEr,deviceId);
        for (Mediicinestockup mediicinestockup:mediicinestockups){
            Mediicinestockout mediicinestockout = mediicinestockoutDao.selectBydocNum(mediicinestockup.getId());
            List<Mediicinestockoutdetail> mediicinestockoutdetailList = mediicinestockoutdetailDao.getoutdetail(mediicinestockout.getId());
            for (Mediicinestockoutdetail detail:mediicinestockoutdetailList){
                String sql = "select sum(qty) as total from t_mediicinecabinet_inventory where id_device='"+deviceId+"' and drug_id ='"+detail.getDrugId()+"'";
                Map<String,Object> map = jdbcTemplate.queryForMap(sql);
                if (map.get("total")!=null){
                    detail.setTotal(map.get("total").toString());
                }else {
                    detail.setTotal("0");
                }
            }
            mediicinestockout.setMediicinestockoutdetails(mediicinestockoutdetailList);
            mediicinestockup.setMediicinestockout(mediicinestockout);
        }
        return mediicinestockups;
    }
    /**
     * 更新备货单、导入1，完成 2
@@ -411,11 +434,26 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
     * @return
     * @throws Exception
     */
    public Mediicinestockup updateStockUpStatus(String id,Integer status) throws Exception {
    public Mediicinestockup updateStockUpStatus(String id,Integer status,String equNum) throws Exception {
        Mediicinestockup mediicinestockup = upDao.findOne(id);
        mediicinestockup.setStatus(status);
        mediicinestockup.setUpdateTime(new Date());
        return upDao.save(mediicinestockup);
        mediicinestockup = upDao.save(mediicinestockup);
        Mediicinestockout mediicinestockout = mediicinestockoutDao.selectBydocNum(mediicinestockup.getId());
        List<Mediicinestockoutdetail> mediicinestockoutdetailList = mediicinestockoutdetailDao.getoutdetail(mediicinestockout.getId());
        for (Mediicinestockoutdetail detail:mediicinestockoutdetailList){
            String sql = "select sum(qty) as total from t_mediicinecabinet_inventory where equ_num='"+equNum+"' and drug_id ='"+detail.getDrugId()+"'";
            Map<String,Object> map = jdbcTemplate.queryForMap(sql);
            if (map.get("total")!=null){
                detail.setTotal(map.get("total").toString());
            }else {
                detail.setTotal("0");
            }
        }
        mediicinestockout.setMediicinestockoutdetails(mediicinestockoutdetailList);
        mediicinestockup.setMediicinestockout(mediicinestockout);
        return mediicinestockup;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -97,6 +97,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MedicineWarrayRuleDao medicineWarrayRuleDao;
    @Autowired
    private MediicinestockoutdetailDao mediicinestockoutdetailDao;
@@ -1957,7 +1959,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "t.del = 1 AND  \n" +
                    "t.`status` = 0 and ',"+ deviceIds +",' LIKE CONCAT('%,',t.id,',%')\n";
            if (!StringUtils.isEmpty(content)) {
                sencodSql += " AND CONCAT(IFNULL(tmu.`equ_num`,''), IFNULL(tmu.`equ_name`,'')) like '%" + content +"%'";
                sencodSql += " AND CONCAT(IFNULL(tmu.equ_num,''), IFNULL(tmu.equ_name,'')) like '%" + content +"%'";
            }
             deviceList = hibenateUtils.createSQLQuery(sencodSql);
        } else {
@@ -2050,7 +2052,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "t.del = 1 AND  \n" +
                    "t.`status` = 0 and ',"+ belongCommunitys +",' LIKE CONCAT('%,',t.belong_community,',%')\n";
            if (!StringUtils.isEmpty(content)) {
                sencodSql += " AND CONCAT(IFNULL(tmu.`equ_num`,''), IFNULL(tmu.`equ_name`,'')) like '%" + content +"%'";
                sencodSql += " AND CONCAT(IFNULL(tmu.equ_num,''), IFNULL(tmu.equ_name,'')) like '%" + content +"%'";
            }
@@ -2584,7 +2586,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                stringObjectMap.put("lastTime",DateUtil.dateToStrLong(drugInventoryRecord.getCreateTime()));
                stringObjectMap.put("lastQuanty",drugInventoryRecord.getQuantity());
                UserDO userDO = userDao.findById(drugInventoryRecord.getCreateUser());
                stringObjectMap.put("createName",userDO.getName());
                if (userDO!=null){
                    stringObjectMap.put("createName",userDO.getName());
                }
            }else {
                stringObjectMap.put("lastTime",null);
                stringObjectMap.put("lastQuanty",null);
@@ -3947,6 +3951,10 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            //下架时，清空库存
            if ("0".equals(status)) {
                inventory.setQty("0");
                inventory.setDrugCode(null);
                inventory.setDrugId(null);
                inventory.setDrugName(null);
                inventory.setPrice(null);
                //设置额定库存
                inventory.setRatedInventory(0);
            }
@@ -4721,7 +4729,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Transactional(rollbackFor = Exception.class)
    public String batchAddInventory(String json, String userId) throws Exception{
    public String batchAddInventory(String json, String userId,String outDetailId) throws Exception{
        JSONObject result = new JSONObject();
        JSONObject jsonObject = JSONObject.parseObject(json);
        JSONArray cargoList = jsonObject.getJSONArray("list");
@@ -4730,6 +4738,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        int total = 0;
        for (Object obj : cargoList) {
            InventoryDO inventoryDO = null;
            try {
@@ -4765,8 +4774,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    updateMediicinecabineInventoryById(inventoryDO.getCargoId(), inventoryDO.getDrugId(), inventoryDO.getQty() + "", userId);
                }
            }
            total+=inventoryDO.getQty();
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(outDetailId)){
            Mediicinestockoutdetail detail =mediicinestockoutdetailDao.findOne(outDetailId);
            detail.setBatchNum(total+"");
            mediicinestockoutdetailDao.save(detail);
        }
        result.put("response", ConstantUtils.SUCCESS);
        result.put("msg", ConstantUtils.SUCCESS);
        return result.toJSONString();