已修改6个文件
43 ■■■■■ 文件已修改
src/main/resources/application-sdks.yml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/approve/ApproveProcessMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/sales/ShippingInfoMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/stock/StockInventoryMapper.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-sdks.yml
@@ -7,7 +7,7 @@
  # 版权年份
  copyrightYear: 2025
  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
  profile: /javaWork/product-inventory-management/file
  profile: /data/javaWork/product-inventory-management/file
  # 获取ip地址开关
  addressEnabled: false
@@ -76,7 +76,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://36.213.180.217:11101/product-inventory-management-sdks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://172.17.0.1:11101/product-inventory-management-sdks?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: xd@123456..
      # 从库数据源
@@ -255,11 +255,11 @@
# 文件上传配置
file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads   # 临时目录 后期删除
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads # 正式目录 后期删除
  path: /javaWork/product-inventory-management/file/path/uploads # 上传目录
  temp-dir: /data/javaWork/product-inventory-management/file/temp/uploads   # 临时目录 后期删除
  upload-dir: /data/javaWork/product-inventory-management/file/prod/uploads # 正式目录 后期删除
  path: /data/javaWork/product-inventory-management/file/path/uploads # 上传目录
  urlPrefix: /prod-api/common # 链接前缀
  domain: http://36.137.101.88:9520 # 域名前缀
  domain: http://36.213.90.123:9520 # 域名前缀
  expired: 120 # 过期时间(单位:分钟)
  useLimit: 10 # 使用次数
  compress: true # 是否压缩
src/main/resources/application.yml
@@ -18,14 +18,14 @@
        api-key: sk-bd235cc13cd74e2388aa8984c84f691f
        model-name: "qwen-max"
      embedding-model:
        api-key: sk-9748859926b94096b920baaa12c343f5
        api-key: sk-bd235cc13cd74e2388aa8984c84f691f
        model-name: "text-embedding-v3"
      chat-model:
        api-key: sk-9748859926b94096b920baaa12c343f5
        api-key: sk-bd235cc13cd74e2388aa8984c84f691f
        model-name: "qwen-max"
  open-ai:
    chat-model:
      api-key: sk-9748859926b94096b920baaa12c343f5
      api-key: sk-bd235cc13cd74e2388aa8984c84f691f
      base-url: "https://dashscope.aliyuncs.com/compatible-mode/v1"
      model-name: "deepseek-v3"
      log-requests: true
src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -41,7 +41,7 @@
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
        order by approve_time desc
        order by approve_time desc,approve_id desc
    </select>
</mapper>
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,16 +16,15 @@
        qu.deal_result,
        qu.deal_name,
        qu.deal_time,
        qu.product_model_id,
        COALESCE(pm.model, pm_legacy.model, qu.model) AS model,
        CASE
        WHEN qu.model = pm.id THEN pm.model
        ELSE qu.model
        END AS model,
        CASE
        WHEN qu.model = pm.id THEN true
        WHEN pm_legacy.id IS NOT NULL THEN true
        ELSE false
        END AS method
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.id
        LEFT JOIN product_model pm ON qu.product_model_id = pm.id
        LEFT JOIN product_model pm_legacy ON qu.product_model_id IS NULL AND pm_legacy.id = CAST(qu.model AS UNSIGNED) AND qu.model REGEXP '^[0-9]+$'
        where
        1=1
        <if test="qualityUnqualified.inspectType != null ">
@@ -78,16 +77,15 @@
            qu.deal_result,
            qu.deal_name,
            qu.deal_time,
            qu.product_model_id,
            COALESCE(pm.model, pm_legacy.model, qu.model) AS model,
            CASE
                WHEN qu.model = pm.id THEN pm.model
                ELSE qu.model
                END AS model,
            CASE
                WHEN qu.model = pm.id THEN true
                WHEN pm_legacy.id IS NOT NULL THEN true
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
                 LEFT JOIN product_model pm_legacy ON qu.product_model_id IS NULL AND pm_legacy.id = CAST(qu.model AS UNSIGNED) AND qu.model REGEXP '^[0-9]+$'
        where
            1=1
        and qu.id = #{id}
src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -48,7 +48,7 @@
        <if test="req.expressNumber != null and req.expressNumber != ''">
            AND s.express_number LIKE CONCAT('%',#{req.expressNumber},'%')
        </if>
        order by create_time DESC
        order by s.shipping_no DESC
    </select>
    <select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">
        SELECT
src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -609,6 +609,7 @@
                 left join product p on pm.product_id = p.id
        where si.product_model_id = #{productModelId}
        and si.qualitity > IFNULL(sd.qualitity, 0)
        order by si.batch_no desc
    </select>
    <select id="getBatchNoQty" resultType="com.ruoyi.stock.dto.StockInventoryDto">