From 7b3d21cd1c68a48e558fb4255321da8ad7f13b7b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 16 八月 2024 09:04:09 +0800
Subject: [PATCH] 成品入库修改
---
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 67 ++++++++++++++-------------------
1 files changed, 28 insertions(+), 39 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 d99aef9..c7ae086 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -5,6 +5,7 @@
import com.zy.asrs.entity.LocDetlRullUpDetail;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.service.LocDetlRullUpDetailService;
import com.zy.asrs.service.OrderService;
import io.swagger.models.License;
@@ -20,16 +21,17 @@
public class TrussCombParam {
private String barcode;// 瀛楃涓� 鎵樼洏鐮� 璁㈠崟鍏辩敤 //涓婁紶
- private Integer palletizingNo = 147;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
- private Integer staStart = 147;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� //涓婁紶
- private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤
+ private Integer souSta;// 瀛楃涓� 鍘熺珯鐐� 璁㈠崟鍏辩敤
+ private Integer palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
+ private Integer staStart;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
+ private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶 //PDA
private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶
- private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶
+ private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶 //PDA
private String uuid;// 瀛楃涓� 鏃堕棿鎴� //涓婁紶
private String createTime;// 瀛楃涓� 鍒涘缓鏃堕棿
- private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶
+ private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶 //PDA
- private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶
+ private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶 //PDA
@Data
public static class MatList{
@@ -39,9 +41,10 @@
private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 origin //涓婁紶
private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶
private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� //涓婁紶
- private String batch;// 瀛楃涓� 绠卞彿
+ private String batch;// 瀛楃涓� 绠卞彿 //PDA
private String specs;// 瀛楃涓� 瑙勬牸
- private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
+ private String model;// 瀛楃涓� 瑙勬牸
+// private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
private List<MatDetlList> matDetlList;// 鏄� 鍒楄〃 鏈ㄧ涓摐绠斾俊鎭�
}
@@ -56,39 +59,25 @@
public TrussCombParam(){}
- public TrussCombParam(TrussCombParam trussCombParam, Order order, List<OrderDetl> orderDetlList){
- LocDetlRullUpDetailService locDetlRullUpDetailService = SpringUtils.getBean(LocDetlRullUpDetailService.class);
-
- this.barcode = trussCombParam.getBarcode();
+ public TrussCombParam( WrkDetl wrkDetl,Integer staEnd){
+ this.barcode = wrkDetl.getZpallet();
this.staStart = 147;
- this.staEnd = trussCombParam.getStaEnd();
- this.boxType = orderDetlList.get(0).getBrand();
- this.uuid = trussCombParam.getBarcode();
- this.orderNo = trussCombParam.getOrderNo();
+ this.palletizingNo2 = staEnd;
+ this.staEnd = staEnd;
+ this.boxType = wrkDetl.getBrand();
+ this.uuid = wrkDetl.getBarcode();
+ this.orderNo = wrkDetl.getOrderNo();
List<MatList> matLists = new ArrayList<>();
- for (OrderDetl orderDetl:orderDetlList){
- MatList matList = new MatList();
- matList.setMatnr(orderDetl.getMatnr());
- matList.setMaktx(orderDetl.getMaktx());
- matList.setAnfme(orderDetl.getAnfme().intValue());
- matList.setBatch(orderDetl.getBatch());
- matList.setBoxNo(orderDetl.getBatch());
- matList.setPosition("1");
- matList.setWeight(orderDetl.getWeight());
- matList.setSpecs(orderDetl.getSpecs());
- List<MatDetlList> matDetlLists= new ArrayList<>();
- List<LocDetlRullUpDetail> locDetlRullUpDetails = locDetlRullUpDetailService.selectList(new EntityWrapper<LocDetlRullUpDetail>().eq("uuid", orderDetl.getUnit()));
- for (LocDetlRullUpDetail locDetlRullUpDetail:locDetlRullUpDetails){
- MatDetlList matDetlList = new MatDetlList();
- matDetlList.setBoxNoDetl(locDetlRullUpDetail.getRollNo());
- matDetlList.setWeightDetl(locDetlRullUpDetail.getRollWeight());
- matDetlList.setBatchDetl(locDetlRullUpDetail.getStandby1());
- matDetlList.setSpecsDetl(locDetlRullUpDetail.getStandby2());
- matDetlLists.add(matDetlList);
- }
- matList.setMatDetlList(matDetlLists);
- matLists.add(matList);
- }
+ MatList matList = new MatList();
+ matList.setMatnr(wrkDetl.getMatnr());
+ matList.setMaktx(wrkDetl.getMaktx());
+ matList.setAnfme(wrkDetl.getAnfme().intValue());
+ matList.setBatch(wrkDetl.getBatch());
+ matList.setBoxNo(wrkDetl.getBatch());
+ matList.setPosition(wrkDetl.getOrigin());
+ matList.setWeight(wrkDetl.getWeight());
+ matLists.add(matList);
+
this.matList = matLists;
}
--
Gitblit v1.9.1