From 6b3b0bbef242997de2f6665dce91964c4ca4a92e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 10:44:00 +0800
Subject: [PATCH] 单据数据传递给u8通了；代码中//TODO 张超注释的，上线时需要打开注释
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 362 ++++++++++++++++++++++++++------------------------
1 files changed, 188 insertions(+), 174 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 59d0999..b253cfd 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -105,7 +105,7 @@
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2());
+ AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2(),agvLocMast.getPltType());
//鏍囪鏄惁涓鸿緭閫佺嚎鍏ュ簱
wrkMast.setMk(isConveyor ? "Y" : "N");
//鐢熸垚宸ヤ綔妗ｆ槑缁�
@@ -144,11 +144,11 @@
//String barcode = agvLocDetls.get(0).getSuppCode();
String containerCode = taskDto.getLocDtos().get(0).getContainerCode();
-
+ AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
int ioType = isPakOut(sourceLocNo,taskDto) ? 101 : 103;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
+ AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
long flowId = snowflakeIdWorker.nextId();
taskDto.getLocDtos().forEach(locDto -> {
@@ -168,32 +168,32 @@
OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(wrkMast.getSourceLocNo());
- flowLog.setSpare1(containerCode);
- flowLog.setOpType(4L);
- flowLog.setOrderNo(locDto.getOrderNo());
- flowLog.setThreeCode(locDto.getCsocode());
- flowLog.setMatnr(locDto.getMatnr());
- flowLog.setMaktx(locDto.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
- flowLog.setQtyChanged(locDto.getAnfme());
-
- flowLog.setLocPrevious(locDetl.getAnfme());
- flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
- flowLog.setLocChanged(locDto.getAnfme());
- flowLog.setUserId(userId);
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(wrkMast.getSourceLocNo());
+// flowLog.setSpare1(containerCode);
+// flowLog.setOpType(4L);
+// flowLog.setOrderNo(locDto.getOrderNo());
+// flowLog.setThreeCode(locDto.getCsocode());
+// flowLog.setMatnr(locDto.getMatnr());
+// flowLog.setMaktx(locDto.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
+// flowLog.setQtyChanged(locDto.getAnfme());
+//
+// flowLog.setLocPrevious(locDetl.getAnfme());
+// flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
+// flowLog.setLocChanged(locDto.getAnfme());
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}else {
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
@@ -250,11 +250,11 @@
//String barcode = agvLocDetls.get(0).getSuppCode();
String containerCode = taskDto.getLocDtos().get(0).getContainerCode();
-
+ AgvLocMast agvLocMast = agvLocMastService.selectById(sourceLocNo);
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
int ioType = 107;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
+ AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
long flowId = snowflakeIdWorker.nextId();
taskDto.getLocDtos().forEach(locDto -> {
@@ -274,32 +274,32 @@
OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(wrkMast.getSourceLocNo());
- flowLog.setSpare1(containerCode);
- flowLog.setOpType(6L);
- flowLog.setOrderNo(locDto.getOrderNo());
- flowLog.setThreeCode(locDto.getCsocode());
- flowLog.setMatnr(locDto.getMatnr());
- flowLog.setMaktx(locDto.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
- flowLog.setQtyChanged(locDto.getAnfme());
-
- flowLog.setLocPrevious(locDetl.getAnfme());
- flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
- flowLog.setLocChanged(locDto.getAnfme());
- flowLog.setUserId(userId);
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(wrkMast.getSourceLocNo());
+// flowLog.setSpare1(containerCode);
+// flowLog.setOpType(6L);
+// flowLog.setOrderNo(locDto.getOrderNo());
+// flowLog.setThreeCode(locDto.getCsocode());
+// flowLog.setMatnr(locDto.getMatnr());
+// flowLog.setMaktx(locDto.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + locDto.getAnfme());
+// flowLog.setQtyChanged(locDto.getAnfme());
+//
+// flowLog.setLocPrevious(locDetl.getAnfme());
+// flowLog.setLocCurrent(locDetl.getAnfme() - locDto.getAnfme());
+// flowLog.setLocChanged(locDto.getAnfme());
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}else {
List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
orderDtoList.forEach(orderDto -> {
@@ -415,7 +415,7 @@
int containerType = getContainerTypeByloc(taskDto.getLocNo());
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType);
+ AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType,null);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
taskDto.getLocDtos().forEach(locDto -> {
//鏄庣粏妗ｆ墍闇�鍙傛暟
@@ -458,9 +458,21 @@
Date now = new Date();
//鐢熸垚绉诲簱宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo));
+ AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo),targetLocMast.getPltType());
//鐢熸垚宸ヤ綔鍏氭槑缁�
- createWrkDetlReWrite(sourceLocDetl.getMatnr(),wrkMast.getWrkNo(),null,sourceLocDetl.getBatch(),sourceLocDetl.getAnfme(),sourceLocDetl.getZpallet(),now,userId,sourceLocDetl.getThreeCode(),sourceLocDetl.getDeadTime(),sourceLocDetl.getProcessSts());
+ createWrkDetlReWrite(
+ sourceLocDetl.getMatnr(),
+ wrkMast.getWrkNo(),
+ null,
+ sourceLocDetl.getBatch(),
+ sourceLocDetl.getAnfme(),
+ sourceLocDetl.getZpallet(),
+ now,
+ userId,
+ sourceLocDetl.getThreeCode(),
+ sourceLocDetl.getDeadTime(),
+ sourceLocDetl.getProcessSts()
+ );
//淇敼鐩爣搴撲綅鐘舵��
updateAgvLocMast(targetLocMast,"S");
//淇敼鍘熷簱浣嶇姸鎬�
@@ -577,39 +589,39 @@
String locNo = agvLocMast.getLocNo();
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType);
+ AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType,agvLocMast.getPltType());
//鐢熸垚宸ヤ綔妗ｆ槑缁�
long flowId = snowflakeIdWorker.nextId();
agvWaitPakinList.forEach(wp -> {
createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
- OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(containerCode);
- flowLog.setOpType(3L);
- flowLog.setOrderNo(wp.getOrderNo());
- flowLog.setThreeCode(wp.getThreeCode());
- flowLog.setMatnr(wp.getMatnr());
- flowLog.setMaktx(wp.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
- flowLog.setQtyPrevious(orderDetl.getQty()-wp.getAnfme());
- flowLog.setQtyCurrent(orderDetl.getQty());
- flowLog.setQtyChanged(wp.getAnfme());
-
- flowLog.setLocPrevious(0.0D);
- flowLog.setLocCurrent(wp.getAnfme());
- flowLog.setLocChanged(wp.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(now);
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+ OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(),wp.getBatch(), wp.getThreeCode());
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(containerCode);
+// flowLog.setOpType(3L);
+// flowLog.setOrderNo(wp.getOrderNo());
+// flowLog.setThreeCode(wp.getThreeCode());
+// flowLog.setMatnr(wp.getMatnr());
+// flowLog.setMaktx(wp.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+// flowLog.setQtyPrevious(orderDetl.getQty()-wp.getAnfme());
+// flowLog.setQtyCurrent(orderDetl.getQty());
+// flowLog.setQtyChanged(wp.getAnfme());
+//
+// flowLog.setLocPrevious(0.0D);
+// flowLog.setLocCurrent(wp.getAnfme());
+// flowLog.setLocChanged(wp.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(now);
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
});
//淇敼鍏ュ簱閫氱煡妗ｇ姸鎬�
agvWaitPakinService.updateIoStatus(containerCode,"Y");
@@ -623,7 +635,7 @@
}
agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
// 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
- createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
+ createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType,agvLocMast.getPltType());
//鏇存柊婧愮珯鐐圭姸鎬�
updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
}
@@ -632,6 +644,7 @@
updateAgvLocMast(agvLocMast,"S");
return agvLocMast.getLocNo();
}
+
/*
绌烘澘鍑哄簱
*/
@@ -661,7 +674,7 @@
throw new CoolException("鏆傛棤褰撳墠鍑哄簱绔欑偣绫诲瀷鐨勭┖璐ф灦锛�");
}
//鐢熸垚宸ヤ綔妗�
- createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType);
+ createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType,agvLocMast.getPltType());
//淇敼婧愬簱浣嶇姸鎬�
updateAgvLocMast(agvLocMast,"R");
@@ -928,33 +941,33 @@
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("璁㈠崟鍥炴粴澶辫触");
}
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(wrkMast.getBarcode());
- flowLog.setOpType(3L);
- flowLog.setOrderNo(agvWaitPakin.getOrderNo());
- flowLog.setThreeCode(agvWaitPakin.getThreeCode());
- flowLog.setMatnr(agvWaitPakin.getMatnr());
- flowLog.setMaktx(agvWaitPakin.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
- flowLog.setQtyChanged(-agvWaitPakin.getAnfme());
-
- flowLog.setLocPrevious(0.0);
- flowLog.setLocCurrent(0.0);
- flowLog.setLocChanged(-agvWaitPakin.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(new Date());
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(wrkMast.getBarcode());
+// flowLog.setOpType(3L);
+// flowLog.setOrderNo(agvWaitPakin.getOrderNo());
+// flowLog.setThreeCode(agvWaitPakin.getThreeCode());
+// flowLog.setMatnr(agvWaitPakin.getMatnr());
+// flowLog.setMaktx(agvWaitPakin.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty()-agvWaitPakin.getAnfme());
+// flowLog.setQtyChanged(-agvWaitPakin.getAnfme());
+//
+// flowLog.setLocPrevious(0.0);
+// flowLog.setLocCurrent(0.0);
+// flowLog.setLocChanged(-agvWaitPakin.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(new Date());
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
// 鍒犻櫎缁勬墭妗�
if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSuppCode()).eq("matnr",agvWaitPakin.getMatnr()).eq("three_code",agvWaitPakin.getThreeCode()))) {
throw new CoolException("鍏ュ簱閫氱煡妗ｅ彇娑堝け璐�");
@@ -986,33 +999,33 @@
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
}
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(wrkMast.getBarcode());
- flowLog.setOpType(8L);
- flowLog.setOrderNo(agvLocDetl.getOrderNo());
- flowLog.setThreeCode(agvLocDetl.getThreeCode());
- flowLog.setMatnr(agvLocDetl.getMatnr());
- flowLog.setMaktx(agvLocDetl.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
- flowLog.setQtyChanged(-agvLocDetl.getAnfme());
-
- flowLog.setLocPrevious(0.0);
- flowLog.setLocCurrent(agvLocDetl.getAnfme());
- flowLog.setLocChanged(agvLocDetl.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(new Date());
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(wrkMast.getBarcode());
+// flowLog.setOpType(8L);
+// flowLog.setOrderNo(agvLocDetl.getOrderNo());
+// flowLog.setThreeCode(agvLocDetl.getThreeCode());
+// flowLog.setMatnr(agvLocDetl.getMatnr());
+// flowLog.setMaktx(agvLocDetl.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme());
+// flowLog.setQtyChanged(-agvLocDetl.getAnfme());
+//
+// flowLog.setLocPrevious(0.0);
+// flowLog.setLocCurrent(agvLocDetl.getAnfme());
+// flowLog.setLocChanged(agvLocDetl.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(new Date());
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
} else {
@@ -1052,33 +1065,33 @@
if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
}
- FlowLog flowLog = new FlowLog();
- flowLog.setFid(String.valueOf(flowId));
- flowLog.setSpare2(wrkMast.getWrkNo().toString());
- flowLog.setLocNo(locNo);
- flowLog.setSpare1(wrkMast.getBarcode());
- flowLog.setOpType(9L);
- flowLog.setOrderNo(agvLocDetl.getOrderNo());
- flowLog.setThreeCode(agvLocDetl.getThreeCode());
- flowLog.setMatnr(agvLocDetl.getMatnr());
- flowLog.setMaktx(agvLocDetl.getMaktx());
- flowLog.setOrderPrevious(orderDetl.getAnfme());
- flowLog.setOrderCurrent(orderDetl.getAnfme());
- flowLog.setOrderChanged(0.0);
-
- flowLog.setQtyPrevious(orderDetl.getQty());
- flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
- flowLog.setQtyChanged(- agvLocDetl.getAnfme());
-
- flowLog.setLocPrevious(0.0);
- flowLog.setLocCurrent(agvLocDetl.getAnfme());
- flowLog.setLocChanged(agvLocDetl.getAnfme());
-
- flowLog.setUserId(userId);
- flowLog.setAppeTime(new Date());
- if (!flowLogService.insert(flowLog)) {
- throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
- }
+// FlowLog flowLog = new FlowLog();
+// flowLog.setFid(String.valueOf(flowId));
+// flowLog.setSpare2(wrkMast.getWrkNo().toString());
+// flowLog.setLocNo(locNo);
+// flowLog.setSpare1(wrkMast.getBarcode());
+// flowLog.setOpType(9L);
+// flowLog.setOrderNo(agvLocDetl.getOrderNo());
+// flowLog.setThreeCode(agvLocDetl.getThreeCode());
+// flowLog.setMatnr(agvLocDetl.getMatnr());
+// flowLog.setMaktx(agvLocDetl.getMaktx());
+// flowLog.setOrderPrevious(orderDetl.getAnfme());
+// flowLog.setOrderCurrent(orderDetl.getAnfme());
+// flowLog.setOrderChanged(0.0);
+//
+// flowLog.setQtyPrevious(orderDetl.getQty());
+// flowLog.setQtyCurrent(orderDetl.getQty() - agvLocDetl.getAnfme());
+// flowLog.setQtyChanged(- agvLocDetl.getAnfme());
+//
+// flowLog.setLocPrevious(0.0);
+// flowLog.setLocCurrent(agvLocDetl.getAnfme());
+// flowLog.setLocChanged(agvLocDetl.getAnfme());
+//
+// flowLog.setUserId(userId);
+// flowLog.setAppeTime(new Date());
+// if (!flowLogService.insert(flowLog)) {
+// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
+// }
}
//鍑哄簱鍙栨秷
} else {
@@ -1244,6 +1257,7 @@
wrkDetl.setAppeTime(now);
wrkDetl.setModiUser(userId);
wrkDetl.setModiTime(now);
+
wrkDetl.setThreeCode(csocode);
wrkDetl.setDeadTime(isoseq);
if (!agvWrkDetlService.insert(wrkDetl)) {
@@ -1283,7 +1297,7 @@
/*
鐢熸垚宸ヤ綔妗�
*/
- private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType){
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType,Integer pltType){
AgvWrkMast wrkMast = new AgvWrkMast();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
@@ -1305,8 +1319,8 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
+ wrkMast.setPltType(pltType);
wrkMast.setLogErrMemo("createWaitPainWrkMastStart");
-
if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -1419,4 +1433,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1