From 514f372270b181f82e4deff98f8d0f38ace63183 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/vo/MesProPalletRespVO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/vo/MesProPalletRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/vo/MesProPalletRespVO.java
index 0747066..24a35d9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/vo/MesProPalletRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/pallet/vo/MesProPalletRespVO.java
@@ -14,6 +14,8 @@
@Schema(description = "绠＄悊鍚庡彴 - MES 鎵樼洏鐮� Response VO")
@Data
public class MesProPalletRespVO {
+ @ExcelProperty("鍏ュ簱鏃堕棿")
+ private LocalDateTime inboundTime;
@Schema(description = "缂栧彿", example = "1024")
@ExcelIgnore
@@ -23,6 +25,19 @@
@ExcelProperty("鎵樼洏鐮�")
@ColumnWidth(30)
private String code;
+ /** 鍐呴儴鍑哄叆搴撲笟鍔＄爜锛屼繚鎸佺ǔ瀹氾紝涓嶉殢姝ｅ紡鐮佽ˉ褰曟垨缁戝畾鍙樺寲銆� */
+ @ExcelProperty("涓氬姟鐮�")
+ private String businessCode;
+
+ @Schema(description = "涓存椂鎵樼洏鐮侊紙棰勭敓鎴愪簩缁寸爜闃舵浣跨敤锛涚粦瀹氭壒娆″悗涓虹┖鎴栦繚鐣欙級", example = "PL-00000001")
+ @ExcelIgnore
+ private String tempCode;
+ @ExcelIgnore
+ private Long itemId;
+ @ExcelProperty("鍝佺缂栫爜")
+ private String itemCode;
+ @ExcelProperty("鍝佺鍚嶇О")
+ private String itemName;
@Schema(description = "鐢熶骇鎵规缂栧彿", example = "1024")
@ExcelIgnore
@@ -37,14 +52,18 @@
@ExcelProperty("鎵樼洏搴忓彿")
private Integer palletNo;
- @Schema(description = "鍙琚嬫暟锛堣/鎵樼洏锛�", example = "25")
- @ExcelProperty("鍙琚嬫暟")
+ @Schema(description = "鏍囩О姣忔墭琚嬫暟")
+ @ExcelProperty("鏍囩О姣忔墭琚嬫暟")
private Integer capacity;
@Schema(description = "宸茬粦瀹氳鐮佹暟閲�", example = "10")
@ExcelProperty("宸茶琚嬫暟")
private Integer bagCount;
+ @Schema(description = "鏄惁鑷姩鐢熸垚", example = "false")
+ @ExcelIgnore
+ private Boolean autoGenerated;
+
@Schema(description = "鐘舵�侊紙瀛楀吀 mes_pro_pallet_status锛�", example = "10")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat(DictTypeConstants.MES_PRO_PALLET_STATUS)
--
Gitblit v1.9.3