From 83b8b7cecfe8266a44bfce696d857b3be7149e3f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 31 十二月 2024 10:52:28 +0800
Subject: [PATCH] 优化MES调拨信息上报及库位查询逻辑
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 18 ++++++++++--------
src/main/resources/mapper/ViewWorkInMapper.xml | 6 ++++++
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 1 +
src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java | 2 +-
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 1146b3d..b0e5b47 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -51,6 +51,7 @@
@ExcelIgnore
private String crn_end_time;
+
@ColumnWidth(15)
@ExcelProperty(value = "閿�鍞崟鍙�")
private String three_code;
diff --git a/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java b/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
index 24a35ab..3d0874d 100644
--- a/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
@@ -18,7 +18,7 @@
@Data
public static class RecordCustomFieldBaseCO{
- private List<CustomField> customFields;
+ private CustomField customFields;
@Data
public static class CustomField{
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 cbebd54..6470c8f 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -430,7 +430,7 @@
//璐ф灦绫诲瀷
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);
@@ -820,11 +820,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灞炴��
@@ -839,11 +839,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);
@@ -857,12 +858,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");
}
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index cc06a0e..848ea9d 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -8,6 +8,9 @@
<if test="loc_no!=null and loc_no!='' ">
and loc_no like '%' + #{loc_no} + '%'
</if>
+ <if test="supp_code!=null and supp_code!='' ">
+ and supp_code like '%' + #{supp_code} + '%'
+ </if>
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
</if>
@@ -48,6 +51,9 @@
<if test="loc_no!=null and loc_no!='' ">
and loc_no like '%' + #{loc_no} + '%'
</if>
+ <if test="supp_code!=null and supp_code!='' ">
+ and supp_code like '%' + #{supp_code} + '%'
+ </if>
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
</if>
--
Gitblit v1.9.1