Commit Graph

3457 Commits

Author SHA1 Message Date
zhangzq
bbccff7c91 opt:优化日志配置 2025-04-11 21:35:45 +08:00
zhangzq
636e347177 fix:日志配置,回传MES改成同步 2025-04-11 14:38:23 +08:00
DESKTOP-5DIJMF9\admin
e588a32472 opt:有任务禁止绑定子卷、绑定气胀轴,下料到内保间判断必须有气胀轴、必须有计划 2025-04-11 12:13:06 +08:00
b10c478baf rev:出库确认、回传增加管控出库相关逻辑 2025-04-11 09:18:42 +08:00
28afaef7ea add:1.库存管控2.管控查询3.相关逻辑处理 2025-04-11 09:10:38 +08:00
zhangzq
1a5d0110d1 add:rgv任务 2025-04-10 19:54:09 +08:00
bbabedb55b Merge remote-tracking branch 'origin/master_1' into master_1 2025-04-10 19:49:48 +08:00
zhangzq
99ed91b01c Merge remote-tracking branch 'origin/master_merge' into master_merge 2025-04-10 19:44:59 +08:00
DESKTOP-5DIJMF9\admin
fb32cfcff1 opt:维护木箱类型和干燥剂数量 2025-04-10 18:38:56 +08:00
DESKTOP-5DIJMF9\admin
74a04a45bc opt:新增木箱类型和干燥剂数量维护 2025-04-10 18:32:51 +08:00
zhangzq
a969d2f707 add:待检区点位大屏 2025-04-10 15:30:18 +08:00
DESKTOP-5DIJMF9\admin
e479b0d1c2 OPT:优化 2025-04-10 15:29:10 +08:00
DESKTOP-5DIJMF9\admin
fcd1e5a035 opt:加急送轴功能开发 2025-04-10 14:29:40 +08:00
DESKTOP-5DIJMF9\admin
bdbe383851 opt:优化前端客户要求幅宽小数位 2025-04-10 12:56:55 +08:00
zhangzq
1cecbe8496 add:待检区子卷更新维护时间; 2025-04-10 12:37:02 +08:00
zhangzq
88864b3492 opt:验箱流程移至入库阶段;add:待检区子卷更新维护时间;add:入库申请增加托盘任务校验及托盘库存校验 2025-04-09 18:41:42 +08:00
DESKTOP-5DIJMF9\admin
bf3279faf7 opt:优化母卷送回支持B1 2025-04-09 16:21:06 +08:00
5023da7361 Merge remote-tracking branch 'origin/master_merge' into master_merge 2025-04-09 13:48:53 +08:00
9da4f5a2a1 fix: 呼叫套轴分切计划判空、关联查询过滤空值 2025-04-09 13:47:37 +08:00
DESKTOP-5DIJMF9\admin
661a8627ae opt:优化任务提示 2025-04-09 12:24:47 +08:00
DESKTOP-5DIJMF9\admin
a3fb60cb19 opt:优化打印 2025-04-08 14:56:24 +08:00
DESKTOP-5DIJMF9\admin
8c68d87d74 opt:优化 2025-04-08 13:29:01 +08:00
DESKTOP-5DIJMF9\admin
1989875570 opt:优化备货区管芯接口 2025-04-08 11:14:42 +08:00
DESKTOP-5DIJMF9\admin
fd1d854866 opt:优化打印功能,添加打印日志 2025-04-08 09:54:16 +08:00
zhangzq
bb5513aa8e fix:二期出库rgv任务改成集中下发 2025-04-05 17:30:17 +08:00
e7edd573b4 Merge remote-tracking branch 'origin/master_1' into master_1 2025-04-05 14:07:56 +08:00
2ef860727f rev: 反馈重量校验为空才可更新
fix: 批量更新改为for更新
2025-04-04 19:58:42 +08:00
DESKTOP-5DIJMF9\admin
fd578a1b94 opt:优化任务更新 2025-04-03 16:06:34 +08:00
DESKTOP-5DIJMF9\admin
8e226357d1 opt:优化任务更新 2025-04-03 16:06:12 +08:00
DESKTOP-5DIJMF9\admin
697cabfae7 opt:优化代码 2025-04-03 15:54:24 +08:00
zhangzq
caf6dc4666 Merge remote-tracking branch 'origin/one_rebuild_dev' into master_1 2025-04-03 13:05:33 +08:00
zhangzq
8d567ad924 Merge branch 'one_rebuild_dev' into master_1 2025-04-03 13:04:29 +08:00
zhangzq
b5ebb2dc3a fix:装箱入库与入库完成并发控制 2025-04-03 12:20:46 +08:00
1617119bfe fix: 反馈重量校验为空才可更新 2025-04-03 10:03:20 +08:00
c3245cb69c rev: 去除任务数量校验 2025-04-03 09:47:06 +08:00
zhangzq
a19ae900e1 add:一楼管制增加包装关系校验 2025-04-03 09:42:26 +08:00
311f6fc461 opt: 添加反馈子卷重量日志 2025-04-02 20:49:03 +08:00
DESKTOP-5DIJMF9\admin
20ec3800db opt:添加日志 2025-04-02 17:02:01 +08:00
a1a4ad1bae opt: 下卷排序与延时 2025-04-01 22:29:11 +08:00
DESKTOP-5DIJMF9\admin
18fd707820 opt:优化代码 2025-04-01 22:06:23 +08:00
zhangzq
3fe7c822b4 Merge remote-tracking branch 'origin/master_1' into one_rebuild_dev
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
2025-04-01 14:14:41 +08:00
DESKTOP-5DIJMF9\admin
1fe6dc7104 opt:二期调度优化 2025-04-01 12:22:16 +08:00
zhangzq
a86874f82e Merge remote-tracking branch 'origin/master_1' into master_1 2025-04-01 10:51:50 +08:00
zhangzq
dd764c4d77 fix:待检区增加货位校验 2025-04-01 10:46:19 +08:00
706384b824 fix: 呼叫套轴计数 2025-03-31 18:41:31 +08:00
370716346a fix: 管芯库启用 2025-03-30 19:19:00 +08:00
zhangzq
628d15c0c6 add:生产入库增加直接入库功能 2025-03-30 16:12:33 +08:00
4d94c58a6b fix: 调试中出现的问题3 2025-03-30 15:26:17 +08:00
zhangzq
403496e916 fix:空木箱出库增加校验 2025-03-29 15:28:15 +08:00
867e99bd23 fix: 调试中出现的问题2 2025-03-29 14:37:02 +08:00