From 8a25d8dd0d44d9d11aa2ec26827823dd911b4ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Thu, 17 Aug 2023 22:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=9A=84=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=BC=96=E5=8F=B7=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile/WmIssueMobController.java          |  4 ----
 .../mobile/WmRtIssueMobController.java        | 23 +++++++++----------
 .../mobile/WmRtVendorMobController.java       | 12 ++++++++--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmIssueMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmIssueMobController.java
index 7cf95fd..3803222 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmIssueMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmIssueMobController.java
@@ -78,10 +78,6 @@ public class WmIssueMobController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody WmIssueHeader wmIssueHeader)
     {
-        if(UserConstants.NOT_UNIQUE.equals(wmIssueHeaderService.checkIssueCodeUnique(wmIssueHeader))){
-            return AjaxResult.error("领料单编号已存在");
-        }
-
         if(StringUtils.isNotNull(wmIssueHeader.getIssueCode())){
             if(UserConstants.NOT_UNIQUE.equals(wmIssueHeaderService.checkIssueCodeUnique(wmIssueHeader))){
                 return  AjaxResult.error("单据编号已存在！");
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueMobController.java
index 6897cb5..50f388f 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtIssueMobController.java
@@ -14,6 +14,7 @@ import com.ktg.mes.pro.service.IProWorkorderService;
 import com.ktg.mes.wm.domain.*;
 import com.ktg.mes.wm.domain.tx.RtIssueTxBean;
 import com.ktg.mes.wm.service.*;
+import com.ktg.system.strategy.AutoCodeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,22 +36,15 @@ public class WmRtIssueMobController extends BaseController {
     @Autowired
     private IWmRtIssueLineService wmRtIssueLineService;
 
-
-    @Autowired
-    private IWmWarehouseService wmWarehouseService;
-
-    @Autowired
-    private IWmStorageLocationService wmStorageLocationService;
-
-    @Autowired
-    private IWmStorageAreaService wmStorageAreaService;
-
     @Autowired
     private IStorageCoreService storageCoreService;
 
     @Autowired
     private IProWorkorderService proWorkorderService;
 
+    @Autowired
+    private AutoCodeUtil autoCodeUtil;
+
     /**
      * 查询生产退料单头列表
      */
@@ -85,10 +79,15 @@ public class WmRtIssueMobController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody WmRtIssue wmRtIssue)
     {
-        if(UserConstants.NOT_UNIQUE.equals(wmRtIssueService.checkUnique(wmRtIssue))){
-            return AjaxResult.error("退料单编号已存在");
+        if(StringUtils.isNotNull(wmRtIssue.getRtCode())){
+            if(UserConstants.NOT_UNIQUE.equals(wmRtIssueService.checkUnique(wmRtIssue))){
+                return AjaxResult.error("退料单编号已存在");
+            }
+        }else {
+            wmRtIssue.setRtCode(autoCodeUtil.genSerialCode(UserConstants.RTISSUE_CODE,""));
         }
 
+
         if(StringUtils.isNotNull(wmRtIssue.getWorkorderId())){
             ProWorkorder workorder = proWorkorderService.selectProWorkorderByWorkorderId(wmRtIssue.getWorkorderId());
             wmRtIssue.setWorkorderCode(workorder.getWorkorderCode());
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtVendorMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtVendorMobController.java
index 346c7fc..5da3752 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtVendorMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmRtVendorMobController.java
@@ -13,6 +13,7 @@ import com.ktg.mes.wm.domain.WmRtVendor;
 import com.ktg.mes.wm.domain.tx.RtVendorTxBean;
 import com.ktg.mes.wm.service.IStorageCoreService;
 import com.ktg.mes.wm.service.IWmRtVendorService;
+import com.ktg.system.strategy.AutoCodeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,9 @@ public class WmRtVendorMobController extends BaseController {
     @Autowired
     private IMdVendorService mdVendorService;
 
+    @Autowired
+    private AutoCodeUtil autoCodeUtil;
+
     /**
      * 查询供应商退货列表
      */
@@ -69,8 +73,12 @@ public class WmRtVendorMobController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody WmRtVendor wmRtVendor)
     {
-        if(UserConstants.NOT_UNIQUE.equals(wmRtVendorService.checkCodeUnique(wmRtVendor))){
-            return AjaxResult.error("退货单编号已经存在！");
+        if(StringUtils.isNotNull(wmRtVendor.getRtCode())){
+            if(UserConstants.NOT_UNIQUE.equals(wmRtVendorService.checkCodeUnique(wmRtVendor))){
+                return AjaxResult.error("退货单编号已经存在！");
+            }
+        }else {
+            wmRtVendor.setRtCode(autoCodeUtil.genSerialCode(UserConstants.WM_RTVENDOR_CODE,""));
         }
 
         if(StringUtils.isNotNull(wmRtVendor.getVendorId())){