From e90dba0edc93be26e1509cfb2ec1d0681eb86e48 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 27 八月 2025 08:37:04 +0800
Subject: [PATCH] 合并出库添加日志
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 162 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 119 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index e26edd6..114c56d 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
+import com.zy.asrs.constant.AsrsConstants;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.MesBuyPakinReportParam;
import com.zy.asrs.entity.param.MesOrderReportParam;
@@ -15,6 +16,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.service.AgvCommonService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +45,9 @@
//绉诲簱绫诲瀷鏁扮粍
private static final List<Integer> MOVE_TYPE_List = new ArrayList<Integer>() {{
add(11);
- add(101);
add(12);
add(53);
+ add(101);
add(103);
add(108);
add(111);
@@ -115,6 +117,9 @@
@Autowired
private ReportDataService reportDataService;
+ @Autowired
+ private AgvCommonService agvCommonService;
+
@Transactional
public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -135,6 +140,26 @@
}
+ Integer pltType = agvWrkMast.getPltType();
+ if (Cools.isEmpty(pltType)) {
+ AgvLocMast agvLocMast;
+ if (!Cools.isEmpty(agvWrkMast.getLocNo())) {
+ agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
+ if (agvLocMast != null) {
+ pltType = agvLocMast.getPltType();
+ }
+ }
+ if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
+ agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
+ if (agvLocMast != null) {
+ pltType = agvLocMast.getPltType();
+ }
+ }
+ if (pltType != null) {
+ agvWrkMast.setPltType(pltType);
+ }
+ //log.info("宸ヤ綔鍙�--{},浠撳簱缂栫爜锛歿}", agvWrkMast.getWrkNo(), agvWrkMast.getPltType());
+ }
agvWrkMast.setModiTime(new Date());
//淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
agvWrkMast.setWrkSts(207L);
@@ -151,7 +176,7 @@
switch (agvWrkMast.getIoType()) {
case 1:
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
//鏇存柊鐩爣搴撲綅鏄庣粏
log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(), wrkNo);
@@ -163,15 +188,28 @@
break;
case 10:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
+ AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+ if (byDevNo != null) {
+ if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
+
+ } else {
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+ }
+ }
+ //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
break;
case 11:
case 12:
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ AgvLocDetl agvLocDetl1 = agvLocDetlService.selectByLocNo(agvWrkMast.getSourceLocNo());
+ if (agvLocDetl1 == null) {
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ } else {
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ }
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(),null);
//淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null, "");
break;
case 53:
//淇敼宸ヤ綔鍏氭槑缁�
@@ -216,7 +254,14 @@
});
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+ byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+ if (byDevNo != null) {
+ if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
+
+ } else {
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+ }
+ }
break;
case 57:
// 鏇存柊搴撳瓨鏄庣粏
@@ -233,20 +278,27 @@
}
});
// 鏇存柊绔欑偣 + 搴撲綅鐘舵�� 婧愬簱浣嶆槸绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+ byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());
+ if (byDevNo != null) {
+ if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {
+
+ } else {
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+ }
+ }
+ agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());
break;
case 58:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
+ //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
break;
case 108:
case 114:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
- //鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
- //淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+// //鏇存柊搴撳瓨鏄庣粏
+// agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+// //淇敼婧愬簱浣嶇姸鎬佷负O
+// agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
break;
case 109:
// 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
@@ -262,7 +314,7 @@
// 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
} else {
//淇敼婧愬簱浣嶇姸鎬佷负O
- agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
+ //agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
}
break;
case 111:
@@ -315,7 +367,7 @@
case 121:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
//鏇存柊搴撳瓨鏄庣粏
- agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
+ agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo(),agvWrkMast.getAppeUser());
//淇敼婧愬簱浣嶇姸鎬佷负O
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
break;
@@ -336,13 +388,7 @@
// }
// agvWrkMastService.updateById(agvWrkMast);
// }
- Integer pltType = agvWrkMast.getPltType();
- if (Cools.isEmpty(pltType) && !Cools.isEmpty(agvWrkMast.getLocNo())) {
- AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
- if (agvLocMast != null) {
- pltType = agvLocMast.getPltType();
- }
- }
+
if (!isJSON(orderNo)) {
//妫�鏌ヨ鍗曟槸鍚﹀凡瀹屾垚
orderService.checkComplete(orderNo, pltType);
@@ -407,16 +453,43 @@
wrkMast.setIoTime(now);
//浼樺厛绾�
wrkMast.setIoPri(300.0);
+
//婧愮珯鐐�
wrkMast.setSourceLocNo(agvWrkMast.getLocNo());
+
//鐩爣绔欑偣
- wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ if (agvWrkMast.getLocNo().startsWith("QO") && agvWrkMast.getLocNo().endsWith("F4") && Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)) == 30) {
+ if (!agvWrkMast.getSourceLocNo().endsWith("02F1")) {
+ AgvLocMast locByFloor = null;
+ try {
+ locByFloor = agvCommonService.getLocByLocRule(3, 1, AsrsConstants.ERCHANG, true);
+ } catch (Exception e) {
+
+ }
+ if (locByFloor != null && locByFloor.getLocNo().endsWith("02F1")) {
+ AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
+ agvLocMast.setLocSts("O");
+ agvLocMast.setModiTime(now);
+ agvLocMast.setBarcode("");
+ agvLocMastService.updateById(agvLocMast);
+ wrkMast.setLocNo(locByFloor.getLocNo());
+ } else {
+ wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ }
+ } else {
+ wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ }
+ } else {
+ wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+ }
+ //wrkMast.setLocNo(agvWrkMast.getSourceLocNo());
+
//璐ф灦缂栫爜
wrkMast.setBarcode(agvWrkMast.getBarcode());
//璐ф灦绫诲瀷
wrkMast.setWhsType(Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)));
- wrkMast.setAppeUser(9527L);
+ wrkMast.setAppeUser(agvWrkMast.getAppeUser());
wrkMast.setAppeTime(now);
wrkMast.setModiUser(9527L);
wrkMast.setModiTime(now);
@@ -425,7 +498,7 @@
if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getSourceLocNo());
+ AgvLocMast agvLocMast = agvLocMastService.selectById(wrkMast.getLocNo());
agvLocMast.setLocSts("S");
agvLocMast.setModiTime(now);
agvLocMastService.updateById(agvLocMast);
@@ -559,7 +632,7 @@
return SUCCESS;
} catch (Exception e) {
//TODO
- log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
+ //log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y,{}", e.getMessage());
}
return FAIL;
}
@@ -716,23 +789,24 @@
List<AgvWrkDetl> data = new ArrayList<>();
//鍖哄垎涓嶅悓浠诲姟绫诲瀷鐨勪笂鎶ユ柟寮�
for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
- if (agvWrkDetl.getMatnr().startsWith("10") || agvWrkDetl.getMatnr().startsWith("20") || agvWrkDetl.getMatnr().startsWith("30")) {
+ if (agvWrkDetl.getMatnr().compareTo("39") <= 0) {
data.add(agvWrkDetl);
}
}
- if (!Cools.isEmpty(data)) {
+ if (!data.isEmpty()) {
if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
reportMesPakinOrder(agvWrkMast, data);
}
- if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
- reportMesPakoutOrder(agvWrkMast, data);
- }
- if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
- generateMesParam(agvWrkMast, data);
- }
+// if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
+// reportMesPakoutOrder(agvWrkMast, data);
+// }
+// if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
+// generateMesParam(agvWrkMast, data);
+// }
}
}
+
private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
@@ -758,7 +832,7 @@
iteam.setLineNo(orderDetl.getItemNum());
iteam.setSupplierCode(order.getSalesman());
iteam.setUnit(agvWrkDetl.getUnit());
-
+ iteam.setRemark(agvWrkDetl.getThreeCode());
iteams.add(iteam);
mesBuyPakinReportParam.setCode(orderNo);
@@ -805,11 +879,11 @@
MesOrderReportParam param = new MesOrderReportParam();
List<MesOrderReportParam.TransferOrderItem> transferOrderItems = new ArrayList<>();
- List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
- List<MesOrderReportParam.RecordCustomFieldBaseCO.CustomField> customFields = new ArrayList<>();
+
+ //MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customFields = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField();
MesOrderReportParam.RecordCustomFieldBaseCO recordCustomFieldBaseCO = new MesOrderReportParam.RecordCustomFieldBaseCO();
- recordCustomFieldBaseCO.setCustomFields(customFields);
+ //recordCustomFieldBaseCO.setCustomFields(customFields);
param.setRecordCustomFieldBaseCO(recordCustomFieldBaseCO);
//娣诲姞transferOrderItem灞炴��
@@ -824,11 +898,12 @@
transferOrderItem.setTargetLocationCode(getTargetLocationByFloor(floor));
}
transferOrderItems.add(transferOrderItem);
- transferOrderItem.setInventoryDetails(inventoryDetails);
+
param.setTransferOrderItems(transferOrderItems);
for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+ List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
MesOrderReportParam.TransferOrderItem.InventoryDetail inventoryDetail = new MesOrderReportParam.TransferOrderItem.InventoryDetail();
//娣诲姞amount灞炴��
MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null);
@@ -842,12 +917,13 @@
inventoryDetail.setQcStatus(1);
inventoryDetail.setStorageStatus(1);
inventoryDetails.add(inventoryDetail);
+ transferOrderItem.setInventoryDetails(inventoryDetails);
//娣诲姞閿�鍞鍗曞彿
MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c", agvWrkDetl.getThreeCode().trim());
- customFields.add(customField);
+ //customFields.add(customField);
+ recordCustomFieldBaseCO.setCustomFields(customField);
+ doHttpRequest(param, getMesTokenInfo(), "涓婃姤mes璋冩嫧淇℃伅", url, orderReportPath, null, "127.0.0.1");
}
-
- doHttpRequest(param, getMesTokenInfo(), "涓婃姤mes璋冩嫧淇℃伅", url, orderReportPath, null, "127.0.0.1");
}
--
Gitblit v1.9.1