From 728ae1ba12ed4f59fa4dd897b74dd55b415856e5 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 十一月 2024 14:29:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 37b44bc..db4b0a1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -83,13 +83,14 @@
}
// 鍏堢粦瀹�
- boolean flag = bindPodAndBerth(sta);
- if (!flag) {
- return R.parse(inSta + "缁戝畾澶辫触");
- }
+// boolean flag = bindPodAndBerth(sta);
+// if (!flag) {
+// return R.parse(inSta + "缁戝畾澶辫触");
+// }
ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+ forwardAGVTaskParam.setClientCode("IWMS");
forwardAGVTaskParam.setTaskTyp("GT3");
forwardAGVTaskParam.setCtnrTyp("2");
forwardAGVTaskParam.setPriority("1");
@@ -256,9 +257,6 @@
if(param.getBarcode().length()!=9){
throw new CoolException("鏉＄爜闀垮害涓嶆槸9浣�===>>" + param.getBarcode());
}
- if (param.getCombMats().size()>1){
- throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
- }
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
@@ -370,6 +368,57 @@
}
+ @Override
+ @Transactional
+ public void mergeComb(CombParam param, Long userId) {
+
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
+
+
+
+ Date now = new Date();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ LocDetl locDetl = new LocDetl();
+ locDetl.sync(mat);
+ locDetl.setLocNo(wrkMast.getSourceLocNo());
+ locDetl.setZpallet(param.getBarcode());
+ locDetl.setAnfme(combMat.getAnfme());
+ locDetl.setAppeTime(now);
+ locDetl.setAppeUser(userId);
+ locDetl.setModiTime(now);
+ locDetl.setModiUser(userId);
+ locDetlService.insert(locDetl);
+ }
+
+
+
+
+
+ }
+
// 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
--
Gitblit v1.9.1