Commit Graph

2369 Commits

Author SHA1 Message Date
3faf1b65c1 add:增加装箱区库存页面 2024-07-02 16:30:19 +08:00
6a2a26e3c4 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-07-02 15:48:09 +08:00
03a94a7179 fix: 呼叫气胀轴查询acs,气胀轴库没货则生成任务 2024-07-02 15:37:10 +08:00
2de875acd0 rev:增加捆扎相关校验 2024-07-02 14:03:20 +08:00
c8c1335329 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-07-02 14:02:32 +08:00
90572dc622 rev:增加捆扎相关校验 2024-07-02 14:02:15 +08:00
f10d468c21 opt:优化子卷按子卷规格排序 2024-07-02 14:00:34 +08:00
2f6cbfd9c1 rev: 立库堆垛机相关任务下发时 给托盘号 2024-07-02 13:29:00 +08:00
5826a97da2 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-07-02 13:12:51 +08:00
1a72a6cb78 opt:优化一楼装箱区任务类相关校验 2024-07-02 13:12:34 +08:00
a84a6544f9 fix: 手持菜单区分与清除暂存修改 2024-07-02 09:27:01 +08:00
1cf2e6305d fix: 删除子卷包装关系,异常包裹 2024-07-01 22:00:58 +08:00
5871c91af5 fix: 套轴过滤一期分切计划 2024-07-01 17:34:31 +08:00
8ef3d51a8b feat: 分切拼接、区域注释 2024-07-01 16:42:18 +08:00
a546856fda fix: 气胀轴代数校验位置改为分切计划表2 2024-07-01 14:04:17 +08:00
b00a5a23ef fix: 气胀轴代数校验位置改为分切计划表 2024-07-01 14:04:15 +08:00
ea5bfbf40e rev:捆扎相关修改 2024-07-01 13:53:48 +08:00
9ecc870369 opt:优化子卷装箱校验逻辑 2024-06-30 18:10:59 +08:00
17032c858a opt: 备货区与气胀轴库优化-前端 2024-06-30 14:24:14 +08:00
eb95498a07 opt: 备货区与气胀轴库优化 2024-06-30 14:22:54 +08:00
170f925202 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-30 09:49:43 +08:00
274fd9f624 feat: 套轴异常处理情况v1 2024-06-30 09:49:31 +08:00
zhouz
79d0e10a43 fix:WQL文件修改 2024-06-29 21:52:46 +08:00
zhouz
236ef6bedb Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-29 19:09:52 +08:00
zhouz
3ca403632d fix:WQL合并 2024-06-29 19:09:29 +08:00
964ce2a306 fix: 备货纸管扣除 2024-06-29 18:12:21 +08:00
3886dce826 fix: 纸管信息 2024-06-29 17:34:46 +08:00
0fd7a3cf64 add:增加二次分配请求频繁处理 2024-06-29 16:45:31 +08:00
c79bd1a186 add:增加二次分配请求频繁处理 2024-06-29 15:49:55 +08:00
d851b6c6ba fix: 备货区任务修改 2024-06-29 14:10:32 +08:00
1a86159e34 add:增加自动执行等待的桁架任务 2024-06-29 09:21:25 +08:00
830a523d56 rev:木箱类型 2024-06-28 16:31:32 +08:00
956e6c99df add:木箱类型 2024-06-28 15:13:10 +08:00
66212b6ed4 fix: 手持下拉框 2024-06-28 14:59:21 +08:00
e17eed36ca fix: 手持点位下拉框过滤 2024-06-28 14:49:30 +08:00
a7bd40dcbd fix: 备货区反馈acs纸管信息改为string 2024-06-28 14:44:17 +08:00
b9cf783ccd fix: 97信号校验 2024-06-28 13:58:52 +08:00
142fc1dfea rev: 二期出库报错修改 2024-06-28 10:31:23 +08:00
c053f7a2dd fix:二期出库完成报错bug修复 2024-06-28 10:13:23 +08:00
217e8d86d2 Merge remote-tracking branch 'origin/b_lms' into master_merge
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
2024-06-28 09:19:18 +08:00
b0d72c6db7 fix: 1、分切下料缓存
2、内包间新增97信号直接套轴完成
     3、手持分切暂存送料到内包间
     4、手持清理分切暂存数据
2024-06-28 09:06:08 +08:00
2874439aa1 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-28 01:30:16 +08:00
a9ef3d8f69 fix:增加二次分配任务重复校验 2024-06-28 01:30:03 +08:00
zhouz
2a370376be Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-06-27 17:00:21 +08:00
zhouz
430f4c795a fix:WQL更新 2024-06-27 16:58:02 +08:00
e88415bada Merge remote-tracking branch 'origin/b_lms' into master_merge 2024-06-27 16:00:57 +08:00
zhouz
cd7c68d61d fix:代码合并 2024-06-27 15:56:08 +08:00
zhouz
cab08052ec 代码合并 2024-06-27 15:23:15 +08:00
1cbbe0a9fd Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-06-27 15:20:06 +08:00
c9c93cd2cc fix: api错误 2024-06-27 15:19:36 +08:00