zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改Bug。

master
刘忱 2 years ago
parent
4ee0ed8a72
commit
dab24fdd66
8 changed files with 79 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java
  2. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java
  3. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java
  4. 32
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java
  5. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java
  6. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java
  7. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
  8. 66
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java
View File

@ -50,7 +50,7 @@ public interface BalanceService {
* @param locationCode 库位code * @param locationCode 库位code
* @return * @return
*/ */
List<BalanceDO> selectNumber(String itemCode, List<String> inventoryStatus, String locationCode); List<BalanceDO> selectByNumber(String itemCode, List<String> inventoryStatus, String locationCode);
/** /**
* TB2----BY_BATCH * TB2----BY_BATCH
* 跟据管理模式查询批次 * 跟据管理模式查询批次
@ -61,7 +61,7 @@ public interface BalanceService {
* @param locationCode 库位code * @param locationCode 库位code
* @return * @return
*/ */
List<BalanceDO> selectBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode); List<BalanceDO> selectByBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode);
/** /**
* TB2----BY_PACKAGING * TB2----BY_PACKAGING
* 跟据管理模式查询包装号 * 跟据管理模式查询包装号
@ -73,7 +73,7 @@ public interface BalanceService {
* @param locationCode 库位code * @param locationCode 库位code
* @return * @return
*/ */
List<BalanceDO> selectPackaging(String itemCode, String packingNumber, String batch, List<String> inventoryStatus, String locationCode); List<BalanceDO> selectByPackaging(String itemCode, String packingNumber, String batch, List<String> inventoryStatus, String locationCode);
/** /**
* TB2----BY_UNIQUE_ID * TB2----BY_UNIQUE_ID
* 跟据管理模式查询唯一码 * 跟据管理模式查询唯一码
@ -83,7 +83,7 @@ public interface BalanceService {
* @param locationCode 库位code * @param locationCode 库位code
* @return * @return
*/ */
List<BalanceDO> selectUniqueId(String packingNumber, String locationCode, List<String> inventoryStatus); List<BalanceDO> selectByUniqueId(String packingNumber, String locationCode, List<String> inventoryStatus);
void updateBalance(BalanceUpdateReqVO updateReqVO); void updateBalance(BalanceUpdateReqVO updateReqVO);
/** /**

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java
View File

@ -92,16 +92,16 @@ public class BalanceServiceImpl implements BalanceService {
* @return * @return
*/ */
@Override @Override
public List<BalanceDO> selectNumber(String itemCode, List<String> inventoryStatus, String locationCode) { public List<BalanceDO> selectByNumber(String itemCode, List<String> inventoryStatus, String locationCode) {
QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("item_code", itemCode); queryWrapper.eq("item_code", itemCode);
queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.in("inventory_status", inventoryStatus);
queryWrapper.eq("location_code", locationCode); queryWrapper.eq("location_code", locationCode);
queryWrapper.eq("packing_number",""); queryWrapper.eq("packing_number","");
queryWrapper.eq("batch",""); queryWrapper.eq("batch","");
List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper); List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
if (!balanceDO.isEmpty()) { if (!balanceDOList.isEmpty()) {
return balanceDO; return balanceDOList;
}else { }else {
return null; return null;
} }
@ -118,7 +118,7 @@ public class BalanceServiceImpl implements BalanceService {
* @return * @return
*/ */
@Override @Override
public List<BalanceDO> selectBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode) { public List<BalanceDO> selectByBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode) {
QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("item_code", itemCode); queryWrapper.eq("item_code", itemCode);
if (batch == null || batch.isEmpty()) { if (batch == null || batch.isEmpty()) {
@ -126,9 +126,9 @@ public class BalanceServiceImpl implements BalanceService {
} }
queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.in("inventory_status", inventoryStatus);
queryWrapper.eq("location_code", locationCode); queryWrapper.eq("location_code", locationCode);
List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper); List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
if (!balanceDO.isEmpty()) { if (!balanceDOList.isEmpty()) {
return balanceDO; return balanceDOList;
}else { }else {
return null; return null;
} }
@ -148,16 +148,16 @@ public class BalanceServiceImpl implements BalanceService {
* @return * @return
*/ */
@Override @Override
public List<BalanceDO> selectPackaging(String itemCode, String packingNumber, String batch, List<String> inventoryStatus, String locationCode) { public List<BalanceDO> selectByPackaging(String itemCode, String packingNumber, String batch, List<String> inventoryStatus, String locationCode) {
QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("item_code", itemCode); queryWrapper.eq("item_code", itemCode);
queryWrapper.eq("packing_number", packingNumber); queryWrapper.eq("packing_number", packingNumber);
queryWrapper.eq("batch", batch); queryWrapper.eq("batch", batch);
queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.in("inventory_status", inventoryStatus);
queryWrapper.eq("location_code", locationCode); queryWrapper.eq("location_code", locationCode);
List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper); List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
if (!balanceDO.isEmpty()) { if (!balanceDOList.isEmpty()) {
return balanceDO; return balanceDOList;
}else { }else {
return null; return null;
} }
@ -173,14 +173,14 @@ public class BalanceServiceImpl implements BalanceService {
* @return * @return
*/ */
@Override @Override
public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, List<String> inventoryStatus) { public List<BalanceDO> selectByUniqueId(String packingnumber, String locationcode, List<String> inventoryStatus) {
QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("packing_number", packingnumber);
queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.in("inventory_status", inventoryStatus);
queryWrapper.eq("location_code", locationcode); queryWrapper.eq("location_code", locationcode);
List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper); List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
if (!balanceDO.isEmpty()) { if (!balanceDOList.isEmpty()) {
return balanceDO; return balanceDOList;
}else { }else {
return null; return null;
} }

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java
View File

@ -80,7 +80,7 @@ public interface ExpectoutService {
* @param locationcode 库位code * @param locationcode 库位code
* @return * @return
*/ */
public List<ExpectoutDO> selectNumberNew(String itemcode, List<String> inventorystatus, String locationcode); public List<ExpectoutDO> selectByNumberNew(String itemcode, List<String> inventorystatus, String locationcode);
/** /**
* TB2----BY_BATCH * TB2----BY_BATCH
* 跟据管理模式查询批次 * 跟据管理模式查询批次
@ -91,7 +91,7 @@ public interface ExpectoutService {
* @param locationcode 库位code * @param locationcode 库位code
* @return * @return
*/ */
public List<ExpectoutDO> selectBatchNew(String itemcode, String batch, List<String> inventorystatus, String locationcode); public List<ExpectoutDO> selectByBatchNew(String itemcode, String batch, List<String> inventorystatus, String locationcode);
/** /**
* TB2----BY_PACKAGING * TB2----BY_PACKAGING
* 跟据管理模式查询包装号 * 跟据管理模式查询包装号
@ -103,7 +103,7 @@ public interface ExpectoutService {
* @param locationcode 库位code * @param locationcode 库位code
* @return * @return
*/ */
public List<ExpectoutDO> selectPackingNew(String itemcode, String packingnumber, String batch, List<String> inventorystatus, String locationcode); public List<ExpectoutDO> selectByPackingNew(String itemcode, String packingnumber, String batch, List<String> inventorystatus, String locationcode);
/** /**
* TB2----BY_UNIQUE_ID * TB2----BY_UNIQUE_ID
* 跟据管理模式查询唯一码 * 跟据管理模式查询唯一码
@ -113,7 +113,7 @@ public interface ExpectoutService {
* @param locationcode 库位code * @param locationcode 库位code
* @return * @return
*/ */
public List<ExpectoutDO> selectUniqeIdNew(String packingnumber, String locationcode, List<String> inventorystatus); public List<ExpectoutDO> selectByUniqeIdNew(String packingnumber, String locationcode, List<String> inventorystatus);
/** /**
* 获得预计入库存列表, 用于 Excel 导出 * 获得预计入库存列表, 用于 Excel 导出

32
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java
View File

@ -88,14 +88,14 @@ public class ExpectoutServiceImpl implements ExpectoutService {
//按数量查找 BY_BATCH //按数量查找 BY_BATCH
@Override @Override
public List<ExpectoutDO> selectNumberNew(String itemcode, List<String> inventorystatus, String locationcode) { public List<ExpectoutDO> selectByNumberNew(String itemcode, List<String> inventorystatus, String locationcode) {
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("item_code", itemcode); queryWrapper.eq("item_code", itemcode);
queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("inventory_status", inventorystatus);
queryWrapper.eq("location_code", locationcode); queryWrapper.eq("location_code", locationcode);
List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper); List<ExpectoutDO> expectoutDOList = expectoutMapper.selectList(queryWrapper);
if (!expectoutDO.isEmpty()) { if (!expectoutDOList.isEmpty()) {
return expectoutDO; return expectoutDOList;
} else { } else {
return null; return null;
} }
@ -103,15 +103,15 @@ public class ExpectoutServiceImpl implements ExpectoutService {
//按批次查询 BY_BATCH //按批次查询 BY_BATCH
@Override @Override
public List<ExpectoutDO> selectBatchNew(String itemcode, String batch, List<String> inventorystatus, String locationcode) { public List<ExpectoutDO> selectByBatchNew(String itemcode, String batch, List<String> inventorystatus, String locationcode) {
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("item_code", itemcode); queryWrapper.eq("item_code", itemcode);
queryWrapper.eq("batch", batch); queryWrapper.eq("batch", batch);
queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("inventory_status", inventorystatus);
queryWrapper.eq("location_code", locationcode); queryWrapper.eq("location_code", locationcode);
List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper); List<ExpectoutDO> expectoutDOList = expectoutMapper.selectList(queryWrapper);
if (!expectoutDO.isEmpty()) { if (!expectoutDOList.isEmpty()) {
return expectoutDO; return expectoutDOList;
} else { } else {
return null; return null;
} }
@ -119,16 +119,16 @@ public class ExpectoutServiceImpl implements ExpectoutService {
//按包裝 BY_PACKAGING //按包裝 BY_PACKAGING
@Override @Override
public List<ExpectoutDO> selectPackingNew(String itemcode, String packingnumber, String batch, List<String> inventorystatus, String locationcode) { public List<ExpectoutDO> selectByPackingNew(String itemcode, String packingnumber, String batch, List<String> inventorystatus, String locationcode) {
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("item_code", itemcode); queryWrapper.eq("item_code", itemcode);
queryWrapper.eq("batch", batch); queryWrapper.eq("batch", batch);
queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("packing_number", packingnumber);
queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("inventory_status", inventorystatus);
queryWrapper.eq("location_code", locationcode); queryWrapper.eq("location_code", locationcode);
List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper); List<ExpectoutDO> expectoutDOList = expectoutMapper.selectList(queryWrapper);
if (!expectoutDO.isEmpty()) { if (!expectoutDOList.isEmpty()) {
return expectoutDO; return expectoutDOList;
} else { } else {
return null; return null;
} }
@ -136,14 +136,14 @@ public class ExpectoutServiceImpl implements ExpectoutService {
//按唯一码查询 BY_UNIQUE_ID //按唯一码查询 BY_UNIQUE_ID
@Override @Override
public List<ExpectoutDO> selectUniqeIdNew(String packingnumber, String locationcode, List<String> inventorystatus) { public List<ExpectoutDO> selectByUniqeIdNew(String packingnumber, String locationcode, List<String> inventorystatus) {
QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<ExpectoutDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("packing_number", packingnumber);
queryWrapper.eq("inventory_status", inventorystatus); queryWrapper.eq("inventory_status", inventorystatus);
queryWrapper.eq("location_code", locationcode); queryWrapper.eq("location_code", locationcode);
List<ExpectoutDO> expectoutDO = expectoutMapper.selectList(queryWrapper); List<ExpectoutDO> expectoutDOList = expectoutMapper.selectList(queryWrapper);
if (!expectoutDO.isEmpty()) { if (!expectoutDOList.isEmpty()) {
return expectoutDO; return expectoutDOList;
} else { } else {
return null; return null;
} }

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java
View File

@ -155,7 +155,7 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe
//查询库存余额 //查询库存余额
List<String> status = new ArrayList<>(); List<String> status = new ArrayList<>();
status.add(detailDO.getInventoryStatus()); status.add(detailDO.getInventoryStatus());
List<BalanceDO> balanceDOList = balanceService.selectNumber(detailDO.getItemCode(),status,detailDO.getFromLocationCode()); List<BalanceDO> balanceDOList = balanceService.selectByNumber(detailDO.getItemCode(),status,detailDO.getFromLocationCode());
if (balanceDOList == null || balanceDOList.isEmpty()) { if (balanceDOList == null || balanceDOList.isEmpty()) {
throw exception(BALANCE_NOT_EXISTS); throw exception(BALANCE_NOT_EXISTS);
} }

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java
View File

@ -463,9 +463,9 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe
backflushRecordDetailbDO.setFromLocationCode(workstationDO.getRawLocationCode()); backflushRecordDetailbDO.setFromLocationCode(workstationDO.getRawLocationCode());
// 根据 from_location_code 查询库存余额 // 根据 from_location_code 查询库存余额
// TODO: 如果按批次 查询批次获取库存余额 排序批次 如果第一条批次不够数量 需要扣除第二条余额 库存事务出的动作要存2条 // TODO: 如果按批次 查询批次获取库存余额 排序批次 如果第一条批次不够数量 需要扣除第二条余额 库存事务出的动作要存2条
List inventoryStatus = new ArrayList(); List<String> inventoryStatus = new ArrayList<>();
inventoryStatus.add("OK"); inventoryStatus.add("OK");
List<BalanceDO> balanceDOList = balanceService.selectNumber(backflushRequestDetailbDO.getItemCode(),inventoryStatus,workstationDO.getRawLocationCode()); List<BalanceDO> balanceDOList = balanceService.selectByNumber(backflushRequestDetailbDO.getItemCode(),inventoryStatus,workstationDO.getRawLocationCode());
backflushRecordDetailbDO.setPackingNumber(balanceDOList.get(0).getPackingNumber()); backflushRecordDetailbDO.setPackingNumber(balanceDOList.get(0).getPackingNumber());
backflushRecordDetailbDO.setBatch(balanceDOList.get(0).getBatch()); backflushRecordDetailbDO.setBatch(balanceDOList.get(0).getBatch());
backflushRecordDetailbDO.setInventoryStatus("OK"); backflushRecordDetailbDO.setInventoryStatus("OK");

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
View File

@ -405,13 +405,11 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
List<PurchasereturnJobDetailDO> purchasereturnJobDetailDOList = new ArrayList<>(); List<PurchasereturnJobDetailDO> purchasereturnJobDetailDOList = new ArrayList<>();
for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) { for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) {
PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO); PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO);
purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode());
purchasereturnJobDetailDO.setNumber(number); purchasereturnJobDetailDO.setNumber(number);
purchasereturnJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null); purchasereturnJobDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId()); purchasereturnJobDetailDO.setMasterId(purchasereturnJobMainDO.getId());
purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode()); purchasereturnJobDetailDO.setFromLocationCode(purchasereturnRequestDetailDO.getFromLocationCode());
purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode()); purchasereturnJobDetailDO.setToOwnerCode(purchasereturnRequestDetailDO.getToOwnerCode());
purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode());
purchasereturnJobDetailDOList.add(purchasereturnJobDetailDO); purchasereturnJobDetailDOList.add(purchasereturnJobDetailDO);
//预计出 //预计出
ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO(); ExpectoutCreateReqVO expectoutCreateReqVO = new ExpectoutCreateReqVO();
@ -448,9 +446,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDO, PurchasereturnRequestMainDO mainDO, List<String> inventoryStatusList) { private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDO, PurchasereturnRequestMainDO mainDO, List<String> inventoryStatusList) {
BigDecimal bigDecimal = new BigDecimal(0); BigDecimal bigDecimal = new BigDecimal(0);
List<BalanceDO> balance = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber(), detailDO.getBatch(), detailDO.getFromLocationCode(), inventoryStatusList); List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber(), detailDO.getBatch(), detailDO.getFromLocationCode(), inventoryStatusList);
if (balance != null) { if (balanceDOList != null) {
for (BalanceDO balanceDO : balance) { for (BalanceDO balanceDO : balanceDOList) {
bigDecimal = bigDecimal.add(balanceDO.getQty()); bigDecimal = bigDecimal.add(balanceDO.getQty());
mainDO.setFromWarehouseCode(balanceDO.getWarehouseCode()); mainDO.setFromWarehouseCode(balanceDO.getWarehouseCode());
//detailDO.setInventoryStatus(balanceDO.getInventoryStatus()); //detailDO.setInventoryStatus(balanceDO.getInventoryStatus());

66
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
View File

@ -507,17 +507,17 @@ public class JobUtils {
*/ */
public List<BalanceDO> selectlocationReturnManagementAccuracyToBalance(String itemcode, String packingnumber, String batch, String locationcode, List<String> inventoryStatus) { public List<BalanceDO> selectlocationReturnManagementAccuracyToBalance(String itemcode, String packingnumber, String batch, String locationcode, List<String> inventoryStatus) {
RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null);
List<BalanceDO> balanceDO = null; List<BalanceDO> balanceDOList = null;
if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { 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())) { } 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())) { } 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())) { } 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<BalanceDO> selectlocationReturnManagementAccuracy(String itemcode, String packingnumber, String batch, String locationcode, List<String> inventoryStatus) { public List<BalanceDO> selectlocationReturnManagementAccuracy(String itemcode, String packingnumber, String batch, String locationcode, List<String> inventoryStatus) {
RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null);
List<BalanceDO> balanceDO = null; List<BalanceDO> balanceDOList = null;
if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) {
balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); balanceDOList = balanceService.selectByNumber(itemcode, inventoryStatus, locationcode);
if (balanceDO == null) { if (balanceDOList == null) {
throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录");
} else { } else {
return balanceDO; return balanceDOList;
} }
} else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) {
balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); balanceDOList = balanceService.selectByBatch(itemcode, batch, inventoryStatus, locationcode);
if (balanceDO == null) { if (balanceDOList == null) {
throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录");
} else { } else {
return balanceDO; return balanceDOList;
} }
} else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); balanceDOList = balanceService.selectByPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode);
if (balanceDO == null) { if (balanceDOList == null) {
throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录");
} else { } else {
return balanceDO; return balanceDOList;
} }
} else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus);
if (balanceDO == null) { if (balanceDOList == null) {
throw exception(MANAGEMENTPRECISION_EXCEPTION, "唯一码" + packingnumber + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); throw exception(MANAGEMENTPRECISION_EXCEPTION, "唯一码" + packingnumber + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录");
} else { } else {
return balanceDO; return balanceDOList;
} }
} }
return balanceDO; return balanceDOList;
} }
@ -585,18 +585,18 @@ public class JobUtils {
*/ */
public List<ExpectoutDO> selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, List<String> inventoryStatus) { public List<ExpectoutDO> selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, List<String> inventoryStatus) {
RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null);
List<ExpectoutDO> expectoutDO = null; List<ExpectoutDO> expectoutDOList = null;
if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { 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())) { } 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())) { } 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())) { } 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<BalanceDO> warehouseStocknNotExist(String itemcode, String packingnumber, String locationcode, List<String> inventoryStatus) { public List<BalanceDO> warehouseStocknNotExist(String itemcode, String packingnumber, String locationcode, List<String> inventoryStatus) {
RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null); RuleRespVO managementtRule = ruleService.management(null, null, itemcode, locationcode, null, null);
List<BalanceDO> balanceDO = null; List<BalanceDO> balanceDOList = null;
if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus);
return balanceDO; return balanceDOList;
} else { } else {
return null; return null;
} }
@ -695,13 +695,13 @@ public class JobUtils {
String[] splits = management.getConfiguration().split("\""); String[] splits = management.getConfiguration().split("\"");
for (String split : splits) { for (String split : splits) {
if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(management.getConfiguration())) { 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())) { } 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())) { } 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())) { } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(management.getConfiguration())) {
expectoutDO = expectoutService.selectUniqeIdNew(ppackingnumber, plocationcode, pinventoryStatus); expectoutDO = expectoutService.selectByUniqeIdNew(ppackingnumber, plocationcode, pinventoryStatus);
} }
return expectoutDO; return expectoutDO;
} }

Write Preview
Loading…
Cancel
Save