Browse Source

fix bug,恢复更改设备缺货状态的代码

wangzhinan 3 years ago
parent
commit
537b1af246

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

@ -4928,14 +4928,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                //默认false,通过规则判断是否缺货
                if (!refreshStatus) {
                    //更改设备缺货状态
                    if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
                        updateDeviceState(inventory.getId(), null);
                    } else {
                        updateDeviceState(inventory.getId(), inventoryDO);
                    }
//                    if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
//                        updateDeviceState(inventory.getId(), null);
//                    } else {
//                        updateDeviceState(inventory.getId(), inventoryDO);
//                    }
                }
                //如果正常开启的总计库存为0强制更新设备为缺货状态
//                setDeviceInventoryStatusByOneInventory(inventoryDO);
                setDeviceInventoryStatusByOneInventory(inventoryDO);
                mediicinecabinetInventory = inventoryDao.save(inventory);
                //重算设备容量
                if (cargoCapacityChanged && i == str.length - 1) {
@ -5080,14 +5080,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            //默认false,通过规则判断是否缺货
            if (!refreshStatus) {
                //更改设备缺货状态
                if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
                    updateDeviceState(inventory.getId(), null);
                } else {
                    updateDeviceState(inventory.getId(), inventoryDO);
                }
//                if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
//                    updateDeviceState(inventory.getId(), null);
//                } else {
//                    updateDeviceState(inventory.getId(), inventoryDO);
//                }
            }
            //如果正常开启的总计库存为0强制更新设备为缺货状态
//            setDeviceInventoryStatusByOneInventory(inventoryDO);
            setDeviceInventoryStatusByOneInventory(inventoryDO);
            inventoryDao.save(inventory);
            //重算设备容量