From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java |  131 ++++++++++++++++++++++++++++---------------
 1 files changed, 84 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
index e39c88e..524f77d 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -14,10 +14,12 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
-import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
+/**
+ * Created by IX on 2024/12/16
+ */
 public enum OrderInAndOutType {
     PAKIN{
         @Transactional
@@ -112,6 +114,17 @@
         }
 
         @Transactional
+        public List<Order> selectComplete9() {
+            List<OrderPakin> orderPakinList = orderPakinService.selectComplete9();
+            return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
+        }
+        @Transactional
+        public List<Order> selectComplete10() {
+            List<OrderPakin> orderPakinList = orderPakinService.selectComplete10();
+            return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
+        }
+
+        @Transactional
         public List<Order> selectComplete8() {
             List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
             return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
@@ -142,30 +155,30 @@
         }
 
         @Transactional
-        public OrderDetl selectItem(Long orderId, String matnr, String batch) {
-            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
+        public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
         }
 
         @Transactional
-        public OrderDetl selectItem(String orderNo, String matnr, String batch) {
-            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch);
+        public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
         }
 
         @Transactional
-        public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+        public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
             List<OrderDetlPakin> orderDetlPakins = OrderTransFormationUtil.transformationDetlListPakin(orderDetls);
-            OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch);
+            OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
         }
         @Transactional
-        public boolean increase(Long orderId, String matnr, String batch, Double qty) {
-            return orderDetlPakinService.increase(orderId, matnr, batch, qty);
+        public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+            return orderDetlPakinService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         }
         @Transactional
-        public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
-            return orderDetlPakinService.decrease(orderNo, matnr, batch, qty);
+        public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+            return orderDetlPakinService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         }
         @Transactional
         public boolean modifyStatus(Long orderId, Integer status) {
@@ -177,12 +190,12 @@
             return orderDetlPakinService.addToLogTable(orderDetlPakin);
         }
         @Transactional
-        public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
-            return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch, qty);
+        public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+            return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         }
         @Transactional
-        public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
-            return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch, workQty);
+        public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
+            return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty);
         }
     },
     PAKOUT{
@@ -278,6 +291,16 @@
             List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
             return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
         }
+        @Transactional
+        public List<Order> selectComplete9() {
+            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete9();
+            return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
+        }
+        @Transactional
+        public List<Order> selectComplete10() {
+            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete10();
+            return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
+        }
 
         @Transactional
         public boolean addToLogTableOrder(Order order) {
@@ -310,30 +333,30 @@
         }
 
         @Transactional
-        public OrderDetl selectItem(Long orderId, String matnr, String batch) {
-            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch);
+        public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
         }
 
         @Transactional
-        public OrderDetl selectItem(String orderNo, String matnr, String batch) {
-            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch);
+        public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
         }
 
         @Transactional
-        public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+        public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
             List<OrderDetlPakout> orderDetlPakouts = OrderTransFormationUtil.transformationDetlListPakout(orderDetls);
-            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch);
+            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
         }
         @Transactional
-        public boolean increase(Long orderId, String matnr, String batch, Double qty) {
-            return orderDetlPakoutService.increase(orderId, matnr, batch, qty);
+        public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+            return orderDetlPakoutService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         }
         @Transactional
-        public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
-            return orderDetlPakoutService.decrease(orderNo, matnr, batch, qty);
+        public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+            return orderDetlPakoutService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         }
         @Transactional
         public boolean modifyStatus(Long orderId, Integer status) {
@@ -345,12 +368,12 @@
             return orderDetlPakoutService.addToLogTable(orderDetlPakout);
         }
         @Transactional
-        public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
-            return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch, qty);
+        public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+            return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         }
         @Transactional
-        public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
-            return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch, workQty);
+        public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
+            return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty);
         }
 
 
@@ -434,6 +457,18 @@
             List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
             return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
         }
+        @Transactional
+        public List<Order> selectComplete9() {
+            List<OrderPakin> orderPakinList = orderPakinService.selectComplete9();
+            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete9();
+            return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
+        }
+        @Transactional
+        public List<Order> selectComplete10() {
+            List<OrderPakin> orderPakinList = orderPakinService.selectComplete10();
+            List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete10();
+            return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
+        }
 
         @Transactional
         public boolean addToLogTableOrder(Order order) {
@@ -469,29 +504,29 @@
         }
 
         @Transactional
-        public OrderDetl selectItem(Long orderId, String matnr, String batch) {
-            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
-            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch);
+        public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout);
         }
 
         @Transactional
-        public OrderDetl selectItem(String orderNo, String matnr, String batch) {
-            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch);
-            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch);
+        public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+            OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+            OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
             return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout);
         }
 
         @Transactional
-        public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+        public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
             throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�487");
         }
         @Transactional
-        public boolean increase(Long orderId, String matnr, String batch, Double qty) {
+        public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
             throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�491");
         }
         @Transactional
-        public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
+        public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
             throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�495");
         }
         @Transactional
@@ -503,11 +538,11 @@
             throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�503");
         }
         @Transactional
-        public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+        public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
             throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�507");
         }
         @Transactional
-        public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+        public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
             throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�511");
         }
     },
@@ -542,6 +577,8 @@
     public abstract List<Order> selectComplete();
 
     public abstract List<Order> selectComplete8();
+    public abstract List<Order> selectComplete9();
+    public abstract List<Order> selectComplete10();
 
     public abstract boolean addToLogTableOrder(Order order);
 
@@ -551,23 +588,23 @@
 
     public abstract Order selectOrderMoveStatusInitial();
 
-    public abstract OrderDetl selectItem(Long orderId, String matnr, String batch);
+    public abstract OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
 
-    public abstract OrderDetl selectItem(String orderNo, String matnr, String batch);
+    public abstract OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
 
-    public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
+    public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
 
-    public abstract boolean increase(Long orderId, String matnr, String batch, Double qty);
+    public abstract boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
 
-    public abstract boolean decrease(String orderNo, String matnr, String batch, Double qty);
+    public abstract boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
 
     public abstract boolean modifyStatus(Long orderId, Integer status);
 
     public abstract boolean addToLogTableOrderDetl(OrderDetl orderDetl);
 
-    public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+    public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
 
-    public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+    public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty);
 
     @Setter
     OrderPakinService orderPakinService;

--
Gitblit v1.9.1