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/framework/config/KaptchaTextCreator.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
index e003ce9..3177948 100644
--- a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
+++ b/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
@@ -5,7 +5,7 @@
/**
* 楠岃瘉鐮佹枃鏈敓鎴愬櫒
- *
+ *
* @author ruoyi
*/
public class KaptchaTextCreator extends DefaultTextCreator
@@ -20,7 +20,7 @@
int x = random.nextInt(10);
int y = random.nextInt(10);
StringBuilder suChinese = new StringBuilder();
- int randomoperands = (int) Math.round(Math.random() * 2);
+ int randomoperands = random.nextInt(3);
if (randomoperands == 0)
{
result = x * y;
@@ -30,7 +30,7 @@
}
else if (randomoperands == 1)
{
- if (!(x == 0) && y % x == 0)
+ if ((x != 0) && y % x == 0)
{
result = y / x;
suChinese.append(CNUMBERS[y]);
@@ -61,13 +61,6 @@
suChinese.append("-");
suChinese.append(CNUMBERS[x]);
}
- }
- else
- {
- result = x + y;
- suChinese.append(CNUMBERS[x]);
- suChinese.append("+");
- suChinese.append(CNUMBERS[y]);
}
suChinese.append("=?@" + result);
return suChinese.toString();
--
Gitblit v1.9.3