From 53e23d4b25ee16b696a5c7094da4f1accaaa4e83 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 03 四月 2024 15:43:31 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 2 +-
src/main/java/com/zy/asrs/controller/OrderController.java | 6 ++++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 22 ++++++++++++----------
src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java | 23 +++++++++++++++++++++++
4 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
index 7a29307..bc9d49e 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,9 +13,11 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvWaitPakinService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +35,8 @@
private AgvWaitPakinService agvWaitPakinService;
@Autowired
private AgvBasDevpService agvBasDevpService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -100,6 +105,24 @@
}else {
return R.error("鏂欑鐮佷负" + entity.getSuppCode() + "宸茬粦瀹氱珯鐐癸紝璇峰厛浠嶢GV绔欑偣绠＄悊瑙ｇ粦璇ユ枡绠�");
}
+ //璁㈠崟鍥炴粴
+ if(!Cools.isEmpty(entity.getOrderNo())){
+ String orderNo = entity.getOrderNo();
+ if(orderNo.contains("{")){
+ JSONArray orderArray = JSON.parseArray(orderNo);
+ for (Object o : orderArray){
+ JSONObject jsonobject = (JSONObject) o;
+ OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(jsonobject.get("orderNo").toString(),entity.getMatnr(),entity.getThreeCode(),entity.getDeadTime());
+ orderDetl.setQty(orderDetl.getQty() - entity.getAnfme());
+ orderDetlService.updateById(orderDetl);
+ }
+
+ }else {
+ OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMatnr(entity.getOrderNo(),entity.getMatnr(),entity.getThreeCode(),entity.getDeadTime());
+ orderDetl.setQty(orderDetl.getQty() - entity.getAnfme());
+ orderDetlService.updateById(orderDetl);
+ }
+ }
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 3caedd3..bac2eca 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -463,6 +463,12 @@
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
+ if(docType.getPakin() == 1){
+ uuid += "_I";
+ }else {
+ uuid += "_O";
+ }
+
Order order = orderService.selectByNo(uuid);
if (null == order) {
order = new Order(
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index b6b41c6..8f77aea 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -592,6 +592,18 @@
}
}
+ //淇濆瓨宸ヤ綔妗ｄ互鍙婃槑缁�
+ agvWrkMastLogService.save(wrkMast);
+ agvWrkDetlLogService.save(wrkMast.getWrkNo());
+
+ //鍒犻櫎宸ヤ綔妗ｄ互鍙婃槑缁�
+ if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
+ throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10){
+ return;
+ }
//璁㈠崟鍥炴粴
//List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -616,16 +628,6 @@
}
}
});
-
-
- //淇濆瓨宸ヤ綔妗ｄ互鍙婃槑缁�
- agvWrkMastLogService.save(wrkMast);
- agvWrkDetlLogService.save(wrkMast.getWrkNo());
-
- //鍒犻櫎宸ヤ綔妗ｄ互鍙婃槑缁�
- if(!agvWrkMastService.deleteByWrkNo(wrkMast.getWrkNo()) || !agvWrkDetlService.deleteByWrkNo(wrkMast.getWrkNo())){
- throw new CoolException("鍒犻櫎澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
}
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 633204b..a332758 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -162,7 +162,7 @@
/*
鑷姩鐢熸垚绌烘澘鍑哄簱浠诲姟
*/
- //@Scheduled(cron = "0/10 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
public void autoEmptyOut(){
boolean packageEmptyAutoOUt = Cools.eq("Y",Parameter.get().getPackageEmptyAutoOUt());
boolean mateEmptyAutoOut = Cools.eq("Y",Parameter.get().getMateEmptyAutoOut());
--
Gitblit v1.9.1