zhoukeda
|
0e67f002a7
|
1
|
2023-11-07 10:42:19 +08:00 |
|
zhoukeda
|
4029614a87
|
不属于任务单的物料也可签收
|
2023-11-07 10:31:43 +08:00 |
|
zhoukeda
|
eb3037385e
|
工位只能有一个进行中的任务单
|
2023-11-07 10:15:47 +08:00 |
|
zhoukeda
|
1a194cd2db
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-07 09:56:40 +08:00 |
|
zhoukeda
|
e394333110
|
物料出库申请 + bug
|
2023-11-07 09:56:32 +08:00 |
|
yang.lee
|
143f636b21
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-07 09:05:44 +08:00 |
|
yang.lee
|
d02b310820
|
1
|
2023-11-07 09:05:37 +08:00 |
|
fei.pan
|
1dbb17f103
|
执行代码清理，修复warning
|
2023-11-06 19:59:12 +08:00 |
|
fei.pan
|
c6b8dfc861
|
去除引用common.props
|
2023-11-06 19:35:59 +08:00 |
|
fei.pan
|
6a2154edd9
|
增加同时获取多个字典类型数据接口
|
2023-11-06 18:08:22 +08:00 |
|
qianjiawei
|
261a917bab
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-06 17:53:07 +08:00 |
|
qianjiawei
|
55eba2d422
|
REDIS
|
2023-11-06 17:52:20 +08:00 |
|
zhoukeda
|
e0972cb1b9
|
bug
|
2023-11-06 16:38:23 +08:00 |
|
zhoukeda
|
9ee80fe00f
|
短管挤出入库申请
|
2023-11-06 16:20:10 +08:00 |
|
zhoukeda
|
bab70ddd51
|
1
|
2023-11-06 15:41:25 +08:00 |
|
zhoukeda
|
a055ac33ef
|
根据工位id获取当前进行中的任务单 生产投料新接口
|
2023-11-06 15:30:31 +08:00 |
|
zhoukeda
|
8c8284a72d
|
1
|
2023-11-06 10:27:22 +08:00 |
|
zhoukeda
|
aad4888c14
|
一般出库申请
|
2023-11-06 10:08:32 +08:00 |
|
yang.lee
|
904135fdec
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-03 22:12:11 +08:00 |
|
yang.lee
|
537e54b565
|
与任务执行，新增信号量锁，解决并发环境下数据的一致性问题
|
2023-11-03 22:12:01 +08:00 |
|
zhoukeda
|
733a8cf889
|
获取备料计划
|
2023-11-03 17:11:37 +08:00 |
|
qianjiawei
|
cc670e07d6
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-03 15:42:58 +08:00 |
|
qianjiawei
|
e12cc45299
|
Redis获取数采数据
|
2023-11-03 15:42:51 +08:00 |
|
zhoukeda
|
1e74928799
|
bug
|
2023-11-03 14:32:08 +08:00 |
|
zhoukeda
|
d77b6c1a5b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-03 14:29:30 +08:00 |
|
zhoukeda
|
c7add3bfe5
|
齐套出库接口
|
2023-11-03 14:29:22 +08:00 |
|
FanLian
|
a35aea7f13
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-03 11:38:04 +08:00 |
|
FanLian
|
7a1dbf4e97
|
删除齐套出库接口的seq字段
|
2023-11-03 11:37:58 +08:00 |
|
zhoukeda
|
2959d925cf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-03 10:28:05 +08:00 |
|
zhoukeda
|
f56c1d1120
|
添加x2server设备关联的字段
|
2023-11-03 10:27:58 +08:00 |
|
qianjiawei
|
821358621c
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-03 09:54:04 +08:00 |
|
qianjiawei
|
0bfc23ac4c
|
redis获取数采数据
|
2023-11-03 09:53:58 +08:00 |
|
fei.pan
|
5dbbe60682
|
模型查询接口增加按子表字段查询
|
2023-11-02 17:42:12 +08:00 |
|
zhoukeda
|
29eb552d3b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-02 17:34:05 +08:00 |
|
zhoukeda
|
46772647e7
|
注塑满箱入库申请接口
|
2023-11-02 17:33:58 +08:00 |
|
yang.lee
|
669c4228e8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-02 15:58:33 +08:00 |
|
yang.lee
|
b13574530d
|
将依赖事件总线的发布订阅模式，改为直接调用的形式
|
2023-11-02 15:58:15 +08:00 |
|
zhoukeda
|
910d96c921
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-02 11:45:52 +08:00 |
|
zhoukeda
|
95ecfd1814
|
1
|
2023-11-02 11:45:44 +08:00 |
|
qianjiawei
|
a01786aef8
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-11-02 10:14:13 +08:00 |
|
qianjiawei
|
b1984e5548
|
模具保养
|
2023-11-02 10:14:06 +08:00 |
|
zhoukeda
|
8c31205e70
|
bug
|
2023-11-01 00:01:24 +08:00 |
|
zhoukeda
|
4cfefb9150
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-31 18:20:28 +08:00 |
|
zhoukeda
|
615957e66d
|
点巡检 保养没子项目不生成
|
2023-10-31 18:20:17 +08:00 |
|
yang.lee
|
02e4dbb45a
|
放货确认，电梯关门逻辑代码调整
|
2023-10-31 17:49:28 +08:00 |
|
yang.lee
|
77a07b5a3a
|
Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
|
2023-10-31 17:38:02 +08:00 |
|
yang.lee
|
74118cccf4
|
1、删除无用类
2、调整定时逻辑，将定时改为框架的事件总线
3、电梯业务逻辑代码调整
|
2023-10-31 17:37:54 +08:00 |
|
qianjiawei
|
b00eea39dd
|
bug
|
2023-10-31 17:32:57 +08:00 |
|
qianjiawei
|
2c37098bc2
|
质检
|
2023-10-31 14:53:58 +08:00 |
|
zhoukeda
|
ab1635cbe5
|
bug
|
2023-10-30 17:30:59 +08:00 |
|