qianjiawei
|
0935137979
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-14 17:34:35 +08:00 |
|
qianjiawei
|
2c5b97859d
|
模具保养大改
|
2023-09-14 17:34:26 +08:00 |
|
zhoukeda
|
dd07ca7e40
|
组装包装甘特图接口
|
2023-09-14 17:25:59 +08:00 |
|
qianjiawei
|
8b116138f9
|
1
|
2023-09-13 16:15:59 +08:00 |
|
qianjiawei
|
5365efa279
|
andon呼叫 aql 模具保养
|
2023-09-12 17:33:25 +08:00 |
|
FanLian
|
e117d501b7
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-11 11:27:22 +08:00 |
|
FanLian
|
7d45a0910a
|
导入功能修改
|
2023-09-11 11:26:43 +08:00 |
|
zhoukeda
|
14c73fec00
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-08 16:48:48 +08:00 |
|
zhoukeda
|
16f39c2121
|
pc端生产领料 齐套出库 物料签收 生产入库 的工位由用户选择的工位带出来导致的逻辑变更
|
2023-09-08 16:48:40 +08:00 |
|
FanLian
|
913b95eb4c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-08 12:10:34 +08:00 |
|
FanLian
|
a070ff4409
|
修改载具导入和导入返回值
|
2023-09-08 12:10:27 +08:00 |
|
alex
|
465f6b0bdd
|
1
|
2023-09-08 09:37:36 +08:00 |
|
alex
|
4c6f142e86
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-08 09:17:07 +08:00 |
|
alex
|
38454456fc
|
库位，新增是否超配属性
|
2023-09-08 09:17:01 +08:00 |
|
FanLian
|
7cb5580add
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-08 08:18:56 +08:00 |
|
FanLian
|
7f7234edb1
|
导入功能优化不同数据量插入语句
|
2023-09-08 08:18:50 +08:00 |
|
alex
|
5c75607277
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-07 18:17:12 +08:00 |
|
alex
|
4582fd8a1c
|
解决出库签收，当前用户空引用bug
|
2023-09-07 18:17:07 +08:00 |
|
PhilPan
|
eed5c27a3f
|
修复-发布时代码生成路径的错误
|
2023-09-07 16:16:59 +08:00 |
|
zhoukeda
|
ed7e23192c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-07 11:43:59 +08:00 |
|
zhoukeda
|
951fa02015
|
根据工位id获取任意上级接口
|
2023-09-07 11:43:51 +08:00 |
|
taomin0419
|
94a598d5d6
|
出库签收bug处理
|
2023-09-07 11:02:17 +08:00 |
|
taomin0419
|
8cb5cf7ca3
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-07 10:13:10 +08:00 |
|
taomin0419
|
efddf28b37
|
1
|
2023-09-07 10:13:04 +08:00 |
|
alex
|
22c91ab663
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-07 10:11:44 +08:00 |
|
alex
|
c3749bb2ac
|
载具移入，当前用户获取不到bug处理
|
2023-09-07 10:11:38 +08:00 |
|
qianjiawei
|
bee9c7c98a
|
模具保养
|
2023-09-07 09:57:14 +08:00 |
|
FanLian
|
86e981835f
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-09-07 08:30:06 +08:00 |
|
FanLian
|
6c6afc19f3
|
PDA扫码增加载具条码表,操作记录条码表，回更状态修改
|
2023-09-07 08:30:01 +08:00 |
|
PhilPan
|
64e1a60780
|
vengine初步实现增删改查
|
2023-09-06 18:50:20 +08:00 |
|
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 |
|