From c78e0ff5c908de0b15348c9e59db43861a1252c0 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 18 十二月 2025 16:16:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 50cd969..3b2e4ba 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -46,6 +46,13 @@
//閬嶅巻鍗曟嵁
for (String orderNo : orderNos) {
+ OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no",orderNo));
+ if(orderPakin.getDocType() == 16){
+ orderPakin.setMoveStatus(1);
+ orderPakinService.updateById(orderPakin);
+ continue;
+ }
+
try{
List<OrderDetlPakin> orderDetlPakinListAll = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo).eq("inspect",0));
if (orderDetlPakinListAll.size()<1){
@@ -69,15 +76,15 @@
Integer number = basArmRulesService.getNumber(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
if (number == null) {
BasArmRules basArmRules = new BasArmRules();
- basArmRules.setMaterialHeight(orderDetl.getHeight());
- basArmRules.setMaterialWeight(orderDetl.getWeight());
- basArmRules.setMaterialLength(orderDetl.getManLength());
- basArmRules.setMaterialWidth(orderDetl.getWidth());
+ basArmRules.setMaterialHeight(mat.getHeight());
+ basArmRules.setMaterialWeight(mat.getWeight());
+ basArmRules.setMaterialLength(mat.getManLength());
+ basArmRules.setMaterialWidth(mat.getWidth());
basArmRulesService.insert(basArmRules);
return;
} else if (number == 0){
- Integer status = basArmRulesService.getStatus(orderDetl.getWeight(),orderDetl.getVolume(),orderDetl.getManLength(),orderDetl.getWidth(),orderDetl.getHeight());
+ Integer status = basArmRulesService.getStatus(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
if (!Cools.isEmpty(status) && status == 2){
continue;
} else {
--
Gitblit v1.9.1