From 766b76e287b7be3a51a9448d5045c39ec6c245f8 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 23 九月 2025 22:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
index b952d93..5f90abd 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -55,15 +55,15 @@
public OrderItem() {};
public OrderItem(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
target_num = orderDetlValueResultUtil.getAnfme().intValue();
- from = basArmMast.getSortingLine().toString();
- to = basArmMast.getStaNo().toString();
+ from = String.valueOf((basArmMast.getSortingLine()+1)%2);
+ to = String.valueOf((basArmMast.getSortingLine()+1)%2+2);
sku_info = new SKUInfo(basArmMast,orderDetlValueResultUtil);
};
}
public ArmOrderAssignmentParam() {}
public ArmOrderAssignmentParam(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
- order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+String.valueOf(basArmMast.getSortingLine());
+ order_id = basArmMast.getSku()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+(basArmMast.getSortingLine()+1)%2;
List<OrderItem> orderItemArrayList= new ArrayList<>();
OrderItem orderItem = new OrderItem(basArmMast,orderDetlValueResultUtil);
orderItemArrayList.add(orderItem);
--
Gitblit v1.9.1