diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 0aac1e5674..684092787e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -574,7 +574,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { //jobUtils.ifOutInventoryStatuses(detailDO.getInventoryStatus(), businesstypeDO); } - private CountPlanDetailDO selectCountPlanExist(String pnumber){ + private Long selectCountPlanExist(String pnumber){ QueryWrapper queryWrapperMain = new QueryWrapper<>(); queryWrapperMain.eq("number",pnumber); queryWrapperMain.eq("available","TRUE"); @@ -587,9 +587,9 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { } QueryWrapper queryWrapperDetail = new QueryWrapper<>(); queryWrapperDetail.eq("number", pnumber); - CountPlanDetailDO countPlanDetailDO = countPlanDetailMapper.selectOne(queryWrapperDetail); - if(countPlanDetailDO != null) { - return countPlanDetailDO; + Long count = countPlanDetailMapper.selectCount(queryWrapperDetail); + if(count > 0) { + return count; } else { throw new UtilException("盘点计划" + pnumber + "无效"); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 98530bf603..52ebd5f4e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -259,6 +259,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain purchasereceiptRecordMainDO.setToLocationTypes(businesstypeDORecord.getInLocationTypes()); purchasereceiptRecordMainDO.setFromAreaCodes(businesstypeDORecord.getOutAreaCodes()); purchasereceiptRecordMainDO.setToAreaCodes(businesstypeDORecord.getInAreaCodes()); + purchasereceiptRecordMainDO.setOutTransaction(businesstypeDORecord.getOutTransactionType()); + purchasereceiptRecordMainDO.setInTransaction(businesstypeDORecord.getInTransactionType()); String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_RECORD.getCode()); purchasereceiptRecordMainDO.setNumber(number); purchasereceiptRecordMainDO.setJobNumber(purchasereceiptJobMainDO.getNumber());