From 7662f4db87c6e5510d4f2429900012f871497ed6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 14 四月 2025 12:57:10 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/CommonService.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c9df23c..467b794 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -124,18 +124,18 @@
throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
}
- if (!sourceLocMast.getLocSts().equals("F")) {
- throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
- }
+// if (!sourceLocMast.getLocSts().equals("F")) {
+// throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
+// }
LocMast locMast = locMastService.queryByLoc(param.getLocNo());
if (null == locMast) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�");
}
- if (!locMast.getLocSts().equals("O")) {
- throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
- }
+// if (!locMast.getLocSts().equals("O")) {
+// throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+// }
// 鑾峰彇宸ヤ綔鍙�
int workNo = getWorkNo(WrkIoType.LOC_MOVE.id);
@@ -157,13 +157,13 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- sourceLocMast.setLocSts("R");
- sourceLocMast.setModiTime(new Date());
- locMastService.updateById(sourceLocMast);
-
- locMast.setLocSts("S");
- locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+// sourceLocMast.setLocSts("R");
+// sourceLocMast.setModiTime(new Date());
+// locMastService.updateById(sourceLocMast);
+//
+// locMast.setLocSts("S");
+// locMast.setModiTime(new Date());
+// locMastService.updateById(locMast);
return true;
}
@@ -193,6 +193,7 @@
wrkMast.setSourceStaNo(param.getSourceStaNo());//婧愮珯
wrkMast.setStaNo(param.getStaNo());//鐩爣绔�
wrkMast.setWmsWrkNo(param.getTaskNo());
+ wrkMast.setBarcode(param.getBarcode());
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
boolean res = wrkMastService.insert(wrkMast);
--
Gitblit v1.9.1