alex
|
bf76a84621
|
1、解决在线开发明细最后一条删除不了的bug
2、解决在线开发明细新增时报主键重复的bug
|
2023-07-20 14:42:31 +08:00 |
|
alex
|
46e280bf4c
|
1
|
2023-07-20 10:37:45 +08:00 |
|
alex
|
7cc193c978
|
调整Mes->Wms 出库申请接口，carry_id为空的bug
|
2023-07-20 09:53:20 +08:00 |
|
zhoukeda
|
630a8b76d0
|
系统二维码
|
2023-07-19 17:57:53 +08:00 |
|
zhoukeda
|
48208de173
|
生产领料
|
2023-07-19 17:32:56 +08:00 |
|
alex
|
b2354f31bb
|
1
|
2023-07-19 17:29:22 +08:00 |
|
alex
|
659464f04a
|
调整Mes->Wms生产出库返回值
|
2023-07-19 17:28:45 +08:00 |
|
alex
|
4cf4551d6f
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-19 16:05:47 +08:00 |
|
alex
|
9f7c61b0b0
|
消除部分warning
|
2023-07-19 16:05:44 +08:00 |
|
zhoukeda
|
e6d2dda71c
|
优化任务单调整列表
|
2023-07-19 13:37:36 +08:00 |
|
zhoukeda
|
cb803e7894
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-19 11:45:25 +08:00 |
|
zhoukeda
|
42e0e3a13c
|
bug
|
2023-07-19 11:45:17 +08:00 |
|
FanLian
|
c7a1ae2f59
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-19 11:07:56 +08:00 |
|
FanLian
|
3fac1f47d0
|
空载具出库最小值判断
|
2023-07-19 11:07:49 +08:00 |
|
zhoukeda
|
36c65acc0e
|
bug
|
2023-07-19 11:06:17 +08:00 |
|
zhoukeda
|
f71adaccc5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-18 17:14:57 +08:00 |
|
zhoukeda
|
29d2f240c2
|
获取产线和注塑挤出设备树
|
2023-07-18 17:14:49 +08:00 |
|
alex
|
addc9c19e2
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-18 14:13:00 +08:00 |
|
alex
|
97c0e96b86
|
判断最终目标库位是否可放置当前载具，公共函数代码优化
|
2023-07-18 14:12:56 +08:00 |
|
FanLian
|
f981f4952d
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-18 14:10:02 +08:00 |
|
alex
|
bc5a67338a
|
1
|
2023-07-18 14:03:58 +08:00 |
|
FanLian
|
a5f7ded7d3
|
补漏，调整
|
2023-07-18 11:35:56 +08:00 |
|
zhoukeda
|
58d1fc736e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-18 11:23:20 +08:00 |
|
zhoukeda
|
790ed73bef
|
1
|
2023-07-18 11:23:11 +08:00 |
|
alex
|
8559f08b65
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-18 11:22:01 +08:00 |
|
alex
|
480c2a6d11
|
1
|
2023-07-18 11:21:57 +08:00 |
|
FanLian
|
0daf7fe663
|
入库业务增加库位与载具规格关联的限制
|
2023-07-18 11:17:51 +08:00 |
|
FanLian
|
43f73b16a7
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-18 10:39:03 +08:00 |
|
alex
|
e3a5934738
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-18 10:38:49 +08:00 |
|
alex
|
81f7672980
|
新增，判断目标库位是否可以放置当前载具
|
2023-07-18 10:38:44 +08:00 |
|
zhoukeda
|
bbce3accf3
|
bug
|
2023-07-18 10:32:23 +08:00 |
|
FanLian
|
bfc948a718
|
重命名变量
|
2023-07-18 09:15:50 +08:00 |
|
FanLian
|
ecca272e76
|
1
|
2023-07-18 09:11:22 +08:00 |
|
FanLian
|
919af3542c
|
注释和报错
|
2023-07-18 09:10:57 +08:00 |
|
taomin0419
|
c92dbc3397
|
解决一次同时处理多个update/progress冲突
|
2023-07-17 17:39:02 +08:00 |
|
FanLian
|
340bd17324
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 17:07:11 +08:00 |
|
FanLian
|
193da3ac1b
|
1
|
2023-07-17 17:07:06 +08:00 |
|
FanLian
|
2509eb739d
|
增加存储库位判断，限制条件
|
2023-07-17 17:06:57 +08:00 |
|
alex
|
d6d2baa7ac
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 17:06:45 +08:00 |
|
alex
|
8c06c4c622
|
重写预任务申请，任务执行删除功能
|
2023-07-17 17:06:40 +08:00 |
|
FanLian
|
0a1d4db247
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 15:18:46 +08:00 |
|
FanLian
|
9ca32bbcd6
|
优化
|
2023-07-17 15:18:39 +08:00 |
|
qianjiawei
|
b5e3db8acf
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 15:15:26 +08:00 |
|
qianjiawei
|
25288d8933
|
1
|
2023-07-17 15:15:21 +08:00 |
|
alex
|
af91dc8cb3
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 14:40:10 +08:00 |
|
alex
|
5bb09d4952
|
1
|
2023-07-17 14:40:06 +08:00 |
|
FanLian
|
e2a03ded93
|
优化
|
2023-07-17 14:29:00 +08:00 |
|
FanLian
|
92a8389efa
|
优化
|
2023-07-17 14:28:46 +08:00 |
|
taomin0419
|
d3c2e433d1
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-17 13:53:59 +08:00 |
|
taomin0419
|
1408bf0f97
|
齐套出库增加载具为料架时，取料箱条码
|
2023-07-17 13:53:53 +08:00 |
|