From f60955e2ffe9b183e72911e361fa0632e3c780c7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 16 一月 2026 08:23:35 +0800
Subject: [PATCH] 修复订单上报订单完成时间

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 099f918..0e8f868 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -28,6 +28,20 @@
     }
 
     @Override
+    public Page<OrderDetl> getPakoutPagexs(Page<OrderDetl> page) {
+        page.setRecords(baseMapper.getPakoutPagexs(page.getCondition()));
+        page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public Page<OrderDetl> getPakoutPagenotxs(Page<OrderDetl> page) {
+        page.setRecords(baseMapper.getPakoutPagenotxs(page.getCondition()));
+        page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
     public OrderDetl selectItem(Long orderId, String matnr, String batch) {
         return this.baseMapper.selectItem(orderId, matnr, batch);
     }
@@ -103,7 +117,7 @@
      * @return
      */
     @Override
-    public boolean increaseWorkQty2(Long orderId, String matnr, String batch, Double workQty, String color) {
+    public boolean increaseWorkQty2(Long orderId, String matnr, String batch, Double workQty, Long color) {
         return this.baseMapper.increaseWorkQty2(orderId, matnr, batch, workQty, color) > 0;
     }
 

--
Gitblit v1.9.1