2cd81312baf87a8dee4dec72161cfc1a9481f6cb..790b9ed55a07c4930c608dd9137ca8313db84870
9 天以前 gongchunyi
chore: 前端ip修改
790b9e 对比 | 目录
2026-08-12 gongchunyi
fix: 空指针
7ee584 对比 | 目录
2026-08-13 zss
生产计划页面排序
dab516 对比 | 目录
2026-08-13 zss
出入库排序
40b15b 对比 | 目录
已修改5个文件
10 ■■■■ 文件已修改
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-hjgc.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductionPlanMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/stock/StockInRecordMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/stock/StockOutRecordMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -133,7 +133,7 @@
        List<Long> instanceIds = records.stream()
                .map(ApprovalInstanceVo::getId)
                .filter(id -> id != null)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());
src/main/resources/application-hjgc.yml
@@ -260,7 +260,7 @@
  upload-dir: /data/javaWork/product-inventory-management/file/prod/uploads # 正式目录
  path: /data/javaWork/product-inventory-management/file # 上传目录
  urlPrefix: /prod-api/common # 链接前缀
  domain: http://36.213.180.217:9013 # 域名前缀
  domain: http://36.213.90.123:9013 # 域名前缀
  expired: 120 # 过期时间(单位:分钟)
  useLimit: 10 # 使用次数
  compress: true # 是否压缩
src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -58,7 +58,7 @@
                </if>
            </if>
        </where>
        ORDER BY COALESCE(pp.id) DESC
        ORDER BY COALESCE(pp.mps_no) DESC
    </select>
    <select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -132,7 +132,7 @@
                and p.id in (select id from product_tree)
            </if>
        </where>
        order by sir.id desc
        order by sir.inbound_batches desc
    </select>
    <select id="listStockInRecordExportData" resultType="com.ruoyi.stock.execl.StockInRecordExportData">
        SELECT
src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -62,7 +62,7 @@
                and p.id in (select id from product_tree)
            </if>
        </where>
        order by sor.id desc
        order by sor.outbound_batches desc
    </select>
    <select id="listStockOutRecordExportData" resultType="com.ruoyi.stock.execl.StockOutRecordExportData">
        SELECT