alex
|
b52e48ce9a
|
出库签收，解决获取不到登录用户的问题
|
2023-09-06 18:26:33 +08:00 |
|
alex
|
3fb3866009
|
注释timeStremp解决，出库签收类型映射bug
|
2023-09-06 18:11:19 +08:00 |
|
alex
|
198b554205
|
修改出库申请bug
|
2023-09-06 17:53:40 +08:00 |
|
alex
|
8338c7fa86
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 17:46:07 +08:00 |
|
alex
|
24563ed55e
|
1
|
2023-09-06 17:46:02 +08:00 |
|
zhoukeda
|
4f64e743e4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-06 17:34:54 +08:00 |
|
zhoukeda
|
09236f4928
|
pda设备维修
|
2023-09-06 17:34:46 +08:00 |
|
alex
|
1568d6ef85
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 17:09:35 +08:00 |
|
alex
|
5d7175c98f
|
修正出库申请，根据工位获取匹配终止库位逻辑
|
2023-09-06 17:09:31 +08:00 |
|
FanLian
|
98426cac48
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 11:30:51 +08:00 |
|
FanLian
|
1077114c34
|
去除Modify
|
2023-09-06 11:30:45 +08:00 |
|
qianjiawei
|
e0beeb4b91
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 10:50:48 +08:00 |
|
qianjiawei
|
17c0f3212e
|
1
|
2023-09-06 10:50:43 +08:00 |
|
FanLian
|
681c4866c6
|
PDA扫码入库增加预任务条码表
|
2023-09-06 10:47:19 +08:00 |
|
FanLian
|
dd9458f92f
|
去除标识符
|
2023-09-06 10:27:53 +08:00 |
|
FanLian
|
a115761ff2
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 10:26:14 +08:00 |
|
FanLian
|
58ec053b15
|
PDA扫码入库，打印状态和同步状态
|
2023-09-06 10:26:08 +08:00 |
|
alex
|
6b847305f7
|
生成预任务增加判断，如果起终库位相同则删除对应的预任务
|
2023-09-06 10:15:27 +08:00 |
|
alex
|
8411d57b6e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 09:53:36 +08:00 |
|
alex
|
955a0d652d
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 09:53:17 +08:00 |
|
FanLian
|
a3d80230b8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-06 09:53:16 +08:00 |
|
alex
|
10a907d927
|
PDA扫码入库逻辑修改
|
2023-09-06 09:53:12 +08:00 |
|
FanLian
|
7e336c09d0
|
导入功能测试完善
|
2023-09-06 09:53:11 +08:00 |
|
zhoukeda
|
31e36e7146
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-05 17:43:40 +08:00 |
|
zhoukeda
|
6bf8f27658
|
bug
|
2023-09-05 17:43:33 +08:00 |
|
alex
|
589803f1d9
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-05 17:40:44 +08:00 |
|
alex
|
b5feba2109
|
1
|
2023-09-05 17:40:39 +08:00 |
|
alex
|
a6fdf64681
|
调整出库申请，终止点位代码逻辑
|
2023-09-05 17:40:35 +08:00 |
|
zhoukeda
|
b8028496be
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-05 16:37:05 +08:00 |
|
zhoukeda
|
d0af0552a3
|
排产至工位 pc端注塑挤出任务管理 组装包装任务管理添加工位过滤
|
2023-09-05 16:36:57 +08:00 |
|
qianjiawei
|
ef9766bacd
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-05 16:15:24 +08:00 |
|
qianjiawei
|
36e4944e5e
|
1
|
2023-09-05 16:15:18 +08:00 |
|
alex
|
9fb0e0eba8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-05 15:47:57 +08:00 |
|
alex
|
11141f7e1b
|
枚举映射代码调整
|
2023-09-05 15:47:52 +08:00 |
|
zhoukeda
|
9fe74c54b1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-04 17:22:56 +08:00 |
|
zhoukeda
|
b573a49f4b
|
PDA设备点巡检 保养相关接口
|
2023-09-04 17:22:47 +08:00 |
|
alex
|
74eab758e8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-04 16:32:11 +08:00 |
|
alex
|
ef246e4720
|
1
|
2023-09-04 16:32:07 +08:00 |
|
alex
|
0ad3ac3f5d
|
任务链上报状态新增状态记录到系统日志
|
2023-09-04 16:32:03 +08:00 |
|
FanLian
|
49bc27d8f4
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-04 14:19:28 +08:00 |
|
FanLian
|
13e2e81d13
|
增加PDA扫码入库模块
|
2023-09-04 14:19:23 +08:00 |
|
zhoukeda
|
893b0bd95f
|
1
|
2023-09-01 17:12:04 +08:00 |
|
zhoukeda
|
f374ea514b
|
1
|
2023-09-01 08:56:14 +08:00 |
|
zhoukeda
|
6642720a7c
|
pda任务单操作记录相关接口
|
2023-08-31 16:29:07 +08:00 |
|
zhoukeda
|
49056a6a53
|
pda组装包装任务管理相关接口
|
2023-08-31 11:37:45 +08:00 |
|
zhoukeda
|
2d6e2a56fc
|
移动端注塑挤出任务管理相关接口
|
2023-08-30 16:51:31 +08:00 |
|
qianjiawei
|
52b0eb1762
|
1
|
2023-08-29 17:10:50 +08:00 |
|
qianjiawei
|
1c372c6d78
|
1
|
2023-08-28 17:27:55 +08:00 |
|
qianjiawei
|
1b71afefce
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-08-28 08:48:27 +08:00 |
|
qianjiawei
|
bbcdb7d0fb
|
1
|
2023-08-25 17:53:56 +08:00 |
|