From f159bbc0db68e0683c847b8d6ae83f615dfffe65 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 16 五月 2025 16:13:44 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java |   65 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 11 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 3f2c0c3..20e015d 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -2,13 +2,14 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
 import com.zy.asrs.service.OpenService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.common.model.DetlDto;
 import com.zy.nc.entity.NccSaleXsfhmxWms;
 import com.zy.nc.entity.NccScZkmxbWms;
+import com.zy.nc.service.NccCgCgdhdWmsService;
 import com.zy.nc.service.NccSaleXsfhmxWmsService;
 import com.zy.nc.service.NccScZkmxbWmsService;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +30,9 @@
     private NccScZkmxbWmsService nccScZkmxbWmsService;
 
     @Autowired
+    private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+
+    @Autowired
     private OpenService openService;
 
     /**
@@ -39,8 +43,8 @@
     public ReturnT<String> start1() {
         List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
         for (String id : Ids) {
-            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("cdeliveryid", id).ne("wms_flag", 1).eq("fstatusflag", 2));
-            OpenOrderPakinParam param = new OpenOrderPakinParam();
+            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2));
+            OpenOrderPakoutParam param = new OpenOrderPakoutParam();
             param.setOrderType("閿�鍞彂璐�");
             DetlDto detlDto;
             List<DetlDto> orderDetails = new ArrayList<>();
@@ -49,16 +53,18 @@
                 if (nccSaleXsfhmxWms.getFstatusflag() == 2 && nccSaleXsfhmxWms.getBdr() == 0 && nccSaleXsfhmxWms.getHdr() == 0) {
                     detlDto = new DetlDto();
                     detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
-                    detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum());
+                    detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum().doubleValue());
                     detlDto.setLineNumber(i);
-                    nccSaleXsfhmxWms.setWmsFlag(1);
+                    detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
                     orderDetails.add(detlDto);
                     log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
                     i++;
                 }
+                nccSaleXsfhmxWms.setWmsFlag(1);
             }
+            param.setOrderNo(id);
             param.setOrderDetails(orderDetails);
-            openService.pakinOrderCreate(param);
+            openService.pakoutOrderCreate(param);
             nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
         }
         return SUCCESS;
@@ -72,27 +78,64 @@
     public ReturnT<String> start2() {
         List<String> strings = nccScZkmxbWmsService.selectZk();
         for (String string : strings) {
-            OpenOrderPakinParam param = new OpenOrderPakinParam();
+            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("cdeliveryid", string).ne("wms_flag", 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) {
                     detlDto = new DetlDto();
                     detlDto.setMatnr(nccScZkmxbWms.getWlbm());
-                    detlDto.setAnfme(nccScZkmxbWms.getYingzzsl());
+                    detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
                     detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
                     detlDto.setLineNumber(i);
-                    nccScZkmxbWms.setWmsFlag(1);
                     orderDetails.add(detlDto);
                     i++;
                 }
+                nccScZkmxbWms.setWmsFlag(1);
             }
+            param.setOrderNo(string);
             param.setOrderDetails(orderDetails);
-            openService.pakinOrderCreate(param);
+            openService.pakoutOrderCreate(param);
+            nccScZkmxbWmsService.updateBatchById(wmsFlag);
+        }
+        return SUCCESS;
+    }
+
+
+    /**
+     * 杞簱
+     *
+     * @return
+     */
+    public ReturnT<String> start3() {
+        List<String> strings = nccCgCgdhdWmsService.selectCg();
+        for (String string : strings) {
+            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) {
+                    detlDto = new DetlDto();
+                    detlDto.setMatnr(nccScZkmxbWms.getWlbm());
+                    detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+                    detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
+                    detlDto.setLineNumber(i);
+                    orderDetails.add(detlDto);
+                    i++;
+                }
+                nccScZkmxbWms.setWmsFlag(1);
+            }
+            param.setOrderNo(string);
+            param.setOrderDetails(orderDetails);
+            openService.pakoutOrderCreate(param);
             nccScZkmxbWmsService.updateBatchById(wmsFlag);
         }
         return SUCCESS;

--
Gitblit v1.9.1