Commit Graph

239 Commits

Author SHA1 Message Date
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
zhoukeda
e202579a81 已发布的复制改成未发布 2023-05-23 16:18:57 +08:00
zhoukeda
30185e390c Merge remote-tracking branch 'origin/dev' into dev 2023-05-23 08:58:45 +08:00
zhoukeda
38b98060fb 生成bom版本号唯一性校验 2023-05-23 08:58:34 +08:00
DEVICE8\12494
6ee558a3e4 模具保养计划执行模块代码提交 2023-05-22 19:17:14 +08:00
DEVICE8\12494
486d76e3d0 Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-05-21 21:03:51 +08:00
DEVICE8\12494
709ef585b2 异常开始结束带代码提交 2023-05-21 21:03:45 +08:00
zhoukeda
a46191035c 修改bug 2023-05-19 17:40:58 +08:00
zhoukeda
31c33fe0cc Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs
2023-05-19 17:39:49 +08:00
zhoukeda
9b091e3a11 维修管理 2023-05-19 17:39:09 +08:00
PhilPan
2f0af8fe3d Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev 2023-05-19 17:02:11 +08:00
PhilPan
1f535464d8 修复在线用户的错误 2023-05-19 17:02:08 +08:00
qianjiawei
ed3c51e9f0 修改模穴数的获取 2023-05-19 16:10:15 +08:00
PhilPan
23dd5a7604 修复sql错误导致程序崩溃的问题 2023-05-19 11:24:18 +08:00
DEVICE8\12494
0670387658 修复错误 2023-05-19 09:19:29 +08:00
DEVICE8\12494
649105eb6e 1 2023-05-19 09:13:35 +08:00
DEVICE8\12494
1c31a4e496 1 2023-05-19 08:37:27 +08:00
DEVICE8\12494
d8099b38df 1 2023-05-19 08:32:44 +08:00
DEVICE8\12494
d47bca3783 1 2023-05-18 18:44:40 +08:00