From f40544aad75cf8b4ddf03b31bb0ecd4611c29d10 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 08 七月 2025 09:44:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 a16da33..926acab 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -8,10 +8,7 @@
 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.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.common.model.DetlDto;
@@ -58,6 +55,8 @@
 
     @Autowired
     private OpenService openService;
+    @Autowired
+    private StoreTypeService storeTypeService;
 
     /**
      * 鍙戣揣
@@ -67,9 +66,14 @@
     @Transactional
     public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
         try {
+            List<String> ids = storeTypeService.listOwn();
             HashMap<String, List<NccSaleXsfhmxWms>> map = new HashMap<>();
             List<NccSaleXsfhmxWms> fenzu;
             for (NccSaleXsfhmxWms wms : wmsFlag) {
+                if(!ids.contains(wms.getFhckbm())){
+                    continue;
+                }
+
                 if (map.get(wms.getFhckbm()) == null) {
                     fenzu = new ArrayList<>();
                     fenzu.add(wms);
@@ -91,6 +95,7 @@
                     detlDto = new DetlDto();
                     detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
                     detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+                    detlDto.setBatch(nccSaleXsfhmxWms.getVbatchcode());
                     detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
                     detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
                     detlDto.setLineNumber(i);
@@ -101,10 +106,12 @@
                     nccSaleXsfhmxWms.setWmsFlag(1);
                     param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
                     param.setCstmrName(nccSaleXsfhmxWms.getKhmc());
+                    param.setKpCstmrName(nccSaleXsfhmxWms.getKpkhmc());
                 }
                 param.setOrderDetails(orderDetails);
                 openService.pakoutOrderCreate(param);
                 nccSaleXsfhmxWmsService.updateBatchById(map.get(key));
+                size++;
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -131,6 +138,7 @@
                 detlDto = new DetlDto();
                 detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
                 detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+                detlDto.setWeight(nccSaleXsfhmxWms.getNastnum().doubleValue());
                 detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
                 detlDto.setLineNumber(i);
                 detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
@@ -169,6 +177,7 @@
                 detlDto = new DetlDto();
                 detlDto.setMatnr(nccScZkmxbWms.getWlbm());
                 detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+                detlDto.setWeight(nccScZkmxbWms.getYingzsl().doubleValue());
                 detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
                 detlDto.setLineNumber(i);
                 detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
@@ -207,6 +216,7 @@
                 detlDto = new DetlDto();
                 detlDto.setMatnr(nccScZkmxbWms.getWlbm());
                 detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue());
+                detlDto.setWeight(nccScZkmxbWms.getYingzsl().doubleValue());
                 detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
                 detlDto.setLineNumber(i);
                 detlDto.setRemark(JSONObject.toJSONString(nccScZkmxbWms));
@@ -244,6 +254,7 @@
                 detlDto = new DetlDto();
                 detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
                 detlDto.setAnfme(nccCgCgdhdWms.getYdzsl().doubleValue());
+                detlDto.setAnfme(nccCgCgdhdWms.getYdsl().doubleValue());
                 detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
                 detlDto.setLineNumber(i);
                 detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
@@ -324,6 +335,7 @@
                 detlDto = new DetlDto();
                 detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
                 detlDto.setAnfme(nccCgCgdhdWms.getZsl().doubleValue());
+                detlDto.setWeight(nccCgCgdhdWms.getFsl().doubleValue());
                 detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
                 detlDto.setLineNumber(i);
                 detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));

--
Gitblit v1.9.1