From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息

---
 src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index e0180e1..61c5d19 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
@@ -28,7 +28,7 @@
     private Long id;
 
     @Schema(description = "浜у搧瑙勬牸id")
-    private Integer productModelId;
+    private Long productModelId;
 
     @Schema(description = "鏁伴噺")
     private BigDecimal quantity;
@@ -56,4 +56,30 @@
     @Schema(description = "閮ㄩ棬ID")
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
+
+    @Schema(description = "宸ュ簭鍚嶇О")
+    private String operationName;
+
+    @Schema(description = "宸ュ簭id")
+    private Long technologyOperationId;
+
+    @Schema(description = "闇�姹傛暟閲�")
+    private BigDecimal demandedQuantity;
+
+    @Schema(description = "琛ユ枡鎬婚噺")
+    private BigDecimal  feedingQty;
+
+    @Schema(description = "閫�鏂欐暟閲�")
+    private BigDecimal  returnQty;
+
+    @Schema(description = "瀹為檯鏁伴噺")
+    private BigDecimal  actualQty;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    @TableField("is_returned")
+    private Boolean returned;
+
+    @Schema(description = "鏄惁bom棰嗘枡")
+    @TableField("is_bom")
+    private Boolean bom;
 }

--
Gitblit v1.9.3