From 8b9bc3962f02f2739b20b1772f92a1f8e3072b06 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 17:18:06 +0800
Subject: [PATCH] *30===>10
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 35f4abc..6676d16 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -599,9 +599,10 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkMast)){
throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔′笉瀛樺湪,浠诲姟鍙凤細"+basDevp.getWrkNo());
- }else if (!wrkMast.getWrkSts().equals(52L)){
- throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
}
+// else if (!wrkMast.getWrkSts().equals(52L)){
+// throw new CoolException("绔欑偣:"+param.getDevNo()+" 宸ヤ綔涓换鍔＄姸鎬佸凡鍙樻洿锛岃鍕块噸澶嶇敵璇�,浠诲姟鍙凤細"+basDevp.getWrkNo()+",浠诲姟鐘舵��:"+wrkMast.getWrkSts$());
+// }
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
@@ -633,10 +634,10 @@
// labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
// labellerMatParam.setLabTemplate("1");
// labellerMatParam.setOrderNo(orderNo);
- wrkMast.setWrkSts(53L);
- if (!wrkMastService.updateById(wrkMast)){
- throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
- }
+// wrkMast.setWrkSts(53L);
+// if (!wrkMastService.updateById(wrkMast)){
+// throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+// }
return labellerMatParam;
}
--
Gitblit v1.9.1