From d57d1ec5df1181244c0a9e425910d562feb2f5a2 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 16 一月 2024 09:36:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 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 9fda3b3..be30999 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -1,6 +1,16 @@
package com.zy.asrs.entity.param;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocDetlRullUpDetail;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.LocDetlRullUpDetailService;
+import com.zy.asrs.service.OrderService;
+import io.swagger.models.License;
import lombok.Data;
+
+import java.util.ArrayList;
import java.util.List;
/**
@@ -9,33 +19,78 @@
@Data
public class TrussCombParam {
- private String barcode;// 瀛楃涓� 鎵樼洏鐮�
- private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
- private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷
+ private String barcode;// 瀛楃涓� 鎵樼洏鐮� 璁㈠崟鍏辩敤 //涓婁紶
+ private Integer palletizingNo = 147;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
+ private Integer staStart = 147;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
+ private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶
+ private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶
+ private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶
+ private String uuid;// 瀛楃涓� 鏃堕棿鎴� //涓婁紶
private String createTime;// 瀛楃涓� 鍒涘缓鏃堕棿
+ private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶
- private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級
+ private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶
@Data
public static class MatList{
- private String matnr;// 鏄� 瀛楃涓� 鐗╂枡缂栫爜
- private String maktx;// 瀛楃涓� 鐗╂枡鍚嶇О
- private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級
- private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級
- private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺
- private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲�
- private String batch;// 瀛楃涓� 鎵规鍙�
+ private String matnr;// 鏄� 瀛楃涓� 鐗╂枡缂栫爜 //涓婁紶
+ private String maktx;// 瀛楃涓� 鐗╂枡鍚嶇О //涓婁紶
+ private String boxNo;// 鏄� 瀛楃涓� 鏈ㄧ缂栧彿锛堝敮涓�瀛楁锛屽嚭搴撲緷鎹紝鍑哄簱鏃舵寜鐓ф湪绠辩紪鍙峰嚭搴擄級 batch //涓婁紶
+ private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 origin //涓婁紶
+ private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶
+ private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� //涓婁紶
+ private String batch;// 瀛楃涓� 绠卞彿
private String specs;// 瀛楃涓� 瑙勬牸
+ private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
private List<MatDetlList> matDetlList;// 鏄� 鍒楄〃 鏈ㄧ涓摐绠斾俊鎭�
}
@Data
public static class MatDetlList{
- private String boxNoDetl;// 鏄� 瀛楃涓� 閾滅當缂栧彿锛堝敮涓�瀛楁锛�
- private String positionDetl;// 鏄� 瀛楃涓� 閾滅當浣嶇疆锛堟媶鍨涙椂闇�瑕侊級
- private Double weightDetl;// 鏄� 灏忔暟鍨� 閲嶉噺
- private String batchDetl;// 瀛楃涓� 鎵规鍙�
- private String specsDetl;// 瀛楃涓� 瑙勬牸
+ private String boxNoDetl;// 鏄� 瀛楃涓� 閾滅當缂栧彿锛堝敮涓�瀛楁锛� //涓婁紶
+ private String positionDetl;// 鏄� 瀛楃涓� 閾滅當浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 //涓婁紶
+ private String weightDetl;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶
+ private String batchDetl;// 瀛楃涓� 鎵规鍙� //涓婁紶
+ private String specsDetl;// 瀛楃涓� 瑙勬牸 //涓婁紶
+ }
+
+ public TrussCombParam(){}
+
+ public TrussCombParam(TrussCombParam trussCombParam, Order order, List<OrderDetl> orderDetlList){
+ LocDetlRullUpDetailService locDetlRullUpDetailService = SpringUtils.getBean(LocDetlRullUpDetailService.class);
+
+ this.barcode = trussCombParam.getBarcode();
+ this.staStart = 147;
+ this.palletizingNo2 = trussCombParam.getPalletizingNo2();
+ this.staEnd = trussCombParam.getStaEnd();
+ this.boxType = orderDetlList.get(0).getBrand();
+ this.uuid = trussCombParam.getBarcode();
+ this.orderNo = trussCombParam.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);
+ }
+ this.matList = matLists;
}
}
--
Gitblit v1.9.1