From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
index 022f751..0ba40b7 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -41,7 +41,7 @@
private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 origin //涓婁紶
private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶
private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� //涓婁紶
- private String batch;// 瀛楃涓� 绠卞彿 //PDA
+ private String batch;// 瀛楃涓� 鎵规 //PDA
private String specs;// 瀛楃涓� 瑙勬牸
private String model;// 瀛楃涓� 瑙勬牸
// private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
@@ -59,13 +59,11 @@
public TrussCombParam(){}
- public TrussCombParam( WrkDetl wrkDetl){
- LocDetlRullUpDetailService locDetlRullUpDetailService = SpringUtils.getBean(LocDetlRullUpDetailService.class);
-
- this.barcode = wrkDetl.getBarcode();
+ public TrussCombParam( WrkDetl wrkDetl,Integer staEnd){
+ this.barcode = wrkDetl.getZpallet();
this.staStart = 147;
- this.palletizingNo2 = 118;
- this.staEnd = 118;
+ this.palletizingNo2 = staEnd;
+ this.staEnd = staEnd;
this.boxType = wrkDetl.getBrand();
this.uuid = wrkDetl.getBarcode();
this.orderNo = wrkDetl.getOrderNo();
@@ -76,9 +74,8 @@
matList.setAnfme(wrkDetl.getAnfme().intValue());
matList.setBatch(wrkDetl.getBatch());
matList.setBoxNo(wrkDetl.getBatch());
- matList.setPosition("1");
+ matList.setPosition(wrkDetl.getOrigin());
matList.setWeight(wrkDetl.getWeight());
- matList.setSpecs(wrkDetl.getSpecs());
matLists.add(matList);
this.matList = matLists;
--
Gitblit v1.9.1