From 6fe4619fd97c6aa90a0bfeffbfa62603691a1ab4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 29 五月 2025 09:15:03 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 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 fa91563..492455b 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -1,7 +1,6 @@
 package com.zy.nc.task.handler;
 
 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;
@@ -21,6 +20,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.ArrayList;
@@ -63,17 +63,19 @@
      *
      * @return
      */
+    @Transactional
     public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
         try {
             OpenOrderPakoutParam param = new OpenOrderPakoutParam();
-            param.setOrderType("閿�鍞彂璐�");
             DetlDto detlDto;
             List<DetlDto> orderDetails = new ArrayList<>();
             long i = 1;
             for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) {
+                param.setOrderType("閿�鍞彂璐�");
                 detlDto = new DetlDto();
                 detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
-                detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum().doubleValue());
+                detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+                detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
                 detlDto.setLineNumber(i);
                 detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
                 orderDetails.add(detlDto);
@@ -87,7 +89,44 @@
             nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
         } catch (Exception e) {
             e.printStackTrace();
-            TransactionAspectSupport. currentTransactionStatus().setRollbackOnly();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return FAIL.setMsg(e.getMessage());
+        }
+        return SUCCESS;
+    }
+
+    /**
+     * 鍙戣揣
+     *
+     * @return
+     */
+    @Transactional
+    public ReturnT<String> start1In(List<NccSaleXsfhmxWms> wmsFlag) {
+        try {
+            OpenOrderPakinParam param = new OpenOrderPakinParam();
+            DetlDto detlDto;
+            List<DetlDto> orderDetails = new ArrayList<>();
+            long i = 1;
+            for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) {
+                param.setOrderType("閿�鍞��璐�");
+                detlDto = new DetlDto();
+                detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
+                detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+                detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
+                detlDto.setLineNumber(i);
+                detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
+                orderDetails.add(detlDto);
+                log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
+                i++;
+                nccSaleXsfhmxWms.setWmsFlag(1);
+                param.setOrderNo(nccSaleXsfhmxWms.getVbillcode());
+            }
+            param.setOrderDetails(orderDetails);
+            openService.pakinOrderCreate(param);
+            nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return FAIL.setMsg(e.getMessage());
         }
         return SUCCESS;
@@ -98,6 +137,7 @@
      *
      * @return
      */
+    @Transactional
     public ReturnT<String> start2In(List<NccScZkmxbWms> wmsFlag) {
         try {
             OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -135,6 +175,7 @@
      *
      * @return
      */
+    @Transactional
     public ReturnT<String> start2Out(List<NccScZkmxbWms> wmsFlag) {
         try {
             OpenOrderPakoutParam param = new OpenOrderPakoutParam();
@@ -171,6 +212,7 @@
      *
      * @return
      */
+    @Transactional
     public ReturnT<String> start3(List<NccCgCgdhdWms> wmsFlag) {
         try {
             OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -209,6 +251,7 @@
      *
      * @return
      */
+    @Transactional
     public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
         try {
             InventoryCheckOrder param = new InventoryCheckOrder();
@@ -218,10 +261,6 @@
                 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()).eq("batch", nccScZkmxbWms.getVbatchcode()));
-                if (checkOrderDetls != null && !checkOrderDetls.isEmpty()) {
-                    //throw new CoolException(nccScZkmxbWms.getWlbm() + "鐩樼偣鍗曠殑鏄庣粏閲嶅浜�");
                 }
                 checkOrderDetl = new InventoryCheckOrderDetl();
                 checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm());
@@ -253,6 +292,7 @@
      *
      * @return
      */
+    @Transactional
     public ReturnT<String> start5(List<NccSaleDbddWms> wmsFlag) {
         try {
             OpenOrderPakoutParam param = new OpenOrderPakoutParam();

--
Gitblit v1.9.1