From 09423de35f61e63be85dc3ee8906c80c32576990 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 11 六月 2025 10:29:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 e5ba7e8..c5bd39a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -80,6 +80,8 @@
private StaDescService staDescService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
@Override
@Transactional
@@ -725,9 +727,9 @@
}else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍑�閲� weight涓虹┖");
}else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細姣涢噸 roughWeight涓虹┖");
}else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
- throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent");
+ throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鍗烽暱搴� rollExtent涓虹┖");
}
// else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
// throw new CoolException("瑙勬牸锛�"+matList.getMatnr()+"銆佸弬鏁帮細鎺ュご鏁� joint");
@@ -820,6 +822,11 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
+
+ RgvOneSign armNo = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","armNo"+param.getPalletizingNo()));
+ armNo.setRgvOneSign(1);
+ rgvOneSignService.updateById(armNo);
+
}
}
@@ -876,16 +883,16 @@
throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
}
-// if (Cools.isEmpty(param.getBarcode())){
-// throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
-// }
-// WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
-// if (Cools.isEmpty(wrkMastMatrix)){
-// throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
-// }
-// if (!wrkMastMatrix.getSheetNo().equals("1")){
-// throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
-// }
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }
+ WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
+ if (Cools.isEmpty(wrkMastMatrix)){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜鏌ヨ宸ヤ綔妗ｅけ璐ワ細"+param.getBarcode());
+ }
+ if (!wrkMastMatrix.getSheetNo().equals("1")){
+ throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
+ }
ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
@@ -973,7 +980,7 @@
throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode());
}
- wrkMastMatrix.setSheetNo("2");
+ wrkMastMatrix.setSheetNo("3");
if (!wrkMastService.updateById(wrkMastMatrix)){
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡");
}
--
Gitblit v1.9.1