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/entity/param/MesOrderReportParam.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
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 93e6524..3d0874d 100644
--- a/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
@@ -4,6 +4,9 @@
import java.util.List;
+/**
+ * MES璋冩嫧鍙傛暟
+ */
@Data
public class MesOrderReportParam {
//缂栫爜
@@ -11,14 +14,34 @@
//澶囨敞
private String remark;
private List<TransferOrderItem> transferOrderItems;
+ private RecordCustomFieldBaseCO recordCustomFieldBaseCO;
+
+ @Data
+ public static class RecordCustomFieldBaseCO{
+ private CustomField customFields;
+
+ @Data
+ public static class CustomField{
+ private String fieldCode;
+ private String fieldValue;
+
+ public CustomField(String fieldCode, String fieldValue) {
+ this.fieldCode = fieldCode;
+ this.fieldValue = fieldValue;
+ }
+ }
+ }
@Data
public static class TransferOrderItem{
- private List<InventoryDetail> inventoryDetails;
+
//琛屽娉� 鍗曟嵁鍙�
private String remark;
//鎺ユ敹浠撲綅
private String targetLocationCode;
+
+ private List<InventoryDetail> inventoryDetails;
+
@Data
public static class InventoryDetail{
@@ -32,6 +55,8 @@
private Integer qcStatus;
//浠撳偍鐘舵��
private Integer storageStatus;
+ //鐗堟湰鍙凤紝榛樿涓簄ull
+ private String version;
@Data
public static class Amount{
@@ -41,13 +66,24 @@
private String unitCode;
//鍗曚綅鍚嶇О 浜岄�変竴
private String unitName;
+
+ public Amount(Double amount, String unitName, String unitCode) {
+ this.amount = amount;
+ this.unitCode = unitCode;
+ this.unitName = unitName;
+ }
}
@Data
public static class BizKey{
//鎵规
private String batchNo;
+
+ public BizKey(String batchNo) {
+ this.batchNo = batchNo;
+ }
}
}
+
}
}
--
Gitblit v1.9.1