Commit Graph

144 Commits

Author SHA1 Message Date
qianjiawei
254504ab1d 模具设备产品关联 2023-05-17 09:00:44 +08:00
DEVICE8\12494
6e9d1169ce Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-15 14:47:17 +08:00
DEVICE8\12494
a3ec329dc7 生产管理模块代码调整 2023-05-15 14:47:14 +08:00
zhoukeda
816eda3af3 测试任务调度 还有问题 2023-05-15 14:45:44 +08:00
DEVICE8\12494
c3809e2f45 调整生产管理模块代码 2023-05-15 13:44:23 +08:00
DEVICE8\12494
e435ab6f34 删除重复设备类型 2023-05-15 08:51:11 +08:00
DEVICE8\12494
1814623e4c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-12 22:58:38 +08:00
DEVICE8\12494
77bb079eee 生产管理模块代码调整 2023-05-12 22:58:16 +08:00
zhoukeda
34926dd5e7 加设备相关实体类 2023-05-12 17:25:34 +08:00
PhilPan
2df0106047 外包装条码打印接口 2023-05-12 10:18:54 +08:00
PhilPan
2978f083b6 增加外包装条码打印接口定义 2023-05-12 10:03:17 +08:00
zhoukeda
b45647eaeb Merge remote-tracking branch 'origin/dev' into dev 2023-05-12 09:40:47 +08:00
zhoukeda
eb4a17e592 修改在线开发数字控件添加精度时存在的bug 2023-05-12 09:40:34 +08:00
DEVICE8\12494
85e7338669 1 2023-05-11 10:28:21 +08:00
DEVICE8\12494
d9189e13aa Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-11 10:21:46 +08:00
DEVICE8\12494
7bfa4eed8c 生产管理,新增生产提报,自检报废接口 2023-05-11 10:21:41 +08:00
zhoukeda
a12824d040 改bug 2023-05-11 08:54:53 +08:00
zhoukeda
208e6258d3 改bug 2023-05-09 17:25:33 +08:00
zhoukeda
bf67c0f557 Merge remote-tracking branch 'origin/dev' into dev 2023-05-08 17:42:16 +08:00
zhoukeda
b4ad3d26e2 物料增加信息 工艺路线弹窗增加过滤 2023-05-08 17:42:07 +08:00
DEVICE8\12494
afbf8383c9 新增枚举 2023-05-08 17:07:40 +08:00
DEVICE8\12494
334796f589 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-08 17:01:57 +08:00
DEVICE8\12494
d4702c1fd5 生产任务排产,新增 任务 下发、开始、关闭、完成 接口 2023-05-08 17:01:51 +08:00
zhoukeda
c9e0e2691b 物料清单所有子物料查询接口 2023-05-06 17:09:23 +08:00
PhilPan
7a183ccd94 目录调整 2023-05-05 19:44:24 +08:00
DEVICE8\12494
40bca59440 获取模具列表新增模具Id 2023-05-05 18:20:52 +08:00
DEVICE8\12494
fa4d9be965 在线开发,任务单调整,删除功能代码调整 2023-05-05 17:36:32 +08:00
DEVICE8\12494
b74f5a9701 1 2023-05-05 16:56:42 +08:00
DEVICE8\12494
732efd48f4 1 2023-05-05 16:56:25 +08:00
PhilPan
645dd1f9f3 BasicData.Entities 2023-05-05 16:47:00 +08:00
DEVICE8\12494
7791ff2df7 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-05 16:32:40 +08:00
DEVICE8\12494
5b97a767fb 同组排产代码调整 2023-05-05 16:32:33 +08:00
PhilPan
5c8cf3d265 移除extend模块引用 2023-05-05 15:41:11 +08:00
PhilPan
2949e19785 项目添加引用common.props 2023-05-05 15:36:51 +08:00
zhoukeda
43dba230db Merge remote-tracking branch 'origin/dev' into dev 2023-05-04 17:15:33 +08:00
zhoukeda
33ee9a3e65 物料清单 生产bom添加物料查询 2023-05-04 17:15:21 +08:00
DEVICE8\12494
ca43cd8bfe 调整组织管理,工位绑定工序代码 2023-05-04 15:40:17 +08:00
DEVICE8\12494
c98236d10a 调整在线开发,组织获取关联工序列表代码 2023-05-04 15:08:19 +08:00
DEVICE8\12494
d132c8c229 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-04 08:35:39 +08:00
DEVICE8\12494
36ab326de6 重写在线开发,获取工序列表功能 2023-05-04 08:35:33 +08:00
zhoukeda
4ca25c5a8d Merge remote-tracking branch 'origin/dev' into dev 2023-04-28 17:13:22 +08:00
zhoukeda
811f5ddd26 生产bom添加获取编辑信息接口 2023-04-28 17:13:06 +08:00
DEVICE8\12494
68bbd2d722 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-28 14:45:00 +08:00
DEVICE8\12494
9727378365 重写,在线开发删除接口 2023-04-28 14:44:57 +08:00
zhoukeda
e16fc6ac4a 工序工位存入bas_process_station 2023-04-28 14:38:14 +08:00
DEVICE8\12494
0a2bb034cf Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-27 18:40:42 +08:00
DEVICE8\12494
264f03bb15 调整框架多组合代码,组合条件查询 2023-04-27 18:40:38 +08:00
zhoukeda
e22fd748a9 生产bom保存接口 2023-04-27 16:59:17 +08:00
zhoukeda
70cac6bc83 开关类型控件保存为数字类型 2023-04-27 11:08:28 +08:00
DEVICE8\12494
5499158756 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-04-26 17:58:58 +08:00