zhangzq
|
db61709c4f
|
opt:druid版本
|
2025-06-30 12:01:26 +08:00 |
|
zhangzq
|
d4a77d71f6
|
fix:修改配置文件jdbc驱动
|
2025-06-30 10:44:05 +08:00 |
|
zhangzq
|
668c9e1200
|
fix:修改dev配置文件数据库驱动
|
2025-06-25 17:44:57 +08:00 |
|
zhangzq
|
51f816de93
|
opt:删除主从配置：WO,WQLCore,WQLObject,DataBaceConfig,ResultBean数据源及数据分装
|
2025-06-23 10:03:49 +08:00 |
|
zhangzq
|
ad7bfbfc7f
|
init:一期二期代码合并
|
2025-05-22 14:13:19 +08:00 |
|
zhangzq
|
2dfe5f22de
|
Merge remote-tracking branch 'origin/master_merge' into master_1_opt
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/config/TlogIdGenerator.java
# lms/nladmin-system/src/main/java/org/nl/modules/common/utils/FileUtil.java
# lms/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/CellTypeEnum.java
# lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
# lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
# lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSaveIvtExcel.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
# lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
# lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
# lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
# lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
# lms/nladmin-system/src/main/resources/config/application-dev.yml
# lms/nladmin-system/src/main/resources/config/application-prod.yml
# lms/nladmin-ui/src/views/login.vue
# lms/nladmin-ui/src/views/system/user/index.vue
# lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
# lms/nladmin-ui/src/views/wms/sch/task/index.vue
|
2025-05-22 13:44:35 +08:00 |
|
zhangzq
|
1b6871cb59
|
fix:修复虚拟货位生成只到100的问题
|
2025-05-14 16:11:49 +08:00 |
|
zhangzq
|
4d88480851
|
add:子卷步骤导出
|
2025-05-13 15:20:54 +08:00 |
|
zhangzq
|
8a1609ae08
|
add:dto
|
2025-05-10 14:38:50 +08:00 |
|
|
|
3d30c0cd4b
|
add:新增空轴退回事务注解
|
2025-05-08 15:45:55 +08:00 |
|
zhangzq
|
2b0cd990bb
|
opt:优化导出功能
|
2025-04-30 15:40:15 +08:00 |
|
zhangzq
|
98f26916cc
|
add:子卷解绑定增加任务校验，已经装箱入库的不允许解绑
|
2025-04-29 14:56:28 +08:00 |
|
zhangzq
|
44d55dae35
|
opt:druid监控
|
2025-04-25 17:12:45 +08:00 |
|
zhangzq
|
d2a8682f4a
|
add:一楼看板增加数据；fix:出库任务完成报错；opt:任务查询不到优化
|
2025-04-25 13:59:33 +08:00 |
|
zhangzq
|
e6a7b320b3
|
opt:优化日志
|
2025-04-20 10:13:44 +08:00 |
|
zhangzq
|
eabc74c171
|
add:增加分切看板接口；增加日志条件；增加子卷称重记录
|
2025-04-19 16:42:01 +08:00 |
|
zhangzq
|
bbccff7c91
|
opt:优化日志配置
|
2025-04-11 21:35:45 +08:00 |
|
zhangzq
|
636e347177
|
fix:日志配置，回传MES改成同步
|
2025-04-11 14:38:23 +08:00 |
|
zhangzq
|
1a5d0110d1
|
add:rgv任务
|
2025-04-10 19:54:09 +08:00 |
|
zhangzq
|
628d15c0c6
|
add:生产入库增加直接入库功能
|
2025-03-30 16:12:33 +08:00 |
|
zhangzq
|
a8239e083b
|
opt:空木箱入库增加托盘校验
|
2025-03-20 18:48:05 +08:00 |
|
zhangzq
|
e83dfde69e
|
opt:优化二期堆垛机完成并发任务优化
opt:优化木箱信息获取
|
2025-03-19 22:53:13 +08:00 |
|
zhangzq
|
365b4a26bb
|
fix:木箱出库时存在移库任务将出库锁释放
|
2025-03-13 10:47:31 +08:00 |
|
zhangzq
|
52e9cadce9
|
fix:木箱出库时存在移库任务将出库锁释放
|
2025-03-11 19:46:48 +08:00 |
|
zhangzq
|
57afe00a14
|
add:增加打包间子卷信息展示
|
2025-03-11 11:45:15 +08:00 |
|
zhangzq
|
34918c8721
|
add:增加打包间子卷信息展示
|
2025-03-08 14:21:08 +08:00 |
|
zhangzq
|
50956cb3ed
|
add:增加打包间子卷信息展示
|
2025-03-08 14:20:51 +08:00 |
|
zhangzq
|
a718840677
|
add:增加打包间子卷信息展示
|
2025-03-08 14:20:39 +08:00 |
|
zhangzq
|
d880051422
|
add:增加打包间子卷信息展示
|
2025-03-08 13:50:32 +08:00 |
|
|
|
a7d2c0288f
|
rev: 二期内包间改造
|
2025-02-24 17:11:22 +08:00 |
|
zhangzq
|
cbb6b46228
|
opt：测试环境配置
|
2025-02-22 09:25:27 +08:00 |
|
zhangzq
|
b7484ccdf0
|
opt:一期扩容代码改成http调用
|
2025-02-14 15:17:11 +08:00 |
|
zhangzq
|
23e8b1d1a5
|
opt:优化获取code代码
|
2025-02-14 14:24:05 +08:00 |
|
zhangzq
|
3712c21169
|
opt:任务查询优化
|
2025-02-14 09:51:16 +08:00 |
|
zhangzq
|
28874259d9
|
opt:回传倒出优化
|
2025-02-13 14:00:26 +08:00 |
|
zhangzq
|
1b7eab6a5e
|
opt:增加主从同步功能1
|
2025-02-12 09:16:36 +08:00 |
|
zhangzq
|
856a48ac22
|
opt:增加主从同步功能
|
2025-02-10 15:55:28 +08:00 |
|
|
|
4f85f5bb00
|
fix：备货区管芯信息绑定异常
fix: 任务未完成导致，管芯上报扣除失败
feat: 虚拟分切计划送轴业务
|
2025-01-12 17:59:02 +08:00 |
|
zhangzq
|
5de252e2e7
|
rev:修复日志打印报错
|
2024-12-27 13:59:59 +08:00 |
|
zhangzq
|
c61134f6fb
|
rev:日志打印，add:空木箱入库mes回传
|
2024-12-26 22:12:47 +08:00 |
|
zhouz
|
b1b0b23171
|
fix:clock is moving backwards优化
|
2024-08-30 16:44:56 +08:00 |
|
zhouz
|
6ccd09a395
|
fix:新增打印黑名单，以及定时器日志打印
|
2024-07-30 14:58:23 +08:00 |
|
zhouz
|
024d00bd37
|
fix:AOP添加接口日志
|
2024-07-30 13:55:55 +08:00 |
|
|
|
9977b2cee6
|
fix: 手持暂存查询新增禁用提示、内包间气胀轴回暂存库校验终点
|
2024-07-22 09:56:00 +08:00 |
|
|
|
476a761699
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-08 09:30:51 +08:00 |
|
|
|
37471bec9a
|
feat: 优化、新增B1车间分切
|
2024-07-08 09:30:13 +08:00 |
|
ludj
|
59dace36a0
|
rev：去除jetcache框架(存在bug)
|
2024-07-07 13:29:13 +08:00 |
|
|
|
1cf2e6305d
|
fix: 删除子卷包装关系，异常包裹
|
2024-07-01 22:00:58 +08:00 |
|
zhouz
|
c40db4deb1
|
fix:内包间代码优化
|
2024-06-14 09:07:00 +08:00 |
|
zhouz
|
ad2879667b
|
fix:反馈ACS管芯库存
|
2024-06-12 11:24:57 +08:00 |
|
