From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 dd11979..0e8f868 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.asrs.service.OrderDetlService;
import org.springframework.stereotype.Service;
+import java.util.Collections;
import java.util.List;
@Service("orderDetlService")
@@ -22,6 +23,20 @@
@Override
public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+ page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+ return page;
+ }
+
+ @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;
}
@@ -102,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;
}
@@ -119,4 +134,9 @@
public boolean increaseWorkQtytest(String orderNo, String matnr, String batch, Double anfme) {
return this.baseMapper.increaseWorkQtytest(orderNo, matnr, batch, anfme) > 0;
}
+
+ @Override
+ public List<OrderDetl> reportERPOrderDetl() {
+ return this.baseMapper.reportERPOrderDetl();
+ }
}
--
Gitblit v1.9.1