From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位,审核

---
 src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index fcd7a17..3994833 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -45,6 +45,7 @@
      * 鍔充繚鍗曞彿
      */
     @ApiModelProperty("鍔充繚鍗曞彿")
+    @Excel(name = "鍔充繚鍗曞彿")
     private String orderNo;
 
     /**
@@ -105,15 +106,6 @@
     private Long num;
 
     /**
-     * 棰嗙敤鏃ユ湡
-     */
-    @ApiModelProperty("棰嗙敤鏃ユ湡")
-    @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date adoptedDate;
-
-    /**
      * 杩涘巶鏃ユ湡
      */
     @ApiModelProperty("杩涘巶鏃ユ湡")
@@ -132,6 +124,15 @@
     private Date issueDate;
 
     /**
+     * 棰嗙敤鏃ユ湡
+     */
+    @ApiModelProperty("棰嗙敤鏃ユ湡")
+    @Excel(name = "棰嗙敤鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date adoptedDate;
+
+    /**
      * 绛惧悕
      */
     @Excel(name = "绛惧悕")

--
Gitblit v1.9.3