Merge branch 'medicare' of liubing/wlyy2.0 into medicare

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

@@ -20,7 +20,7 @@ public class MedicineDrugInventoryRecord extends UuidIdentityEntityWithOperator
     */
    private String equNum;
    /**
     *  记录类型，1补货，2换货，3上架，4下架
     *  记录类型，1补货，2换货，3上架，4下架，5货到修改记录日志
     */
    private String type;
    /**

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

@@ -761,6 +761,24 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        String deviceID = "";
        //true,标识当前操作为合并货道操作
        MedicineDrugInventoryRecord inventoryModifyRecord = null;
        boolean modifyRecordFlag = false;
        List<String> mergeCargoS = new ArrayList<>();
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(cargoIds)){
            modifyRecordFlag = true;
            inventoryModifyRecord = new MedicineDrugInventoryRecord();
            inventoryModifyRecord.setOldDrugId(null);
            inventoryModifyRecord.setDrugId(null);
            inventoryModifyRecord.setMergeState(isMerge?"2":"1");
            inventoryModifyRecord.setOldQuantity(null);
            inventoryModifyRecord.setQuantity(null);
            inventoryModifyRecord.setCreateUser(userId);
            inventoryModifyRecord.setCreateTime(new Date());
            inventoryModifyRecord.setType("5");
        }
        /**货到状态操作日志**/
        if (isMerge) {
            String[] cargoIdArray = cargoIds.split(",");
            changedCargoNumber = cargoIdArray.length - 1;
@@ -780,6 +798,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            for (String cargoId : cargoIdArray) {
                if(!StringUtils.isEmpty(cargoId)){
                    MediicinecabinetInventory inventory = inventoryDao.findOne(cargoId);
                    mergeCargoS.add(inventory.getWayerNo());
                    if (modifyRecordFlag){
                        inventoryModifyRecord.setDeviceId(inventory.getIdDevice());
                        inventoryModifyRecord.setEquNum(inventory.getEquNum());
                        inventoryModifyRecord.setLayerNo(inventory.getLayerNo());
                        inventoryModifyRecord.setWayerNo(inventory.getWayerNo());
                    }
                    //有药品记录下架操作
                    if (inventory.getOrgCode() != null && inventory.getDrugCode() != null) {
                        MedicineDrugInventoryRecord inventoryRecord = new MedicineDrugInventoryRecord();
@@ -827,6 +853,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            }
        } else {
            MediicinecabinetInventory inventory = inventoryDao.findOne(cargoIds);
            mergeCargoS.add(inventory.getWayerNo());
            if (modifyRecordFlag){
                inventoryModifyRecord.setDeviceId(inventory.getIdDevice());
                inventoryModifyRecord.setEquNum(inventory.getEquNum());
                inventoryModifyRecord.setLayerNo(inventory.getLayerNo());
                inventoryModifyRecord.setWayerNo(inventory.getWayerNo());
            }
            //所有有关分解的货道列表
            List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoriesByLayerNoAndMerge(inventory.getLayerNo(), inventory.getMerge());
@@ -888,7 +922,10 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            }
            deviceDao.save(mediicinedevice);
        }
        if (null!=inventoryModifyRecord){
            inventoryModifyRecord.setMergeCargo(mergeCargoS.stream().map(String::valueOf).collect(Collectors.joining(",")));
            inventoryRecordDao.save(inventoryModifyRecord);
        }
        result.put("response",ConstantUtils.SUCCESS);
        return result.toJSONString();
    }