qianjiawei
|
9b779d5407
|
1
|
2023-07-21 15:16:22 +08:00 |
|
FanLian
|
7bb60e3018
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 17:59:57 +08:00 |
|
FanLian
|
f4134375f6
|
bug
|
2023-07-20 17:59:52 +08:00 |
|
qianjiawei
|
e22f7f277e
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 17:36:35 +08:00 |
|
qianjiawei
|
cb5deef407
|
1
|
2023-07-20 17:36:28 +08:00 |
|
alex
|
1afc6f6039
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:50:37 +08:00 |
|
alex
|
e67beb20f7
|
调整齐套出库，拼接查询表达式代码
|
2023-07-20 15:50:33 +08:00 |
|
FanLian
|
70b78d9756
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:49:20 +08:00 |
|
FanLian
|
210a929685
|
齐套分拣表达式错误修改
|
2023-07-20 15:49:15 +08:00 |
|
qianjiawei
|
d05e71ffed
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:45:26 +08:00 |
|
qianjiawei
|
f0e415a3dd
|
1
|
2023-07-20 15:45:20 +08:00 |
|
FanLian
|
75f7d51424
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 15:07:03 +08:00 |
|
FanLian
|
473059adda
|
MES生产入库接口bug
|
2023-07-20 15:06:56 +08:00 |
|
alex
|
d1ee658d13
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-07-20 14:42:37 +08:00 |
|
alex
|
bf76a84621
|
1、解决在线开发明细最后一条删除不了的bug
2、解决在线开发明细新增时报主键重复的bug
|
2023-07-20 14:42:31 +08:00 |
|
zhoukeda
|
818e259205
|
调wms接口返回成功后再操作数据库
|
2023-07-20 14:06:35 +08:00 |
|
zhoukeda
|
716c1f5d14
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-07-20 14:04:29 +08:00 |
|
zhoukeda
|
74b13dcfbd
|
生产排产算预计结束时间
|
2023-07-20 14:04:21 +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 |
|