Sign in

wms / wms4_shanghaianbofu · Files

Logo

GitLab

  • Back to group
  • Project
  • Activity
  • Files
  • Commits
  • Network
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Labels
  • Wiki
  • wms4_shanghaianbofu
  • huaheng-wms-core
  • src
  • main
  • resources
  • application.yml
  • Squashed commit of the following: ...
    4b9aa325
    commit 02b6bc27
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 24 17:09:44 2023 +0800
    
        增加库存详情
    
    commit edb4846f
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 24 14:47:02 2023 +0800
    
        1. 生成任务,库存容器锁定
    
    commit 81cf11ad
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 24 11:49:13 2023 +0800
    
        :filter-option="filterOption" 问题修复
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 2d81e3e6
    Merge: f3ee69d8 a5557436
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 24 11:41:49 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit f3ee69d8
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 24 11:41:42 2023 +0800
    
        出库单页面告警错误修正
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit a5557436
    Merge: 81ffd72c c251597f
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 24 11:22:21 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
    
    commit 81ffd72c
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 24 11:22:16 2023 +0800
    
        修改任务界面, 更新库位时,需要先判断状态
    
    commit c251597f
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 24 10:47:43 2023 +0800
    
        VUE出库任务页告警修复
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 3301e251
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 24 10:21:40 2023 +0800
    
        VUE生产配置启动告警修正
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 1d62baab
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 23 16:07:56 2023 +0800
    
        测试git合并
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 6e5db5c6
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 23 14:21:37 2023 +0800
    
        授权激活页面提示修改
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 6567790a
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 23 11:59:55 2023 +0800
    
        授权激活页面提示修改
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 724d3457
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 23 11:22:53 2023 +0800
    
        日志打印优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit e0dad689
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 22 14:12:10 2023 +0800
    
        分布式环境激活码问题解决
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 92552f1b
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 22 13:50:05 2023 +0800
    
        分布式环境激活码问题解决
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 1e6b8a96
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 21 17:36:28 2023 +0800
    
        系统认证相关代码提交(3)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 3df13574
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 21 17:33:30 2023 +0800
    
        系统认证相关代码提交(3)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit c22e97fc
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 21 11:02:08 2023 +0800
    
        系统认证相关代码提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit a7dbf215
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 20 18:29:18 2023 +0800
    
        系统认证相关代码提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit f6f3c5c4
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 17 17:35:41 2023 +0800
    
        去掉完成按钮,后续完成任务 走接口
    
    commit 2b384db9
    Merge: b3f219c6 3ded812e
    Author: yiwenpeng <ywp303@163.com>
    Date:   Fri Mar 17 11:45:13 2023 +0800
    
        Merge remote-tracking branch 'origin/develop' into develop
    
    commit b3f219c6
    Author: yiwenpeng <ywp303@163.com>
    Date:   Fri Mar 17 11:45:01 2023 +0800
    
        策略列表
    
    commit 3ded812e
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 17 11:26:06 2023 +0800
    
        定时删除日志表sqlServer支持
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit d993415c
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 17 11:08:51 2023 +0800
    
        sqlServer 支持
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 90aa8b88
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 16 16:57:17 2023 +0800
    
        根据时间字段删除指定表记录(2)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit d5815001
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 16 15:57:06 2023 +0800
    
        定时任务页展示优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 718fbfc9
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 16 15:48:23 2023 +0800
    
        根据创建时间删除指定表记录(2)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 019cd3d6
    Merge: f2dcfd12 a6a8fa0d
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 16 15:32:57 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit f2dcfd12
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 16 15:32:50 2023 +0800
    
        根据创建时间定时删除指定表记录信息初版提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit a6a8fa0d
    Author: yiwenpeng <ywp303@163.com>
    Date:   Thu Mar 16 14:20:25 2023 +0800
    
        导入导出权限控制
    
    commit bcc5f2ca
    Author: yiwenpeng <ywp303@163.com>
    Date:   Thu Mar 16 14:18:56 2023 +0800
    
        导入导出权限控制
    
    commit f3c3d3dd
    Author: xcq <1306458088@qq.com>
    Date:   Wed Mar 15 17:38:19 2023 +0800
    
        优化组盘
    
    commit d25e5be4
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 15 16:40:56 2023 +0800
    
        统一aspect工具类路径到 org.jeecg.utils.aspect
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 30b8a5b9
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 15 16:27:47 2023 +0800
    
        prod配置文件优化,接口日志输出格式优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit c2bb8b1c
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 15 15:51:28 2023 +0800
    
        驱动配置优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit c3e1d2ba
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 15 14:28:38 2023 +0800
    
        定时任务并发串行设定提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 4be4b653
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 15 14:13:37 2023 +0800
    
        定时任务配置提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 8159793c
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 15 09:54:19 2023 +0800
    
        项目打包启动 log-record-starter 异常处理
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 1dcf5559
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 14 18:40:15 2023 +0800
    
        用户管理页所属仓库展示优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 4f534e03
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 14 14:50:47 2023 +0800
    
        多仓支持提交(7)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 4103de85
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 14 10:22:17 2023 +0800
    
        多仓支持提交(6)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit f93dd6a2
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 14 09:43:01 2023 +0800
    
        多仓支持提交(5)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 16b37ba6
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 19:50:48 2023 +0800
    
        多仓支持提交(4)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit acd4ca86
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 17:27:46 2023 +0800
    
        多仓支持提交(3)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 7a154812
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 16:16:17 2023 +0800
    
        多仓支持提交(2)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit e4ec0bad
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 14:38:53 2023 +0800
    
        出入库单据缺失权限添加
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 5fc7fb15
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 14:19:40 2023 +0800
    
        页面操作栏
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit c848c326
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 13:58:11 2023 +0800
    
        用户新增部门BUG修复
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit db9a9783
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 13 10:15:44 2023 +0800
    
        多仓支持提交(1)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 5b0ec621
    Author: zf <27208084@qq.com>
    Date:   Mon Mar 13 09:51:08 2023 +0800
    
        增加站台任务电视看板接口
    
    commit b98016d8
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 10 19:54:07 2023 +0800
    
        vue.config.js 构建错误修正
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 76a3d33a
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 10 19:30:20 2023 +0800
    
        出库查看增加托盘选取
    
    commit 92d1e35a
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 10 18:47:16 2023 +0800
    
        增加托盘选取功能
    
    commit 99078118
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 10 14:19:11 2023 +0800
    
        登录首页 默认选择第一个仓库
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 4b0390b8
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 10 10:05:53 2023 +0800
    
        WebSocket connection 问题修复
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 7f479fd0
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 10 09:47:40 2023 +0800
    
        WebSocket connection 问题修复
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 70224772
    Merge: 130a50f9 ee15c3da
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 10 09:36:38 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit 130a50f9
    Author: TanYibin <5491541@qq.com>
    Date:   Fri Mar 10 09:35:21 2023 +0800
    
        WebSocket connection 问题修正
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit ee15c3da
    Author: youjie <272855983@qq.com>
    Date:   Thu Mar 9 16:16:45 2023 +0800
    
        增加库存详情界面
    
    commit ebcdee7f
    Merge: b7ce8b8d b71ec742
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 9 14:28:01 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit b7ce8b8d
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 9 14:27:54 2023 +0800
    
        忽略文件添加
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit b71ec742
    Author: youjie <272855983@qq.com>
    Date:   Thu Mar 9 11:43:10 2023 +0800
    
        增加取消任务接口
    
    commit 04b1bd23
    Merge: 2caf3d24 9f5484fa
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 9 11:09:31 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit 2caf3d24
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 9 11:09:23 2023 +0800
    
        操作记录页面优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 9f5484fa
    Author: youjie <272855983@qq.com>
    Date:   Thu Mar 9 10:57:33 2023 +0800
    
        下发任务合并并发处理
    
    commit 57cbd3c3
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 9 10:49:06 2023 +0800
    
        操作记录页面优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 2f616f9e
    Author: youjie <272855983@qq.com>
    Date:   Thu Mar 9 08:24:10 2023 +0800
    
        完善WMS4 出入库流程
    
    commit 96ed17a2
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 8 17:00:34 2023 +0800
    
        sql日志输出优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit eb1036ba
    Merge: bf161c19 7e94323d
    Author: youjie <272855983@qq.com>
    Date:   Wed Mar 8 15:00:42 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
    
    commit bf161c19
    Author: youjie <272855983@qq.com>
    Date:   Wed Mar 8 15:00:34 2023 +0800
    
        修复补充入库问题
    
    commit 7e94323d
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 8 14:46:34 2023 +0800
    
        出库任务操作记录提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 5b941846
    Author: youjie <272855983@qq.com>
    Date:   Wed Mar 8 11:43:38 2023 +0800
    
        增加多仓判断
    
    commit b002b133
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 8 11:40:09 2023 +0800
    
        VUE ID类型转换修正,操作日志页面字段显示顺序调整
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 6bac255c
    Merge: 3fe568e7 9d74cfc8
    Author: youjie <272855983@qq.com>
    Date:   Wed Mar 8 09:02:53 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
    
    commit 3fe568e7
    Author: youjie <272855983@qq.com>
    Date:   Wed Mar 8 09:02:46 2023 +0800
    
        修复库位监控的问题
    
    commit 9d74cfc8
    Merge: 67d9b2ab 80eba915
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 8 08:46:59 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit 67d9b2ab
    Author: TanYibin <5491541@qq.com>
    Date:   Wed Mar 8 08:46:53 2023 +0800
    
        VUE入库单页面主键ID类型转换使用.toString()修复,空出,重入,取货错任务操作记录添加
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 80eba915
    Author: youjie <272855983@qq.com>
    Date:   Wed Mar 8 08:40:29 2023 +0800
    
        修复apilog界面
    
    commit 1beb11fa
    Merge: 0f834ba2 cc94ac80
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 17:57:27 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
    
        # Conflicts:
        #	ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
    
    commit 0f834ba2
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 17:52:54 2023 +0800
    
        修复多仓问题
    
    commit cc94ac80
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 7 16:10:51 2023 +0800
    
        接口日志显示优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 3e06a537
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 7 15:06:27 2023 +0800
    
        调整swagger默认参数配置
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 16b64262
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 13:40:32 2023 +0800
    
        用户和仓库关系
    
    commit 51b04cd8
    Merge: e80da0af 672d3575
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 11:48:56 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
    
        # Conflicts:
        #	huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
    
    commit e80da0af
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 11:47:31 2023 +0800
    
        完善用户仓库选择
    
    commit 672d3575
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 7 11:33:28 2023 +0800
    
        修改业务逻辑异常抛出统一使用JeecgBootException
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 3becde4d
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 7 11:19:17 2023 +0800
    
        接口日志页面显示优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit c4bb74af
    Merge: 777cb329 5518a99a
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 09:59:26 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
    
        # Conflicts:
        #	huaheng-wms-core/src/main/resources/application-dev.yml
    
    commit 777cb329
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 09:55:29 2023 +0800
    
        add
    
    commit ece6f81a
    Author: youjie <272855983@qq.com>
    Date:   Tue Mar 7 09:50:35 2023 +0800
    
        增加用户和仓库的关系
    
    commit 5518a99a
    Author: TanYibin <5491541@qq.com>
    Date:   Tue Mar 7 09:41:09 2023 +0800
    
        登录时效修改为12小时
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 35a79d4a
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 6 17:16:35 2023 +0800
    
        入库追踪提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 728e7ff0
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 6 14:05:16 2023 +0800
    
        文件上传下载初版提交(2)
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 05af9845
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 6 13:44:23 2023 +0800
    
        文件上传下载初版提交
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 28c1afd5
    Author: TanYibin <5491541@qq.com>
    Date:   Mon Mar 6 09:42:09 2023 +0800
    
        工具类路径优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit bbc5b200
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 3 16:10:05 2023 +0800
    
        add
    
    commit 304219d3
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 3 15:59:03 2023 +0800
    
        修复双伸位相关的一些问题
    
    commit 36261640
    Author: youjie <272855983@qq.com>
    Date:   Fri Mar 3 09:18:04 2023 +0800
    
        修复生成双伸位的问题
    
    commit cb604d90
    Merge: 3b9791ef f70eec0e
    Author: xumiao <1365304440@qq.com>
    Date:   Thu Mar 2 20:16:22 2023 +0800
    
        Merge remote-tracking branch 'origin/develop' into develop
    
    commit 3b9791ef
    Author: xumiao <1365304440@qq.com>
    Date:   Thu Mar 2 20:16:10 2023 +0800
    
        入库单添加查看回传报错按钮、点击通知跳转入库单或出库单
    
    commit f70eec0e
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 2 18:13:58 2023 +0800
    
        容器添加页面报错BUG解决
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit fae333dd
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 2 13:51:54 2023 +0800
    
        库位类型选择框样式优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit db0a3534
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 2 13:19:56 2023 +0800
    
        出入库操作记录优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    commit 202c573e
    Merge: b9fdb93e c6b80328
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 2 12:12:12 2023 +0800
    
        Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop
    
    commit b9fdb93e
    Author: TanYibin <5491541@qq.com>
    Date:   Thu Mar 2 12:12:05 2023 +0800
    
        入库单操作记录优化
    
        Signed-off-by: TanYibin <5491541@qq.com>
    
    # Conflicts:
    #	ant-design-vue-jeecg/src/api/api.js
    #	ant-design-vue-jeecg/src/views/system/config/LocationList.vue
    #	ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
    #	ant-design-vue-jeecg/src/views/system/config/modules/LocationTypeForm.vue
    #	ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
    #	ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
    #	ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
    #	ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/service/impl/MobileService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryDetailService.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
    #	huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
    #	huaheng-wms-core/src/main/resources/application-test.yml
    肖超群 authored
    2023-03-27 15:58:44 +0800  
    Browse Code »
application.yml 120 Bytes
Edit Raw Blame History
1 2 3 4 5 6 7 8 9
spring:
  application:
    name: huaheng-wms-core
  profiles:
    active: test

huaheng:
  system:
    id: HUAHENG-WMS4