From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 06 十二月 2024 15:15:01 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 6ff35f8..7c6f793 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -74,6 +74,8 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Resource
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Resource
private BasDevpMapper basDevpMapper;
@@ -263,10 +265,10 @@
throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
if(param.getBarcode().length()!=9){
throw new CoolException("鏉＄爜闀垮害涓嶆槸9浣�===>>" + param.getBarcode());
@@ -274,9 +276,9 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
Date now = new Date();
@@ -372,7 +374,8 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setManu(detlDto.getMark());
+ waitPakin.setManu(detlDto.getMark()); //鏍囪
+ waitPakin.setOrigin(order.getItemName());//浠撳簱
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -818,7 +821,7 @@
String barcode2 = map.get("barcode2").toString();
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",barcode2));
- int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("zpallet",barcode2).ne("io_type",200));
+ int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",barcode2).ne("io_type",200));
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode2));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("璇ユ潯鐮佸凡琚娇鐢�===>>" + barcode2);
@@ -876,6 +879,34 @@
}
@Override
+ public void pdaAdjust(pdaAdjustParam param, Long userId) {
+ if (Cools.isEmpty(param)){
+ throw new CoolException("鐩樼偣鍒楄〃鍙傛暟涓虹┖");
+ }
+ for (InventoryCheckOrderDetl orderDetl: param.getParam()){
+ InventoryCheckOrderDetl inventoryCheckOrderDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
+ .eq("order_no", orderDetl.getOrderNo())
+ .eq("matnr", orderDetl.getMatnr())
+ .eq("batch", orderDetl.getBatch()));
+ if (Cools.isEmpty(inventoryCheckOrderDetl)){
+ throw new CoolException("鏈煡璇㈠埌鐩樼偣淇℃伅");
+ }
+ if (!inventoryCheckOrderDetl.getStatus().equals("1")){
+ throw new CoolException("璇ヤ换鍔″凡鐩樼偣");
+ }
+ inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme());
+ inventoryCheckOrderDetl.setStatus("2");
+ if (!inventoryCheckOrderDetlService.updateById(inventoryCheckOrderDetl)){
+ throw new CoolException("淇濆瓨鐩樼偣淇℃伅澶辫触!");
+ }
+
+ }
+
+
+
+ }
+
+ @Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now) {
--
Gitblit v1.9.1