From 94b1cdb1943346c055be5d8c14046d9af390b97e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 13:46:09 +0800
Subject: [PATCH] #贴标机申请获取货物信息 返回值修改
---
src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java | 58 ++++++++++++++++------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 27 ++++++++-----
2 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
index a24c97d..cbc7f2d 100644
--- a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
@@ -24,37 +24,45 @@
*/
private String requestTime;
- private String labTemplate; // 璐存爣妯℃澘鍙凤紙璐存爣鏈虹郴缁熷畾锛�
+// private String labTemplate; // 璐存爣妯℃澘鍙凤紙璐存爣鏈虹郴缁熷畾锛�
private String WrkNo; // 瀛楃涓� 宸ヤ綔鍙� 锛堣创鏍囨満淇濆瓨锛岃创鏍囧畬鎴愯姹傞檮甯︼級
- private String orderNo; // 瀛楃涓� 璁㈠崟鍙�
- private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
+// private String orderNo; // 瀛楃涓� 璁㈠崟鍙�
+// private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
+ private String uuid; // 瀛楃涓� 鏃堕棿鎴�
- private List<CombMat> combMats;
+// private List<CombMat> combMats;
+ private List<BoxNo> boxNos;
@Data
- public static class CombMat{
- private String matnr; // 瀛楃涓� 鍟嗗搧缂栧彿
- private String maktx; // 瀛楃涓� 鍟嗗搧鍚嶇О
- private String specs; // 瀛楃涓� 瑙勬牸
- private String batch; // 瀛楃涓� 鎵规
- private String unit ; //瀛楃涓� 鍗曚綅
- private String anfme; // 瀛楃涓� 鏁伴噺
-
+ public static class BoxNo{
+ private String boxNo; // 瀛楃涓� 鏁伴噺
private String temp1; // 瀛楃涓� 澶囩敤
private String temp2; // 瀛楃涓� 澶囩敤
- private String temp3; // 瀛楃涓� 澶囩敤
- private String temp4; // 瀛楃涓� 澶囩敤
-
- public CombMat(){}
-
- public CombMat(WrkDetl wrkDetl){
- this.matnr = wrkDetl.getMatnr();
- this.maktx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getSpecs();
- this.batch = wrkDetl.getBatch();
- this.unit = wrkDetl.getUnit();
- this.anfme = wrkDetl.getAnfme().toString();
- }
}
+// @Data
+// public static class CombMat{
+// private String matnr; // 瀛楃涓� 鍟嗗搧缂栧彿
+// private String maktx; // 瀛楃涓� 鍟嗗搧鍚嶇О
+// private String specs; // 瀛楃涓� 瑙勬牸
+// private String batch; // 瀛楃涓� 鎵规
+// private String unit ; //瀛楃涓� 鍗曚綅
+// private String anfme; // 瀛楃涓� 鏁伴噺
+//
+// private String temp1; // 瀛楃涓� 澶囩敤
+// private String temp2; // 瀛楃涓� 澶囩敤
+// private String temp3; // 瀛楃涓� 澶囩敤
+// private String temp4; // 瀛楃涓� 澶囩敤
+//
+// public CombMat(){}
+//
+// public CombMat(WrkDetl wrkDetl){
+// this.matnr = wrkDetl.getMatnr();
+// this.maktx = wrkDetl.getMaktx();
+// this.specs = wrkDetl.getSpecs();
+// this.batch = wrkDetl.getBatch();
+// this.unit = wrkDetl.getUnit();
+// this.anfme = wrkDetl.getAnfme().toString();
+// }
+// }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 86d6e57..368d214 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -592,21 +592,28 @@
LabellerMatParam labellerMatParam = new LabellerMatParam();
labellerMatParam.setDevNo(param.getDevNo());
labellerMatParam.setLabNo(param.getLabNo());
- ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
- String orderNo = "";
+// ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
+ ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
+// String orderNo = "";
for (WrkDetl wrkDetl:wrkDetls){
- LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
- orderNo=wrkDetl.getOrderNo();
- combMat.setTemp1("1");
- combMats.add(combMat);
+ LabellerMatParam.BoxNo boxNo = new LabellerMatParam.BoxNo();
+ boxNo.setBoxNo(wrkDetl.getBatch());
+ boxNos.add(boxNo);
}
+ labellerMatParam.setBoxNos(boxNos);
+// for (WrkDetl wrkDetl:wrkDetls){
+// LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
+// orderNo=wrkDetl.getOrderNo();
+// combMat.setTemp1("1");
+// combMats.add(combMat);
+// }
- labellerMatParam.setCombMats(combMats);
- labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
+// labellerMatParam.setCombMats(combMats);
+// labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
- labellerMatParam.setLabTemplate("1");
- labellerMatParam.setOrderNo(orderNo);
+// labellerMatParam.setLabTemplate("1");
+// labellerMatParam.setOrderNo(orderNo);
wrkMast.setWrkSts(53L);
if (!wrkMastService.updateById(wrkMast)){
throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
--
Gitblit v1.9.1