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/resources/application-hckxTest.yml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/application-hckxTest.yml b/src/main/resources/application-hckxTest.yml
index ff81a96..3d0faca 100644
--- a/src/main/resources/application-hckxTest.yml
+++ b/src/main/resources/application-hckxTest.yml
@@ -62,7 +62,7 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
-        url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hckxtest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://114.132.189.42:9099/product-inventory-management-hckx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: xd@123456..
       # 浠庡簱鏁版嵁婧�
@@ -134,10 +134,10 @@
   # redis 閰嶇疆
   redis:
     # 鍦板潃
-#    host: 127.0.0.1
-    host: 172.17.0.1
+    host: 127.0.0.1
+#    host: 114.132.189.42
     # 绔彛锛岄粯璁や负6379
-    port: 6380
+    port: 6379
     # 鏁版嵁搴撶储寮�
     database: 12
     # 瀵嗙爜
@@ -215,5 +215,5 @@
   allowOverwrite: false
 
 file:
-  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
-  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
+  temp-dir: D:\\javaWork\\product-inventory-management\\file\\temp\\uploads
+  upload-dir: D:\\javaWork\\product-inventory-management\\file\\prod\\uploads
\ No newline at end of file

--
Gitblit v1.9.3