From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/common/constant/UserConstants.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 737c9d5..f2b5ab5 100644
--- a/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -12,11 +12,6 @@
*/
public static final String SYS_USER = "SYS_USER";
- /**
- * ss鏍囪鐨勬潈闄愬瓧绗�
- */
- public static final String SS_PERMISSION = "SS_PERMISSION";
-
/** 姝ｅ父鐘舵�� */
public static final String NORMAL = "0";
@@ -25,6 +20,9 @@
/** 鐢ㄦ埛灏佺鐘舵�� */
public static final String USER_DISABLE = "1";
+
+ /** 瑙掕壊姝ｅ父鐘舵�� */
+ public static final String ROLE_NORMAL = "0";
/** 瑙掕壊灏佺鐘舵�� */
public static final String ROLE_DISABLE = "1";
@@ -65,9 +63,9 @@
/** InnerLink缁勪欢鏍囪瘑 */
public final static String INNER_LINK = "InnerLink";
- /** 鏍￠獙杩斿洖缁撴灉鐮� */
- public final static String UNIQUE = "0";
- public final static String NOT_UNIQUE = "1";
+ /** 鏍￠獙鏄惁鍞竴鐨勮繑鍥炴爣璇� */
+ public final static boolean UNIQUE = true;
+ public final static boolean NOT_UNIQUE = false;
/**
* 鐢ㄦ埛鍚嶉暱搴﹂檺鍒�
--
Gitblit v1.9.3