diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index b74eb021..57b874f2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -50,7 +50,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - List selectNumber(String itemCode, List inventoryStatus, String locationCode); + List selectByNumber(String itemCode, List inventoryStatus, String locationCode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 @@ -61,7 +61,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - List selectBatch(String itemCode, String batch, List inventoryStatus, String locationCode); + List selectByBatch(String itemCode, String batch, List inventoryStatus, String locationCode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -73,7 +73,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - List selectPackaging(String itemCode, String packingNumber, String batch, List inventoryStatus, String locationCode); + List selectByPackaging(String itemCode, String packingNumber, String batch, List inventoryStatus, String locationCode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 @@ -83,7 +83,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - List selectUniqueId(String packingNumber, String locationCode, List inventoryStatus); + List selectByUniqueId(String packingNumber, String locationCode, List inventoryStatus); void updateBalance(BalanceUpdateReqVO updateReqVO); /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 0ee96d90..1115482b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -92,16 +92,16 @@ public class BalanceServiceImpl implements BalanceService { * @return */ @Override - public List selectNumber(String itemCode, List inventoryStatus, String locationCode) { + public List selectByNumber(String itemCode, List inventoryStatus, String locationCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemCode); queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationCode); queryWrapper.eq("packing_number",""); queryWrapper.eq("batch",""); - List balanceDO = balanceMapper.selectList(queryWrapper); - if (!balanceDO.isEmpty()) { - return balanceDO; + List balanceDOList = balanceMapper.selectList(queryWrapper); + if (!balanceDOList.isEmpty()) { + return balanceDOList; }else { return null; } @@ -118,7 +118,7 @@ public class BalanceServiceImpl implements BalanceService { * @return */ @Override - public List selectBatch(String itemCode, String batch, List inventoryStatus, String locationCode) { + public List selectByBatch(String itemCode, String batch, List inventoryStatus, String locationCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemCode); if (batch == null || batch.isEmpty()) { @@ -126,9 +126,9 @@ public class BalanceServiceImpl implements BalanceService { } queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationCode); - List balanceDO = balanceMapper.selectList(queryWrapper); - if (!balanceDO.isEmpty()) { - return balanceDO; + List balanceDOList = balanceMapper.selectList(queryWrapper); + if (!balanceDOList.isEmpty()) { + return balanceDOList; }else { return null; } @@ -148,16 +148,16 @@ public class BalanceServiceImpl implements BalanceService { * @return */ @Override - public List selectPackaging(String itemCode, String packingNumber, String batch, List inventoryStatus, String locationCode) { + public List selectByPackaging(String itemCode, String packingNumber, String batch, List inventoryStatus, String locationCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemCode); queryWrapper.eq("packing_number", packingNumber); queryWrapper.eq("batch", batch); queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationCode); - List balanceDO = balanceMapper.selectList(queryWrapper); - if (!balanceDO.isEmpty()) { - return balanceDO; + List balanceDOList = balanceMapper.selectList(queryWrapper); + if (!balanceDOList.isEmpty()) { + return balanceDOList; }else { return null; } @@ -173,14 +173,14 @@ public class BalanceServiceImpl implements BalanceService { * @return */ @Override - public List selectUniqueId(String packingnumber, String locationcode, List inventoryStatus) { + public List selectByUniqueId(String packingnumber, String locationcode, List inventoryStatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("packing_number", packingnumber); queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); - List balanceDO = balanceMapper.selectList(queryWrapper); - if (!balanceDO.isEmpty()) { - return balanceDO; + List balanceDOList = balanceMapper.selectList(queryWrapper); + if (!balanceDOList.isEmpty()) { + return balanceDOList; }else { return null; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java index 0453b9ca..366d144f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java @@ -80,7 +80,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectNumberNew(String itemcode, List inventorystatus, String locationcode); + public List selectByNumberNew(String itemcode, List inventorystatus, String locationcode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 @@ -91,7 +91,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode); + public List selectByBatchNew(String itemcode, String batch, List inventorystatus, String locationcode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -103,7 +103,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode); + public List selectByPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 @@ -113,7 +113,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus); + public List selectByUniqeIdNew(String packingnumber, String locationcode, List inventorystatus); /** * 获得预计入库存列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java index ecf541df..c6d58a4d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java @@ -88,14 +88,14 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按数量查找 BY_BATCH @Override - public List selectNumberNew(String itemcode, List inventorystatus, String locationcode) { + public List selectByNumberNew(String itemcode, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("location_code", locationcode); - List expectoutDO = expectoutMapper.selectList(queryWrapper); - if (!expectoutDO.isEmpty()) { - return expectoutDO; + List expectoutDOList = expectoutMapper.selectList(queryWrapper); + if (!expectoutDOList.isEmpty()) { + return expectoutDOList; } else { return null; } @@ -103,15 +103,15 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按批次查询 BY_BATCH @Override - public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode) { + public List selectByBatchNew(String itemcode, String batch, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("location_code", locationcode); - List expectoutDO = expectoutMapper.selectList(queryWrapper); - if (!expectoutDO.isEmpty()) { - return expectoutDO; + List expectoutDOList = expectoutMapper.selectList(queryWrapper); + if (!expectoutDOList.isEmpty()) { + return expectoutDOList; } else { return null; } @@ -119,16 +119,16 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按包裝 BY_PACKAGING @Override - public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode) { + public List selectByPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("location_code", locationcode); - List expectoutDO = expectoutMapper.selectList(queryWrapper); - if (!expectoutDO.isEmpty()) { - return expectoutDO; + List expectoutDOList = expectoutMapper.selectList(queryWrapper); + if (!expectoutDOList.isEmpty()) { + return expectoutDOList; } else { return null; } @@ -136,14 +136,14 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按唯一码查询 BY_UNIQUE_ID @Override - public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus) { + public List selectByUniqeIdNew(String packingnumber, String locationcode, List inventorystatus) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("location_code", locationcode); - List expectoutDO = expectoutMapper.selectList(queryWrapper); - if (!expectoutDO.isEmpty()) { - return expectoutDO; + List expectoutDOList = expectoutMapper.selectList(queryWrapper); + if (!expectoutDOList.isEmpty()) { + return expectoutDOList; } else { return null; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java index e056f6c8..6c2aa054 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java @@ -155,7 +155,7 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe //查询库存余额 List status = new ArrayList<>(); status.add(detailDO.getInventoryStatus()); - List balanceDOList = balanceService.selectNumber(detailDO.getItemCode(),status,detailDO.getFromLocationCode()); + List balanceDOList = balanceService.selectByNumber(detailDO.getItemCode(),status,detailDO.getFromLocationCode()); if (balanceDOList == null || balanceDOList.isEmpty()) { throw exception(BALANCE_NOT_EXISTS); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index ab4216d5..a1ebf613 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -463,9 +463,9 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe backflushRecordDetailbDO.setFromLocationCode(workstationDO.getRawLocationCode()); // 根据 from_location_code 查询库存余额 // TODO: 如果按批次 查询批次获取库存余额 排序批次 如果第一条批次不够数量 需要扣除第二条余额 库存事务出的动作要存2条 - List inventoryStatus = new ArrayList(); + List inventoryStatus = new ArrayList<>(); inventoryStatus.add("OK"); - List balanceDOList = balanceService.selectNumber(backflushRequestDetailbDO.getItemCode(),inventoryStatus,workstationDO.getRawLocationCode()); + List balanceDOList = balanceService.selectByNumber(backflushRequestDetailbDO.getItemCode(),inventoryStatus,workstationDO.getRawLocationCode()); backflushRecordDetailbDO.setPackingNumber(balanceDOList.get(0).getPackingNumber()); backflushRecordDetailbDO.setBatch(balanceDOList.get(0).getBatch()); backflushRecordDetailbDO.setInventoryStatus("OK"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 76d74978..976e7be6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -405,13 +405,11 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque List purchasereturnJobDetailDOList = new ArrayList<>(); for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) { PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO); - purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode()); purchasereturnJobDetailDO.setNumber(number); purchasereturnJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId()); purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode()); purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode()); - purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode()); purchasereturnJobDetailDOList.add(purchasereturnJobDetailDO); //预计出 ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); @@ -448,9 +446,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDO, PurchasereturnRequestMainDO mainDO, List inventoryStatusList) { BigDecimal bigDecimal = new BigDecimal(0); - List balance = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber(), detailDO.getBatch(), detailDO.getFromLocationCode(), inventoryStatusList); - if (balance != null) { - for (BalanceDO balanceDO : balance) { + List balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber(), detailDO.getBatch(), detailDO.getFromLocationCode(), inventoryStatusList); + if (balanceDOList != null) { + for (BalanceDO balanceDO : balanceDOList) { bigDecimal = bigDecimal.add(balanceDO.getQty()); mainDO.setFromWarehouseCode(balanceDO.getWarehouseCode()); //detailDO.setInventoryStatus(balanceDO.getInventoryStatus()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java index e73018d1..fbd1f404 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java @@ -507,17 +507,17 @@ public class JobUtils { */ public List selectlocationReturnManagementAccuracyToBalance(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); - List balanceDO = null; + List balanceDOList = null; if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); + balanceDOList = balanceService.selectByNumber(itemcode, inventoryStatus, locationcode); } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); + balanceDOList = balanceService.selectByBatch(itemcode, batch, inventoryStatus, locationcode); } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); + balanceDOList = balanceService.selectByPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); + balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus); } - return balanceDO; + return balanceDOList; } /** @@ -535,37 +535,37 @@ public class JobUtils { */ public List selectlocationReturnManagementAccuracy(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); - List balanceDO = null; + List balanceDOList = null; if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); - if (balanceDO == null) { + balanceDOList = balanceService.selectByNumber(itemcode, inventoryStatus, locationcode); + if (balanceDOList == null) { throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { - return balanceDO; + return balanceDOList; } } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); - if (balanceDO == null) { + balanceDOList = balanceService.selectByBatch(itemcode, batch, inventoryStatus, locationcode); + if (balanceDOList == null) { throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { - return balanceDO; + return balanceDOList; } } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); - if (balanceDO == null) { + balanceDOList = balanceService.selectByPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); + if (balanceDOList == null) { throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { - return balanceDO; + return balanceDOList; } } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); - if (balanceDO == null) { + balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus); + if (balanceDOList == null) { throw exception(MANAGEMENTPRECISION_EXCEPTION, "唯一码" + packingnumber + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { - return balanceDO; + return balanceDOList; } } - return balanceDO; + return balanceDOList; } @@ -585,18 +585,18 @@ public class JobUtils { */ public List selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); - List expectoutDO = null; + List expectoutDOList = null; if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { - expectoutDO = expectoutService.selectNumberNew(itemcode, inventoryStatus, locationcode); + expectoutDOList = expectoutService.selectByNumberNew(itemcode, inventoryStatus, locationcode); } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { - expectoutDO = expectoutService.selectBatchNew(itemcode, batch, inventoryStatus, locationcode); + expectoutDOList = expectoutService.selectByBatchNew(itemcode, batch, inventoryStatus, locationcode); } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { - expectoutDO = expectoutService.selectPackingNew(itemcode, packingnumber, batch, inventoryStatus, locationcode); + expectoutDOList = expectoutService.selectByPackingNew(itemcode, packingnumber, batch, inventoryStatus, locationcode); } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { - expectoutDO = expectoutService.selectUniqeIdNew(packingnumber, locationcode, inventoryStatus); + expectoutDOList = expectoutService.selectByUniqeIdNew(packingnumber, locationcode, inventoryStatus); } - return expectoutDO; + return expectoutDOList; } /** @@ -655,10 +655,10 @@ public class JobUtils { //库存不应该存在 public List warehouseStocknNotExist(String itemcode, String packingnumber, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); - List balanceDO = null; + List balanceDOList = null; if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); - return balanceDO; + balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus); + return balanceDOList; } else { return null; } @@ -695,13 +695,13 @@ public class JobUtils { String[] splits = management.getConfiguration().split("\""); for (String split : splits) { if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(management.getConfiguration())) { - expectoutService.selectNumberNew(pitemcode, pinventoryStatus, plocationcode); + expectoutService.selectByNumberNew(pitemcode, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectBatchNew(pitemcode, pbatch, pinventoryStatus, plocationcode); + expectoutDO = expectoutService.selectByBatchNew(pitemcode, pbatch, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectPackingNew(pitemcode, ppackingnumber, pbatch, pinventoryStatus, plocationcode); + expectoutDO = expectoutService.selectByPackingNew(pitemcode, ppackingnumber, pbatch, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectUniqeIdNew(ppackingnumber, plocationcode, pinventoryStatus); + expectoutDO = expectoutService.selectByUniqeIdNew(ppackingnumber, plocationcode, pinventoryStatus); } return expectoutDO; }