|
|
6cc8921e1b
|
opt:优化满轴位满或空载具位空的行架任务
|
2024-07-05 16:42:37 +08:00 |
|
zhouz
|
5ac116d1f0
|
fix:查询木箱信息优化
|
2024-07-04 18:07:09 +08:00 |
|
zhouz
|
89fe7c4488
|
fix:退货口入库优化
|
2024-07-04 15:31:01 +08:00 |
|
zhouz
|
4ab8648dd2
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-03 23:02:45 +08:00 |
|
zhouz
|
b6548b25aa
|
fix:分切计划上线临时修改方案
|
2024-07-03 23:02:24 +08:00 |
|
|
|
c77a5f03e5
|
fix:增加任务校验
|
2024-07-03 17:32:25 +08:00 |
|
|
|
24678f2a47
|
合并
|
2024-07-03 16:46:44 +08:00 |
|
|
|
eaadc6b971
|
Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge
|
2024-07-03 16:45:36 +08:00 |
|
|
|
1f9ea990ec
|
rev：sap推送改切计划根据仓库生成多个单据
|
2024-07-03 16:01:24 +08:00 |
|
|
|
9b1280fa76
|
fix:去除校验
|
2024-07-03 15:38:27 +08:00 |
|
zhouz
|
e8bccfced1
|
fix:发送数字孪生优化
|
2024-07-03 15:36:33 +08:00 |
|
zhouz
|
78703b146d
|
fix:暂时去除锂电不允许表处的逻辑
|
2024-07-03 07:47:12 +08:00 |
|
|
|
5870a48fe4
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-02 22:45:29 +08:00 |
|
|
|
71f320e158
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 22:44:23 +08:00 |
|
|
|
f606c6a16a
|
fix: pc可修改分切计划信息
|
2024-07-02 22:43:33 +08:00 |
|
|
|
3faf1b65c1
|
add:增加装箱区库存页面
|
2024-07-02 16:30:19 +08:00 |
|
zhouz
|
7824298f1a
|
fix:MES相关接口优化
|
2024-07-02 16:26:30 +08:00 |
|
|
|
2f6cbfd9c1
|
rev： 立库堆垛机相关任务下发时 给托盘号
|
2024-07-02 13:29:00 +08:00 |
|
|
|
1a72a6cb78
|
opt:优化一楼装箱区任务类相关校验
|
2024-07-02 13:12:34 +08:00 |
|
zhouz
|
b3227f1a8d
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-01 16:45:18 +08:00 |
|
zhouz
|
efafb265eb
|
fix:MES相关接口优化
|
2024-07-01 16:42:00 +08:00 |
|
|
|
7f201dba96
|
rev：代码合并
|
2024-07-01 15:13:51 +08:00 |
|
|
|
69b58c9d06
|
Merge branch 'master' into master_merge
|
2024-07-01 15:13:07 +08:00 |
|
|
|
e9f415d8cf
|
rev：改切入库回传
|
2024-07-01 15:10:58 +08:00 |
|
|
|
4c07bdbfca
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java
|
2024-07-01 13:58:54 +08:00 |
|
zhouz
|
729afce407
|
fix:WQL数据新增，入烘箱优化
|
2024-06-30 18:54:13 +08:00 |
|
|
|
9ecc870369
|
opt:优化子卷装箱校验逻辑
|
2024-06-30 18:10:59 +08:00 |
|
zhouz
|
35ccff0564
|
fix:重量校验
|
2024-06-30 15:18:44 +08:00 |
|
zhouz
|
c0ba71e24b
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-29 21:53:14 +08:00 |
|
zhouz
|
79d0e10a43
|
fix:WQL文件修改
|
2024-06-29 21:52:46 +08:00 |
|
zhouz
|
371cc4abee
|
Merge branch 'refs/heads/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
|
2024-06-29 19:10:34 +08:00 |
|
zhouz
|
3ca403632d
|
fix:WQL合并
|
2024-06-29 19:09:29 +08:00 |
|
zhouz
|
9e32eca116
|
fix:WQL修改
|
2024-06-29 17:55:59 +08:00 |
|
zhouz
|
23c7d3ab4a
|
fix:WQL优化
|
2024-06-29 16:40:24 +08:00 |
|
zhouz
|
f8d9ad12e4
|
fix:MES变更库区
|
2024-06-29 16:37:34 +08:00 |
|
zhouz
|
946857d454
|
fix:问题优化
|
2024-06-29 10:48:17 +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 |
|
|
|
c9c93cd2cc
|
fix: api错误
|
2024-06-27 15:19:36 +08:00 |
|
|
|
39f10ae18f
|
rev：代码合并
|
2024-06-27 15:09:32 +08:00 |
|
|
|
2ae476a67a
|
Merge pull request 'b_lms_master_merge' (#3) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/3
|
2024-06-27 08:54:19 +08:00 |
|
zhouz
|
6240eb9a72
|
代码合并
|
2024-06-26 23:09:09 +08:00 |
|
