From 1607086231421efad1dae82c00f044b0b9070532 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 19 一月 2024 18:08:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 49 +++++++++++++++++++------------------------------
1 files changed, 19 insertions(+), 30 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 cd25e71..022f751 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;
@@ -58,40 +59,28 @@
public TrussCombParam(){}
- public TrussCombParam(TrussCombParam trussCombParam, Order order, List<OrderDetl> orderDetlList){
+ public TrussCombParam( WrkDetl wrkDetl){
LocDetlRullUpDetailService locDetlRullUpDetailService = SpringUtils.getBean(LocDetlRullUpDetailService.class);
- this.barcode = trussCombParam.getBarcode();
+ this.barcode = wrkDetl.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();
+ this.palletizingNo2 = 118;
+ this.staEnd = 118;
+ 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("1");
+ matList.setWeight(wrkDetl.getWeight());
+ matList.setSpecs(wrkDetl.getSpecs());
+ matLists.add(matList);
+
this.matList = matLists;
}
--
Gitblit v1.9.1