Commit Graph

257 Commits

Author SHA1 Message Date
zhoukeda
7ec192f711 数字输入返回数字 2023-06-05 14:59:58 +08:00
DEVICE8\12494
14cbca311d Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-02 17:39:21 +08:00
DEVICE8\12494
863d9cf470 模具保养运行,代码优化 2023-06-02 17:39:17 +08:00
zhoukeda
579aa750ad 工艺管理 2023-06-02 16:57:46 +08:00
PhilPan
5b83328369 修复建表失败的错误 2023-06-02 13:55:22 +08:00
PhilPan
483fc36b3d 删除多余的Dictionary转Object 2023-06-02 10:56:13 +08:00
DEVICE8\12494
aed23fac08 1 2023-06-02 08:39:53 +08:00
DEVICE8\12494
73445f813e 载具更换代码优化 2023-06-02 08:39:27 +08:00
zhoukeda
45b05925d7 生成特种设备检验计划定时任务 2023-06-01 16:17:55 +08:00
zhoukeda
b8d77e72d9 特种设备检验 2023-06-01 15:25:41 +08:00
PhilPan
c920a99e8a Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev 2023-06-01 10:40:53 +08:00
PhilPan
51530a81cc 消除平台模块warning 2023-06-01 10:36:47 +08:00
zhoukeda
52a16b0228 设备档案 2023-05-31 17:10:15 +08:00
zhoukeda
f325b10516 Merge remote-tracking branch 'origin/dev' into dev 2023-05-31 14:46:23 +08:00
zhoukeda
9057618966 bug 2023-05-31 14:46:11 +08:00
DEVICE8\12494
38a62de63a 新增对象深拷贝通用函数,新增wms载具更换函数 2023-05-31 14:34:31 +08:00
DEVICE8\12494
70e01de66c Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-31 10:35:04 +08:00
DEVICE8\12494
600cd6d900 模具保养执行业务代码调整 2023-05-31 10:34:59 +08:00
PhilPan
ad0972c8f6 修复设备文件上传接口 2023-05-31 10:25:00 +08:00
PhilPan
916875de9f Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev 2023-05-31 10:19:09 +08:00
PhilPan
9c621c75cd v3.4.6 2023-05-31 10:19:05 +08:00
DEVICE8\12494
ea3a325ecb Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-30 08:34:48 +08:00
DEVICE8\12494
919911d61d 模具保养执行代码提交 2023-05-30 08:34:44 +08:00
zhoukeda
64fc5b1a84 Merge remote-tracking branch 'origin/dev' into dev 2023-05-29 16:28:17 +08:00
zhoukeda
ec889a802a 外修申请流程退回 2023-05-29 16:28:10 +08:00
DEVICE8\12494
9237c0e876 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-29 12:07:53 +08:00
DEVICE8\12494
cf7c43230d 1 2023-05-29 12:07:48 +08:00
zhoukeda
686de1be34 维修记录 2023-05-29 10:50:50 +08:00
DEVICE8\12494
43d080690e Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-28 21:17:58 +08:00
DEVICE8\12494
c6522831b4 1 2023-05-28 21:17:49 +08:00
zhoukeda
26de55ce0a 增加根据id获取设备接口 2023-05-26 17:30:49 +08:00
zhoukeda
a0d611931e 改bug 2023-05-26 16:51:36 +08:00
zhoukeda
ed2b05b289 发布功能不更新名称排序图标 2023-05-26 16:27:44 +08:00
DEVICE8\12494
56affbfd19 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-25 22:52:05 +08:00
DEVICE8\12494
7dcb35b455 生产提报代码提交 2023-05-25 22:51:56 +08:00
zhoukeda
8399bb81b2 Merge remote-tracking branch 'origin/dev' into dev 2023-05-25 17:22:45 +08:00
zhoukeda
60e23211be 设备附件 2023-05-25 17:22:37 +08:00
DEVICE8\12494
5601d3a186 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-25 14:09:14 +08:00
DEVICE8\12494
9e3832f6f4 1 2023-05-25 14:09:09 +08:00
zhoukeda
4d48d82fe5 设备保养执行 复核 设备报废 2023-05-25 12:02:02 +08:00
DEVICE8\12494
76f3b0768b Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-24 23:31:20 +08:00
DEVICE8\12494
d12e05d737 根据生产bom拆分子工单代码调整 2023-05-24 23:31:13 +08:00
zhoukeda
991f6618ee 设备保养 2023-05-24 17:24:05 +08:00
zhoukeda
5ef9cf73dd Merge remote-tracking branch 'origin/dev' into dev 2023-05-24 11:52:57 +08:00
zhoukeda
ae41b9b78b 设备外修登记 流程还不支持退回 2023-05-24 11:52:47 +08:00
PhilPan
1b65a7a9e5 开启默认sugar超时时间 2023-05-24 11:52:16 +08:00
DEVICE8\12494
65072abc04 解决代码冲突 2023-05-24 08:38:34 +08:00
DEVICE8\12494
d9332aa10c 1 2023-05-23 19:25:40 +08:00
DEVICE8\12494
45b7ac6e20 1 2023-05-23 19:25:24 +08:00
DEVICE8\12494
f388692848 组装包装,生产排产代码调整 2023-05-23 19:23:09 +08:00