From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 319c1a0..c9d2f09 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,8 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
@@ -58,6 +60,11 @@
}
@Override
+ public List<OrderDetl> selectTotalDetls(Long orderId) {
+ return orderDetlMapper.selectTotalDetls(orderId);
+ }
+
+ @Override
public boolean updateSettle(Long orderId, Long settle, Long userId) {
return this.baseMapper.updateSettle(orderId, settle, userId) > 0;
}
@@ -65,7 +72,7 @@
@Override
public void checkComplete(String orderNo) {
Order order = this.selectByNo(orderNo);
- if (order.getSettle() >= 4L) {
+ if (order==null || order.getSettle() >= 4L) {
return;
}
List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -90,11 +97,12 @@
orderDetl.sync(wrkDetl);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(orderNo);
- if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
orderDetl.setQty(orderDetl.getAnfme());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+
for (OrderDto one : orderDtoList) {
if (one.getOrderNo().equals(orderNo)) {
orderDetl.setAnfme(one.getAnfme());
@@ -216,4 +224,17 @@
return result;
}
+ /**
+ * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗�
+ * @return
+ */
+ @Override
+ public List<Order> selectToBeHistoryOrder() {
+ return this.baseMapper.selectToBeHistoryOrder();
+ }
+
+ @Override
+ public List<Order> selectOrderNoL(String orderNo) {
+ return this.baseMapper.selectOrderNoL(orderNo);
+ }
}
--
Gitblit v1.9.1