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

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

@@ -23,7 +23,7 @@ public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository
    List<Map<String, Object>> selectByDeviceIdGroup(String deviceId);
    List<MediicinecabinetInventory> findMediicinecabinetInventoriesByLayerNoAndMerge(String idDevice,String layerNo, String merge);
    List<MediicinecabinetInventory> findMediicinecabinetInventoryByIdDeviceAndLayerNoAndMerge(String idDevice,String layerNo, String merge);

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

@@ -136,6 +136,21 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        MedicineDrugInventoryRecord inventoryModifyRecord = new MedicineDrugInventoryRecord();
        inventoryModifyRecord.setOldDrugId(null);
        inventoryModifyRecord.setDrugId(null);
        inventoryModifyRecord.setMergeState("1");
        inventoryModifyRecord.setOldQuantity(null);
        inventoryModifyRecord.setQuantity(null);
        inventoryModifyRecord.setCreateUser("createDevice");
        inventoryModifyRecord.setCreateTime(new Date());
        inventoryModifyRecord.setType("5");
        inventoryModifyRecord.setDeviceId(deviceId);
        inventoryModifyRecord.setEquNum(deviceId);
        inventoryModifyRecord.setLayerNo(layer);
        inventoryModifyRecord.setWayerNo(wayer);
        inventoryRecordDao.save(inventoryModifyRecord);
        Mediicinedevice mediicinedevice = new Mediicinedevice();
        mediicinedevice.setEquNum(deviceId);
        mediicinedevice.setEquName(deviceId);
@@ -862,7 +877,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            }
            //所有有关分解的货道列表
            List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoriesByLayerNoAndMerge(inventory.getIdDevice(),inventory.getLayerNo(), inventory.getMerge());
            List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoryByIdDeviceAndLayerNoAndMerge(inventory.getIdDevice(),inventory.getLayerNo(), inventory.getMerge());
            changedCargoNumber = list.size() - 1;
            //主货道拆解