yang.lee
|
86c0c0ee3a
|
修复bug
|
2023-11-16 11:53:47 +08:00 |
|
yang.lee
|
68195fe844
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-16 11:53:39 +08:00 |
|
yang.lee
|
ff37e58ef8
|
修复bug
|
2023-11-16 11:53:19 +08:00 |
|
zhoukeda
|
6b642324f7
|
1
|
2023-11-16 09:49:15 +08:00 |
|
zhoukeda
|
e29d74844c
|
任务单操作记录列表修改
|
2023-11-16 09:26:53 +08:00 |
|
yang.lee
|
98d0fd1004
|
1
|
2023-11-15 14:30:26 +08:00 |
|
yang.lee
|
f825db530e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-15 14:29:46 +08:00 |
|
yang.lee
|
4f0211ee3a
|
wms删除无用代码类
|
2023-11-15 14:29:39 +08:00 |
|
fei.pan
|
60d938b750
|
清除common.props
|
2023-11-15 14:20:43 +08:00 |
|
fei.pan
|
9c03ef2bcc
|
完善模型通用接口的无限层级一对一和单层级一对多
|
2023-11-15 13:43:24 +08:00 |
|
zhoukeda
|
d800987307
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-15 11:30:02 +08:00 |
|
zhoukeda
|
d9182f89b7
|
生产bom复制
|
2023-11-15 11:29:53 +08:00 |
|
zhoukeda
|
6702dac9c3
|
工单查询多几个条件
|
2023-11-15 11:07:38 +08:00 |
|
yang.lee
|
15cabb865e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-15 10:16:42 +08:00 |
|
yang.lee
|
d606315f94
|
1、调整盘点任务动态生成查询条件
2、LambdaExpressionExtensions 新增表达式树扩展
|
2023-11-15 10:16:34 +08:00 |
|
hlb
|
e13f1fd3d2
|
重写在库物料维护
|
2023-11-15 09:25:58 +08:00 |
|
yang.lee
|
5714e38ffc
|
修改盘点任务代码
|
2023-11-14 18:00:32 +08:00 |
|
zhoukeda
|
9ea879f865
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-14 17:49:45 +08:00 |
|
zhoukeda
|
f746f7c258
|
子表信息可以传ids查询
|
2023-11-14 17:49:35 +08:00 |
|
yang.lee
|
e940fd8a31
|
1
|
2023-11-14 15:49:03 +08:00 |
|
yang.lee
|
347d8676fb
|
调整盘点任务，新建重写的逻辑代码
|
2023-11-14 15:44:33 +08:00 |
|
yang.lee
|
1535d1532c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-14 15:21:22 +08:00 |
|
yang.lee
|
3f6deb4204
|
调整获取随机数方式
|
2023-11-14 15:21:18 +08:00 |
|
hlb
|
8dc10ee1df
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-14 14:56:48 +08:00 |
|
hlb
|
3fdf4c9516
|
修改判断条件
|
2023-11-14 14:56:40 +08:00 |
|
yang.lee
|
cd7d12a301
|
出库申请，分拣出时业务回更，调用载具移入不await
|
2023-11-14 10:28:09 +08:00 |
|
hlb
|
8e3f2ec579
|
更新任务实际完成时间
|
2023-11-14 09:26:21 +08:00 |
|
yang.lee
|
63d1ef3bbf
|
预任务执行，如果电梯任务，预Agv任务存在相同目标库位，删除Agv任务保证电梯任务先行
|
2023-11-13 18:32:13 +08:00 |
|
yang.lee
|
dc8f34e71b
|
调整 第三方设备类型枚举顺序，
|
2023-11-13 15:55:00 +08:00 |
|
hlb
|
ffc097a3c3
|
空载具出库为单载具新增
|
2023-11-13 15:33:17 +08:00 |
|
hlb
|
8ee8fe995e
|
修改任务起始值
|
2023-11-13 15:23:09 +08:00 |
|
hlb
|
82909e116d
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-13 15:18:42 +08:00 |
|
hlb
|
1ac220b170
|
修改 路径算法， 当出现多个载具同时出库，可能需要进入电梯时，需要均匀分配电梯
|
2023-11-13 15:18:28 +08:00 |
|
yang.lee
|
48a5512d0c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-13 15:17:33 +08:00 |
|
yang.lee
|
171dd26dbc
|
根据盘点类型获取任务明细，删除注释代码
|
2023-11-13 15:17:28 +08:00 |
|
zhoukeda
|
8a277c40a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-13 15:01:57 +08:00 |
|
zhoukeda
|
58c05b301b
|
返回故障名称
|
2023-11-13 15:01:49 +08:00 |
|
yang.lee
|
c86ad9d872
|
RedisBackGround 报错暂时注掉
|
2023-11-13 13:51:09 +08:00 |
|
yang.lee
|
18c3eb7183
|
+1
|
2023-11-13 12:06:33 +08:00 |
|
yang.lee
|
386292f710
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-13 12:02:57 +08:00 |
|
yang.lee
|
149402ac43
|
调整根据盘点类型获取任务明细代码
|
2023-11-13 12:02:52 +08:00 |
|
hlb
|
3c4147c963
|
去除获取未下发预任务的锁定条件
|
2023-11-13 11:15:25 +08:00 |
|
yang.lee
|
30743623cd
|
新增盘点任务，根据盘点类型获取任务明细信息
|
2023-11-13 10:49:29 +08:00 |
|
hlb
|
88bc41885f
|
获取未下发的预任务，增加目标库位锁定状态
|
2023-11-10 16:40:30 +08:00 |
|
yang.lee
|
0881843ff9
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-10 16:36:13 +08:00 |
|
yang.lee
|
e56d58a97c
|
carry查询 新增物料名称
|
2023-11-10 16:36:06 +08:00 |
|
qianjiawei
|
9ae6886e49
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-10 16:04:06 +08:00 |
|
qianjiawei
|
e60dc32456
|
redis页面
|
2023-11-10 16:03:45 +08:00 |
|
hlb
|
7a94129e35
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-10 14:53:41 +08:00 |
|
hlb
|
113f67b168
|
盘点任务增加盘点签收配置
|
2023-11-10 14:53:33 +08:00 |
|