From ba4e5ac7bd44e0d24f480b44a94cfe8d256a86e9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 10 十月 2023 14:09:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
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 e7b35ac..bbd57fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -13,7 +13,6 @@
import com.zy.common.model.OrderDto;
import com.zy.common.model.StartupDto;
import com.zy.common.model.TaskDto;
-import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.AgvCommonService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -79,7 +78,7 @@
throw new CoolException("閫変腑鐨勭珯鐐逛腑鍚湁璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱鐨勭珯鐐癸紝璇烽噸鏂伴�夋嫨");
}
- List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("zpallet", agvBasDevp.getBarcode()));
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast agvLocMast = agvCommonService.getLocNo(agvWaitPakinList, agvBasDevp.getFloor());
@@ -89,7 +88,7 @@
//鐢熸垚宸ヤ綔妗ｆ槑缁�
//createWrkDetlReWrite(agvWaitPakinList,wrkMast,userId);
agvWaitPakinList.forEach(wp -> {
- createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getZpallet(),now,userId,wp.getThreeCode(),wp.getDeadTime());
+ createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime());
});
//鏇存柊婧愮珯鐐逛俊鎭�
updateAgvBasDevp(agvBasDevp,"R");
@@ -119,7 +118,7 @@
long wrkSts = 21L;
String sourceLocNo = taskDto.getLocNo();
String targetLocNo = taskDto.getAgvStaNo();
- String barcode = agvLocDetl.getZpallet();
+ String barcode = agvLocDetl.getSuppCode();
//鏄庣粏妗ｆ墍闇�鍙傛暟
String mantr = taskDto.getLocDtos().get(0).getMatnr();
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
@@ -209,7 +208,7 @@
Date now = new Date();
//鐢熸垚宸ヤ綔鍏�
- AgvWrkMast wrkMast = createWrkMast(107, 21L, locDetl.getLocNo(), agvBasDevp.getDevNo(), agvLocDetl.getZpallet(), now, userId);
+ AgvWrkMast wrkMast = createWrkMast(107, 21L, locDetl.getLocNo(), agvBasDevp.getDevNo(), agvLocDetl.getSuppCode(), now, userId);
//鐢熸垚宸ヤ綔鏄庣粏妗�
createWrkDetlReWrite(locDetl.getMatnr(),wrkMast.getWrkNo(),null,locDetl.getBatch(),locDetl.getCount(),wrkMast.getBarcode(),now,userId,agvLocDetl.getThreeCode(),agvLocDetl.getDeadTime());
//淇敼搴撲綅淇℃伅
@@ -239,7 +238,7 @@
Date now = new Date();
//鐢熸垚绉诲簱宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getZpallet(), now, userId);
+ AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId);
//鐢熸垚宸ヤ綔鍏氭槑缁�
createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime());
//淇敼鐩爣搴撲綅鐘舵��
@@ -466,7 +465,7 @@
wrkDetl.setIoTime(now);
wrkDetl.setBatch(batch);
wrkDetl.setAnfme(anfme); // 鏁伴噺
- wrkDetl.setZpallet(zpallet); // 鎵樼洏鏉＄爜
+ wrkDetl.setSuppCode(zpallet); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(now);
wrkDetl.setModiUser(userId);
@@ -514,8 +513,8 @@
private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId){
AgvWrkMast wrkMast = new AgvWrkMast();
//鐢熸垚宸ヤ綔鍙�
- int workNo = agvCommonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- wrkMast.setWrkNo(workNo);
+// int workNo = agvCommonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+// wrkMast.setWrkNo();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
//鍏ュ嚭搴撶被鍨�
@@ -542,9 +541,16 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
- if (!agvWrkMastService.insert(wrkMast)) {
+
+ if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+
+ int i = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>());
+ log.info(i + "");
+
+
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
return wrkMast;
}
@@ -556,8 +562,8 @@
private AgvWrkMast createWrkMast(AgvBasDevp agvBasDevp,AgvLocMast agvLocMast, Date now, Long userId){
AgvWrkMast wrkMast = new AgvWrkMast();
//鐢熸垚宸ヤ綔鍙�
- int workNo = agvCommonService.getWorkNo(0);
- wrkMast.setWrkNo(workNo);
+ //int workNo = agvCommonService.getWorkNo(0);
+ //wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(new Date());
// 宸ヤ綔鐘舵�侊細201.鐢熸垚鍏ュ簱浠诲姟ID
wrkMast.setWrkSts(201L);
--
Gitblit v1.9.1