b69d8253dbf8b29bca1ac5f6cf1f305e5e188f0a..34285b5911b582c00f9f5c9cd3bb78b96126b5b3
2 天以前 1
lsh#
34285b 对比 | 目录
2 天以前 1
lsh#
29e065 对比 | 目录
4个文件已修改
57 ■■■■ 已修改文件
rsf-open-api/src/main/resources/application-dev.yml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/application-dev.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-open-api/src/main/resources/application-dev.yml
@@ -18,6 +18,7 @@
#    password: 1234
#    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    password: xltys1995
#    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://192.168.4.199:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    password: root
    type: com.alibaba.druid.pool.DruidDataSource
@@ -66,7 +67,7 @@
  #WCS链接
  wcs:
    #链接
    host: http://192.168.4.198
    host: http://127.0.0.1
    #端口
    port: 9090
  #WCS链接
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java
@@ -54,7 +54,7 @@
     * @description 自动下发波次任务
     * @time 2025/6/23 13:52
     */
    @Scheduled(cron = "0/15 * * * * ?")
    @Scheduled(cron = "0/5 * * * * ?")
//    @Transactional(rollbackFor = Exception.class)
    public void autoGenerateTask() {
        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.WAVE_AUTO_EXCE_TASK));
rsf-server/src/main/resources/application-dev.yml
@@ -16,6 +16,7 @@
    username: root
#    url: jdbc:mysql://10.10.10.200:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    password: xltys1995
#    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    url: jdbc:mysql://192.168.4.199:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    password: root
    type: com.alibaba.druid.pool.DruidDataSource
rsf-server/src/main/resources/mapper/manager/WarehouseStockMapper.xml
@@ -1,31 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vincent.rsf.server.manager.mapper.WarehouseStockMapper">
    <select id="pageByStock" resultType="com.vincent.rsf.server.manager.entity.ViewStockManage">
        SELECT id,
               loc_id,
               loc_code,
               warehouse,
               type,
               order_item_id,
               wk_type,
               matnr_id,
               maktx,
               matnr_code,
               splr_id,
               unit,
               SUM(anfme)    anfme,
               SUM(qty)      qty,
               SUM(work_qty) work_qty,
               batch,
               spec,
               model,
               fields_index,
               update_by,
               create_by,
               update_time,
               create_time
        FROM view_stock_manage
            ${ew.customSqlSegment}
    </select>
       <select id="pageByStock" resultType="com.vincent.rsf.server.manager.entity.ViewStockManage">
              SELECT
                     matnr_id,
                     MAX(id) as id,
                     MAX(loc_code) as loc_code,
                     MAX(warehouse) as warehouse,
                     MAX(type) as type,
                     MAX(maktx) as maktx,
                     MAX(matnr_code) as matnr_code,
                     MAX(unit) as unit,
                     MAX(spec) as spec,
                     MAX(model) as model,
                     MAX(batch) as batch,
                     MAX(fields_index) as fields_index,
                     MAX(update_by) as update_by,
                     MAX(create_by) as create_by,
                     MAX(update_time) as update_time,
                     MAX(create_time) as create_time,
                     SUM(anfme) as anfme,
                     SUM(qty) as qty,
                     SUM(work_qty) as work_qty
              FROM view_stock_manage
                          ${ew.customSqlSegment}
       </select>
</mapper>