Commit Graph

173 Commits

Author SHA1 Message Date
何美荣
358b224865 作业活动记录表 2024-04-10 15:59:51 +08:00
何美荣
9c87290c43 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 15:36:27 +08:00
何美荣
db5b3b174c 外包 2024-04-10 15:36:24 +08:00
wjn
9d2218f786 同步代码 2024-04-10 15:03:00 +08:00
wjn
20b2de466f Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 14:41:50 +08:00
wjn
81eb1855ef 处理bug 2024-04-10 14:41:45 +08:00
何美荣
35c0580c8c 工作票外包 2024-04-10 14:31:09 +08:00
何美荣
d104a47a1e Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 14:01:13 +08:00
何美荣
b42580ef31 bug修复 2024-04-10 14:01:09 +08:00
wyw
bcf8218b64 测试退回2 2024-04-10 13:56:02 +08:00
wyw
cb0f15e8e5 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 13:50:51 +08:00
wyw
89a8472a9c 发布测试1 2024-04-10 13:50:46 +08:00
何美荣
e40ec9cee2 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 11:47:05 +08:00
何美荣
40c80d3622 去除数据权限 2024-04-10 11:46:54 +08:00
wjn
884bf7ff97 修改报错 2024-04-10 11:37:35 +08:00
何美荣
a351613418 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 10:20:53 +08:00
何美荣
c2aa7deb79 工作票外包 2024-04-10 10:20:49 +08:00
wjn
331c54e852 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-10 09:29:18 +08:00
wjn
f96bcb7333 处理组织被删除的问题 2024-04-10 09:29:11 +08:00
何美荣
62b8ea8da7 工作票审批流 2024-04-10 09:19:29 +08:00
wyw
1e41bf3585 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-09 16:40:25 +08:00
wyw
f0f1669d2a 代码合并
T_FM_SYNC_LOG 添加 时间限制才入库
log4Net 年月 添加
跑批 部分添加 try catch 记录错误(大概率比较少错误了懒得全部添加过来)
隐患整改单 获取数据改进 (检查库 添加 整改单 查看)
FMFlowPermitService 添加 记录信息 防止 全部注入依赖
2024-04-09 13:56:33 +08:00
何美荣
cdf2278e8b 优化 2024-04-09 11:37:01 +08:00
何美荣
671bfc92af FO 2024-04-09 09:31:08 +08:00
wjn
35a28d8199 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-08 17:17:56 +08:00
wjn
e9fa712d06 修改转训显示 2024-04-08 17:17:51 +08:00
wyw
00d009d88f 代码返回 2024-04-08 10:56:44 +08:00
wyw
863426b5f6 21345 2024-04-08 10:54:06 +08:00
wyw
75ed94a9ff 12345 2024-04-07 17:32:23 +08:00
wyw
6e28820597 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-07 17:24:41 +08:00
wyw
1ce3dcb27e 43 2024-04-07 17:24:37 +08:00
何美荣
c573391bec BI008优化接口 2024-04-07 16:56:15 +08:00
wyw
4ddcafac31 延期处理 人员空 判断修改 2024-04-07 15:55:31 +08:00
wyw
e39522b6d8 23456 2024-04-07 10:58:47 +08:00
wyw
bd11fda0b3 验证码去除 不能提交 2024-04-07 10:20:50 +08:00
wyw
68582da3bb Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-04-07 09:39:49 +08:00
wyw
6fd28f19f6 2345 2024-04-07 09:39:19 +08:00
何美荣
9428cc1ef3 更新报表接口 2024-04-02 11:04:48 +08:00
何美荣
da7e5fb14d 报表 2024-04-01 15:12:15 +08:00
wjn
cc3365ed96 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-03-29 17:42:35 +08:00
wjn
65270c4d31 修改风险 2024-03-29 17:42:29 +08:00
wyw
1a69b1d7db Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-03-27 10:42:25 +08:00
wyw
258cc2abf7 2345 2024-03-27 10:42:04 +08:00
何美荣
cec7f341ce 首页接口去除生产单元 2024-03-26 14:38:15 +08:00
wyw
02285f4069 23然后她你 2024-03-25 17:17:57 +08:00
wyw
da6b543781 代码同步 2024-03-25 13:56:33 +08:00
wjn
71558528c9 同步代码 2024-03-22 09:00:01 +08:00
wyw
74c5b9851e Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-03-20 17:35:29 +08:00
wyw
1214395152 提交 2024-03-20 17:35:08 +08:00
何美荣
da92d0371e 注释生产单元 2024-03-13 10:23:02 +08:00
wyw
7e381a72b2 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-03-05 14:34:42 +08:00
wyw
3c2294619a 同步 2024-03-05 14:34:37 +08:00
wjn
638f1149c2 修改 2024-03-01 10:45:36 +08:00
何美荣
3fc746f65e 自测问题修复 2024-02-18 11:45:45 +08:00
wyw
722f55910a 修改同步 2024-02-05 17:07:03 +08:00
wyw
66e081bdc4 会议 获取参会人员 改进 2024-02-05 11:28:36 +08:00
wyw
489ea09b99 2345 2024-02-02 11:56:33 +08:00
wyw
cdede712a2 1435 2024-02-02 11:20:39 +08:00
wyw
69b96b638a Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-02-02 11:14:37 +08:00
wyw
4888f66b02 修改拷贝 2024-02-02 11:14:29 +08:00
何美荣
cea1442b01 剥离模块PT,PE,PR 2024-02-01 17:03:07 +08:00
wjn
30e0143fdb 移除dm 2024-01-30 11:19:22 +08:00
wyw
1530c56654 3245 2024-01-29 16:44:19 +08:00
wyw
e5a74a5054 Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms 2024-01-29 16:37:41 +08:00
wjn
a9324b66b9 删除生产单元 2024-01-29 15:39:58 +08:00
wjn
b8fe7cf387 剥离登录模式 2024-01-29 09:46:29 +08:00
wyw
9528fbf04a Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms
# Conflicts:
#	APT.MS.Data/Mapping/T4/T4Map.cs
#	APT.MicroApi/APT.SC.WebApi/Controllers/Api/OGController/06OGConfigController.cs
#	APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs
2024-01-26 17:39:01 +08:00
wyw
cf2c9e00dc 可以运行 2024-01-26 17:37:32 +08:00
wjn
256576c29c 删除无用 2024-01-26 17:22:43 +08:00
wjn
a4a2d689ff 剥离OG 2024-01-26 15:53:20 +08:00
wjn
365222e5ca 剥离lr 2024-01-25 15:41:50 +08:00
wjn
96f4f10cbb 修改配置 2024-01-22 17:31:24 +08:00
wjn
66f6b7eeea first commit 2024-01-22 09:17:01 +08:00