Merge branch 'medicare' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into medicare

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

@@ -508,7 +508,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    /**
     * 更新设备网络状态
     * 上传设备异常信息
     * @param
     * @param
     * @return
@@ -4611,6 +4611,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                inventoryDO.setOrgCode(inventory.getOrgCode());
                inventoryDO.setRatedInventory(inventory.getRatedInventory());
                boolean cargoCapacityChanged = false;
                int changedCapacity = 0;
                //库存变动
                if (org.apache.commons.lang3.StringUtils.isNoneBlank(qty)){
                    if (Integer.parseInt(qty) > 99) {
@@ -4634,6 +4635,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    //提升容量至库存数（修改的库存数大于容量时）
                    if (Integer.parseInt(qty) > Integer.parseInt(inventory.getCargoCapacity())) {
                        cargoCapacityChanged = true;
                        changedCapacity = Integer.parseInt(qty);
                        inventory.setCargoCapacity(qty);
                    }
                    inventory.setQty(qty);
@@ -4672,6 +4674,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                        throw new Exception("货道容量最多99个，如超过请放置另一格");
                    }
                    inventory.setCargoCapacity(cargoCapacity);
                    changedCapacity = Integer.parseInt(cargoCapacity);
                    cargoCapacityChanged = true;
                }
                //更改货道容量-end
@@ -4735,7 +4738,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    Integer noOnlineTotal1 = 0;
                    if (totalMap!=null){
                        if (totalMap.get("cargoCapacity") != null) {
                            noOnlineTotal1 = (int) Double.parseDouble(totalMap.get("cargoCapacity").toString() + Integer.parseInt(qty));
                            noOnlineTotal1 = (int) Double.parseDouble(totalMap.get("cargoCapacity").toString() + changedCapacity);
                        }
                    }
                    mediicinedevice.setCapacity(String.valueOf(noOnlineTotal1));
@@ -4751,6 +4754,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            inventoryDO.setOrgCode(inventory.getOrgCode());
            inventoryDO.setRatedInventory(inventory.getRatedInventory());
            boolean cargoCapacityChanged = false;
            int changedCapacity = 0;
            //库存变动
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(qty)){
                if (Integer.parseInt(qty) > 99) {
@@ -4774,6 +4778,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                //提升容量至库存数（修改的库存数大于容量时）
                if (Integer.parseInt(qty) > Integer.parseInt(inventory.getCargoCapacity())) {
                    cargoCapacityChanged = true;
                    changedCapacity = Integer.parseInt(qty);
                    inventory.setCargoCapacity(qty);
                }
                inventory.setQty(qty);
@@ -4812,6 +4817,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    throw new Exception("货道容量最多99个，如超过请放置另一格");
                }
                inventory.setCargoCapacity(cargoCapacity);
                changedCapacity = Integer.parseInt(cargoCapacity);
                cargoCapacityChanged = true;
            }
            //更改货道容量-end
@@ -4875,7 +4881,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                Integer noOnlineTotal1 = 0;
                if (totalMap!=null){
                    if (totalMap.get("cargoCapacity") != null) {
                        noOnlineTotal1 = (int) Double.parseDouble(totalMap.get("cargoCapacity").toString()) + Integer.parseInt(qty);
                        noOnlineTotal1 = (int) Double.parseDouble(totalMap.get("cargoCapacity").toString()) + changedCapacity;
                    }
                }
                mediicinedevice.setCapacity(String.valueOf(noOnlineTotal1));