From 9dd23778d5b9a97da390abc4e6f785e60767acf4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 26 十月 2024 15:12:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/TrussCombParam.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 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..c7ae086 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -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