diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index 4b73ecd2..2733cf5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -39,9 +39,9 @@ public class IndexController { @Resource private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService; - @GetMapping("/index") - @Operation(summary = "开放订单数") - public CommonResult> index() { + @GetMapping("/indexSupplierde") + @Operation(summary = "供应商首页") + public CommonResult> indexSupplierde() { Map dataMap = new HashMap<>(); dataMap.put("openPurchaseCount", purchaseMainService.getPurchaseCount(true));//开放订单数 dataMap.put("allPurchaseCount", purchaseMainService.getPurchaseCount(false));//全部订单数 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java index 7a81074e..e49c5103 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java @@ -50,7 +50,7 @@ public class PurchasereturnRecordMainController { @PostMapping("/create") @Operation(summary = "创建采购退货记录") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-main:create')") - public CommonResult createPurchasereturnRecordMain(@Valid @RequestBody PurchasereturnRecordMainCreateReqVO createReqVO) { + public CommonResult createPurchasereturnRecordMain(@Valid @RequestBody PurchasereturnRecordMainCreateReqVO createReqVO) { return success(purchasereturnRecordMainService.createPurchasereturnRecordMain(createReqVO)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java index 00186e3b..0ce47f55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java @@ -49,7 +49,7 @@ public class PutawayRecordMainController { @PostMapping("/create") @Operation(summary = "创建上架记录") @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:create')") - public CommonResult createPutawayRecordMain(@Valid @RequestBody PutawayRecordMainCreateReqVO createReqVO) { + public CommonResult createPutawayRecordMain(@Valid @RequestBody PutawayRecordMainCreateReqVO createReqVO) { return success(putawayRecordMainService.createPutawayRecordMain(createReqVO)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java index 4ea1a952..d1b7ee0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java @@ -21,7 +21,7 @@ public interface PurchasereturnRecordMainService { * @param createReqVO 采购退货记录主 * @return id */ - Long createPurchasereturnRecordMain(PurchasereturnRecordMainCreateReqVO createReqVO); + String createPurchasereturnRecordMain(PurchasereturnRecordMainCreateReqVO createReqVO); /** * 获得采购退货记录主分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java index 0789194e..ad6692de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java @@ -63,13 +63,20 @@ public class PurchasereturnRecordMainServiceImpl implements PurchasereturnRecord @Override @Transactional - public Long createPurchasereturnRecordMain(PurchasereturnRecordMainCreateReqVO createReqVO) { + public String createPurchasereturnRecordMain(PurchasereturnRecordMainCreateReqVO createReqVO) { PurchasereturnRecordMainDO mainDO = PurchasereturnRecordMainConvert.INSTANCE.convert(createReqVO); List subDOList = PurchasereturnRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); mainDO.setNumber(number); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasereturnRecord"); mainDO.setBusinessType(businesstypeDO.getCode()); + mainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); + mainDO.setToLocationTypes(businesstypeDO.getInLocationTypes()); + mainDO.setInTransactionType(businesstypeDO.getInTransactionType()); + mainDO.setOutTransactionType(businesstypeDO.getOutTransactionType()); + mainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); + mainDO.setToAreaCodes(businesstypeDO.getInAreaCodes()); + mainDO.setId(null); purchasereturnRecordMainMapper.insert(mainDO); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); @@ -78,6 +85,7 @@ public class PurchasereturnRecordMainServiceImpl implements PurchasereturnRecord for (PurchasereturnRecordDetailDO detailDO : subDOList) { detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); + detailDO.setId(null); //添加库存事务入list TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); BeanUtils.copyProperties(detailDO, transactionCreateReqVOIn); @@ -135,7 +143,7 @@ public class PurchasereturnRecordMainServiceImpl implements PurchasereturnRecord //增加操作记录 trendsApi.createTrends(mainDO.getId(), "purchasereturnRecordMain", "增加了采购退货记录", TrendsTypeEnum.CREATE); // 返回 - return mainDO.getId(); + return number; } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java index 96ef843b..ae2832d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java @@ -21,7 +21,7 @@ public interface PutawayRecordMainService { * @param createReqVO 上架记录主 * @return id */ - Long createPutawayRecordMain(PutawayRecordMainCreateReqVO createReqVO); + String createPutawayRecordMain(PutawayRecordMainCreateReqVO createReqVO); /** * 获得上架记录主分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java index 8cb00a8d..6372451d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java @@ -63,13 +63,19 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService { @Override @Transactional - public Long createPutawayRecordMain(PutawayRecordMainCreateReqVO createReqVO) { + public String createPutawayRecordMain(PutawayRecordMainCreateReqVO createReqVO) { PutawayRecordMainDO mainDO = PutawayRecordMainConvert.INSTANCE.convert(createReqVO); List subDOList = PutawayRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode()); mainDO.setNumber(number); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PutawayRecord"); mainDO.setBusinessType(businesstypeDO.getCode()); + mainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); + mainDO.setToLocationTypes(businesstypeDO.getInLocationTypes()); + mainDO.setInTransactionType(businesstypeDO.getInTransactionType()); + mainDO.setOutTransactionType(businesstypeDO.getOutTransactionType()); + mainDO.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); + mainDO.setToAreaCodes(businesstypeDO.getInAreaCodes()); putawayRecordMainMapper.insert(mainDO); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); @@ -133,7 +139,7 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService { //增加操作记录 trendsApi.createTrends(mainDO.getId(), "putawayRecordMain", "增加了检验记录", TrendsTypeEnum.CREATE); // 返回 - return mainDO.getId(); + return number; } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java index b2cf71bd..0273f42f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java @@ -522,6 +522,7 @@ public class RuleServiceImpl implements RuleService { JSONObject entries = JSONUtil.parseObj(RespVO.getConfiguration()); map.put("ManagementPrecision", entries.get("ManagementPrecision")); map.put("itemCode", reqVO2.getItemCode()); + map.put("locationCode", reqVO2.getLocationCode()); list.add(map); } return list;