From 425a0c6764e932594c7289a62c84fe7c695ee27a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 01 十二月 2025 15:02:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..4353e93 100644
--- a/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ArmOrderAssignmentParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.zy.asrs.entity.BasArm;
import com.zy.asrs.entity.BasArmMast;
import com.zy.asrs.entity.result.OrderDetlValueResultUtil;
import lombok.Data;
@@ -44,28 +45,32 @@
public SKUInfo() {};
public SKUInfo(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil){
- id = basArmMast.getSku();
+ id = basArmMast.getMatnr();
length = orderDetlValueResultUtil.getLength();
width = orderDetlValueResultUtil.getWidth();
+ if (length<width){
+ width = orderDetlValueResultUtil.getLength();
+ length = orderDetlValueResultUtil.getWidth();
+ }
weight = orderDetlValueResultUtil.getWeight();
height = orderDetlValueResultUtil.getHeight();
}
}
public OrderItem() {};
- public OrderItem(BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
+ public OrderItem(BasArm basArm,BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
target_num = orderDetlValueResultUtil.getAnfme().intValue();
- from = basArmMast.getSortingLine().toString();
- to = basArmMast.getStaNo().toString();
+ from = String.valueOf(basArm.getSortingLine());
+ to = String.valueOf(basArm.getStaNo());
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());
+ public ArmOrderAssignmentParam(BasArm basArm, BasArmMast basArmMast, OrderDetlValueResultUtil orderDetlValueResultUtil) {
+ order_id = basArmMast.getMatnr()+sign_arm_sku+basArmMast.getBindingTags()+sign_arm_sku+basArmMast.getOrderNo()+sign_arm_order+basArm.getSortingLine();
List<OrderItem> orderItemArrayList= new ArrayList<>();
- OrderItem orderItem = new OrderItem(basArmMast,orderDetlValueResultUtil);
+ OrderItem orderItem = new OrderItem(basArm,basArmMast,orderDetlValueResultUtil);
orderItemArrayList.add(orderItem);
order_items = orderItemArrayList;
}
--
Gitblit v1.9.1