From 3e144b2eb8fc9447d2d092edb71db533d12abc52 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 24 九月 2026 19:06:39 +0800
Subject: [PATCH] feat(生产核算): 新增大类「中提琴」并打通工资/核算折算
---
src/main/java/com/ruoyi/production/bean/vo/ProductionCostingRawVo.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionCostingRawVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionCostingRawVo.java
index 5071e7c..310688a 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionCostingRawVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionCostingRawVo.java
@@ -22,7 +22,12 @@
private String processName;
private Integer deptType;
private Long productModelId;
- /** 浜у搧澶х被锛坧roduct.product_name锛夛紝涔愬櫒鍒ゆ柇渚濇嵁 */
+ /**
+ * 鎶ュ伐浜у搧澶х被锛坧roduction_product_main.major_category锛夛細灏忔彁鐞�/涓彁鐞�/澶ф彁鐞�/璐濇柉銆�
+ * 杩欐槸涔愬櫒褰掔被鐨勫垽鏂緷鎹紱鏈綊绫荤殑鎶ュ伐涓� null锛岀敱璋冪敤鏂规寜鈥滈潪涔愬櫒浜у搧鈥濆鐞嗐��
+ */
+ private String majorCategory;
+ /** 浜у搧鍚嶇О锛坧roduct.product_name锛夛紝浠呬綔灞曠ず锛屼笉鍙備笌褰掔被鍒ゆ柇 */
private String productName;
/** 鍨嬪彿/瑙勬牸锛坧roduct_model.model锛� */
private String modelName;
--
Gitblit v1.9.3