From 40606191d07e8f0c5dffdc8cb92d42c381d40df6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 17 五月 2025 10:30:39 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java |   88 +++++++++++++++++++++++++++++---------------
 1 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 61405a5..07cb971 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -2,10 +2,16 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.InventoryCheckOrder;
 import com.zy.asrs.entity.InventoryCheckOrderDetl;
+import com.zy.asrs.entity.Mat;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
+import com.zy.asrs.service.InventoryCheckOrderService;
+import com.zy.asrs.service.MatService;
 import com.zy.asrs.service.OpenService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
@@ -21,6 +27,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +49,13 @@
     private NccCkPddWmsService nccCkPddWmsService;
 
     @Autowired
-    private Inv nccCkPddWmsService;
+    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
+    @Autowired
+    private InventoryCheckOrderService inventoryCheckOrderService;
+
+    @Autowired
+    private MatService matService;
 
     @Autowired
     private OpenService openService;
@@ -52,10 +65,8 @@
      *
      * @return
      */
-    public ReturnT<String> start1() {
-        List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
-        for (String id : Ids) {
-            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2));
+    public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
+        try {
             OpenOrderPakoutParam param = new OpenOrderPakoutParam();
             param.setOrderType("閿�鍞彂璐�");
             DetlDto detlDto;
@@ -73,11 +84,15 @@
                     i++;
                 }
                 nccSaleXsfhmxWms.setWmsFlag(1);
+                param.setOrderNo(nccSaleXsfhmxWms.getVbillcode());
             }
-            param.setOrderNo(id);
             param.setOrderDetails(orderDetails);
             openService.pakoutOrderCreate(param);
             nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
     }
@@ -87,15 +102,13 @@
      *
      * @return
      */
-    public ReturnT<String> start2() {
-        List<String> strings = nccScZkmxbWmsService.selectZk();
-        for (String string : strings) {
+    public ReturnT<String> start2(List<NccScZkmxbWms> wmsFlag) {
+        try {
             OpenOrderPakoutParam param = new OpenOrderPakoutParam();
             param.setOrderType("杞簱");
             DetlDto detlDto;
             List<DetlDto> orderDetails = new ArrayList<>();
             long i = 1;
-            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
             for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
                 log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
                 if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
@@ -108,11 +121,15 @@
                     i++;
                 }
                 nccScZkmxbWms.setWmsFlag(1);
+                param.setOrderNo(nccScZkmxbWms.getVbillcode());
             }
-            param.setOrderNo(string);
             param.setOrderDetails(orderDetails);
             openService.pakoutOrderCreate(param);
             nccScZkmxbWmsService.updateBatchById(wmsFlag);
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
     }
@@ -123,18 +140,16 @@
      *
      * @return
      */
-    public ReturnT<String> start3() {
-        List<String> strings = nccCgCgdhdWmsService.selectCg();
-        for (String string : strings) {
+    public ReturnT<String> start3(List<NccCgCgdhdWms> wmsFlag) {
+        try {
             OpenOrderPakinParam param = new OpenOrderPakinParam();
             param.setOrderType("閲囪喘鍒拌揣");
             DetlDto detlDto;
             List<DetlDto> orderDetails = new ArrayList<>();
             long i = 1;
-            List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1));
             for (NccCgCgdhdWms nccScZkmxbWms : wmsFlag) {
-                log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
-                if ( nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+                log.info("NccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
+                if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
                     detlDto = new DetlDto();
                     detlDto.setMatnr(nccScZkmxbWms.getWlbm());
                     detlDto.setAnfme(nccScZkmxbWms.getYdzsl().doubleValue());
@@ -143,11 +158,15 @@
                     i++;
                 }
                 nccScZkmxbWms.setWmsFlag(1);
+                param.setOrderNo(nccScZkmxbWms.getVbillcode());
             }
-            param.setOrderNo(string);
             param.setOrderDetails(orderDetails);
             openService.pakinOrderCreate(param);
             nccCgCgdhdWmsService.updateBatchById(wmsFlag);
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
     }
@@ -158,30 +177,39 @@
      *
      * @return
      */
-    public ReturnT<String> start4() {
-        List<String> strings = nccCkPddWmsService.selectPdd();
-        for (String string : strings) {
+    public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
+        try {
             InventoryCheckOrder param = new InventoryCheckOrder();
-            InventoryCheckOrderDetl checkOrderDetl;
-            List<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>();
-            long i = 1;
-            List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1));
+            InventoryCheckOrderDetl checkOrderDetl = null;
             for (NccCkPddWms nccScZkmxbWms : wmsFlag) {
                 log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
                 if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) {
+                    Mat mat = matService.selectByMatnr(nccScZkmxbWms.getWlbm());
+                    if (Cools.isEmpty(mat)) {
+                        throw new CoolException(nccScZkmxbWms.getWlbm() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+                    }
+                    List<InventoryCheckOrderDetl> checkOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no", nccScZkmxbWms.getVbillcode()).eq("matnr", mat.getMatnr()));
+                    if (checkOrderDetls == null || checkOrderDetls.isEmpty()) {
+                        throw new CoolException(nccScZkmxbWms.getWlbm() + "鐩樼偣鍗曠殑鏄庣粏閲嶅浜�");
+                    }
                     checkOrderDetl = new InventoryCheckOrderDetl();
                     checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
+                    checkOrderDetl.setMaktx(mat.getMatnr());
+                    checkOrderDetl.setOrderNo(nccScZkmxbWms.getVbillcode());
                     checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue());
                     checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode());
-                    checkOrderDetls.add(checkOrderDetl);
-                    i++;
+                    inventoryCheckOrderDetlService.insert(checkOrderDetl);
                 }
                 nccScZkmxbWms.setWmsFlag(1);
+                param.setOrderNo(nccScZkmxbWms.getVbillcode());
             }
-            param.setOrderNo(string);
-            param.setOrderDetails(orderDetails);
-            openService.pakoutOrderCreate(param);
+            param.setStatus("1");
+            inventoryCheckOrderService.insert(param);
             nccCkPddWmsService.updateBatchById(wmsFlag);
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
     }

--
Gitblit v1.9.1