From 7c9a9094492f40d99ff18009a7a2604980e6189a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 18:40:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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..83658c3 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);
@@ -654,11 +654,12 @@
if (param.getLabResult().equals("OK")){
wrkMast.setWrkSts(54L);
+ wrkMast.setStaNo(144);
if (!wrkMastService.updateById(wrkMast)){
throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
}
}else if (param.getLabResult().equals("NG")){
- wrkMast.setWrkSts(52L);
+ wrkMast.setWrkSts(52L);//閲嶆柊璐存爣
if (!wrkMastService.updateById(wrkMast)){
throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
}
@@ -819,7 +820,7 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(51L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(202); // 鍏ュ嚭搴撶姸鎬侊細202.鎷嗗灈鍚庡嚭搴�
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(99D); // 浼樺厛绾�
wrkMast.setSourceStaNo(param.getDevNo$());
wrkMast.setStaNo(140); //璐存爣绔欑偣
// 鎿嶄綔浜哄憳鏁版嵁
--
Gitblit v1.9.1