From 11972d7f05a60a2e117665ef4900f5f3ad43607d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 13:47:49 +0800
Subject: [PATCH] #贴标机修改完成
---
src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java | 7 +++++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
2 files changed, 6 insertions(+), 3 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 cbc7f2d..b605867 100644
--- a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
@@ -30,6 +30,9 @@
// private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
private String uuid; // 瀛楃涓� 鏃堕棿鎴�
+ private String temp1; // 瀛楃涓� 澶囩敤
+ private String temp2; // 瀛楃涓� 澶囩敤
+
// private List<CombMat> combMats;
private List<BoxNo> boxNos;
@@ -37,8 +40,8 @@
@Data
public static class BoxNo{
private String boxNo; // 瀛楃涓� 鏁伴噺
- private String temp1; // 瀛楃涓� 澶囩敤
- private String temp2; // 瀛楃涓� 澶囩敤
+ private String temp3; // 瀛楃涓� 澶囩敤
+ private String temp4; // 瀛楃涓� 澶囩敤
}
// @Data
// public static class CombMat{
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 368d214..2b64deb 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -592,6 +592,7 @@
LabellerMatParam labellerMatParam = new LabellerMatParam();
labellerMatParam.setDevNo(param.getDevNo());
labellerMatParam.setLabNo(param.getLabNo());
+ labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
// ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
// String orderNo = "";
@@ -611,7 +612,6 @@
// labellerMatParam.setCombMats(combMats);
// labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
- labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
// labellerMatParam.setLabTemplate("1");
// labellerMatParam.setOrderNo(orderNo);
wrkMast.setWrkSts(53L);
--
Gitblit v1.9.1