|
|
e7d376f784
|
fix:补空任务限制为2
|
2024-07-12 14:29:29 +08:00 |
|
|
|
ee2561a19b
|
fix:修改点位库存修改问题
|
2024-07-12 14:18:56 +08:00 |
|
|
|
24b45d33c2
|
opt:优化取空载具逻辑
|
2024-07-12 12:46:09 +08:00 |
|
|
|
cefdb02a7b
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-12 11:27:41 +08:00 |
|
|
|
4a0269f63a
|
fix: 改制用母卷为空做判断
|
2024-07-12 11:27:19 +08:00 |
|
|
|
38f2e933ef
|
opt:优化二次分配日志记录
|
2024-07-12 10:21:57 +08:00 |
|
|
|
4bc1860944
|
opt:优化二次分配日志记录
|
2024-07-12 09:35:02 +08:00 |
|
|
|
1702a4558c
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-12 09:17:26 +08:00 |
|
|
|
886c8af826
|
add: 手持维护气胀轴库库存信息
|
2024-07-12 09:16:55 +08:00 |
|
|
|
af9192bee8
|
fix:增加桁架任务及二次分配任务完成情况校验
|
2024-07-11 21:39:19 +08:00 |
|
|
|
62774053a3
|
fix:增加桁架任务及二次分配任务完成情况校验
|
2024-07-11 19:26:58 +08:00 |
|
|
|
e3da38f4f9
|
Merge branch 'b_lms' into master_merge
|
2024-07-11 14:50:10 +08:00 |
|
|
|
23cd49cfb3
|
add：木箱信息页面
|
2024-07-11 14:47:17 +08:00 |
|
|
|
94a7b5b431
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-11 09:39:20 +08:00 |
|
|
|
52cc5d7dfd
|
fix:增加二次分配任务完成情况校验
|
2024-07-11 09:39:11 +08:00 |
|
|
|
3b4fdf64dd
|
fix: 单元测试
|
2024-07-11 09:33:48 +08:00 |
|
zhouz
|
ae0b82dd04
|
fix:生箔工序优化、出库托盘、木箱解绑
|
2024-07-11 09:17:01 +08:00 |
|
|
|
600076bc59
|
Merge remote-tracking branch 'origin/master'
|
2024-07-11 08:42:40 +08:00 |
|
|
|
22944ce7ea
|
fix: 堆叠行架修改、日志优化、定时器优化
|
2024-07-11 08:42:17 +08:00 |
|
|
|
8884ef7c59
|
fix:增加二次分配任务完成情况校验
|
2024-07-10 22:53:06 +08:00 |
|
|
|
db067c980a
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-10 18:54:44 +08:00 |
|
|
|
192ff5f65a
|
fix: 回滚
|
2024-07-10 18:54:24 +08:00 |
|
|
|
b4c7444670
|
fix: 分切计划维护结束时间
|
2024-07-10 18:52:13 +08:00 |
|
yanps
|
4b75167f19
|
add: 添加LMS下发信号到西门子称重位
|
2024-07-10 17:52:11 +08:00 |
|
|
|
ed493f29fa
|
Merge branch 'master' into master_merge
|
2024-07-10 13:58:56 +08:00 |
|
|
|
ccbfb652ec
|
fix:增加已分配满轴点位判断
|
2024-07-10 13:06:01 +08:00 |
|
|
|
f362699d28
|
fix:增加已分配满轴点位判断
|
2024-07-10 11:05:12 +08:00 |
|
|
|
d1861b5fd5
|
Merge branch 'b_lms' into master_merge
|
2024-07-10 10:32:51 +08:00 |
|
|
|
ab1235c584
|
rev：发货任务二次分配新增逻辑判断
|
2024-07-10 10:32:02 +08:00 |
|
|
|
25730dfb22
|
fix:增加已分配执行中的空载具任务判断
|
2024-07-10 08:51:32 +08:00 |
|
|
|
93c1c11f04
|
rev:出库报表新增原销售订单
|
2024-07-10 08:51:07 +08:00 |
|
|
|
8287c2d0c2
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-09 23:15:34 +08:00 |
|
|
|
c8004cf002
|
fix: 定时任务新增指定调度IP
|
2024-07-09 23:14:59 +08:00 |
|
zhouz
|
1105f0dd28
|
fix:获取堆叠模版优化
|
2024-07-09 19:19:14 +08:00 |
|
zhouz
|
aa86828ea2
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
|
2024-07-09 19:13:48 +08:00 |
|
zhouz
|
2c7bb98af5
|
fix:获取堆叠模版优化
|
2024-07-09 19:09:27 +08:00 |
|
zhouz
|
c29798e1b3
|
fix:获取堆叠模版优化
|
2024-07-09 19:08:53 +08:00 |
|
|
|
35550db2a7
|
Merge branch 'b_lms' into master_merge
|
2024-07-09 16:16:28 +08:00 |
|
|
|
0b7f0783e7
|
rev：出库明细更新状态修改
|
2024-07-09 16:12:59 +08:00 |
|
|
|
9397be254d
|
fix:增加放货类型判断
|
2024-07-09 15:29:06 +08:00 |
|
|
|
b029409489
|
fix:增加放货类型判断
|
2024-07-09 15:28:28 +08:00 |
|
|
|
d9cff93a11
|
fix: 分切下料去除B1
|
2024-07-09 15:21:10 +08:00 |
|
|
|
254b4f4a65
|
rev：返检/改切出库回传删除子卷包装关系，成品入库报表新增查询条件
|
2024-07-09 14:42:54 +08:00 |
|
yanps
|
44ed477346
|
opt: 接口日志显示优化
|
2024-07-09 13:40:06 +08:00 |
|
|
|
d652148c1f
|
Merge remote-tracking branch 'origin/master'
|
2024-07-09 13:28:27 +08:00 |
|
|
|
6b82cc7967
|
fix: 异步循环依赖报错
|
2024-07-09 13:28:08 +08:00 |
|
zhouz
|
c660472ae9
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-09 12:49:51 +08:00 |
|
zhouz
|
3c443bc438
|
fix:库存更新优化
|
2024-07-09 12:49:26 +08:00 |
|
|
|
42d280edd7
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-09 10:44:57 +08:00 |
|
|
|
b343a5c054
|
remove：手持绑定数据不在根据气胀轴上下轴赋值
|
2024-07-09 10:44:42 +08:00 |
|
