Commit Graph

354 Commits

Author SHA1 Message Date
houyi fb975ac137 备料审批后推送高压MES修改接口 2025-09-30 17:11:37 +08:00
houyi 2fc6dd67e5 删除 2025-09-30 16:40:20 +08:00
houyi 06504b3aa8 销售订单取消审批后推送高压MES接口,销售订单审批后推送高压MES修改接口,生产订单审批后推送高压MES修改接口,生产订单取消审批后推送高压MES接口 2025-09-30 16:34:45 +08:00
lihao 57f0690e98 作业量优化 2025-09-30 14:06:54 +08:00
lihao 9f42e13d92 Merge remote-tracking branch 'origin/main' 2025-09-30 10:11:50 +08:00
lihao 2725850916 优化单据类型 2025-09-30 10:10:43 +08:00
houyi 9ab10106a0 Merge remote-tracking branch 'origin/main' 2025-09-29 16:12:11 +08:00
houyi 128e1f541f 销售订单取消审批后推送高压MES-删除接口 2025-09-29 16:11:07 +08:00
mzr 691c9367e3 高压IMS-取消审批同步 2025-09-29 14:39:23 +08:00
mzr fa5be651bc Merge remote-tracking branch 'origin/main' 2025-09-29 13:27:02 +08:00
mzr eeb4f20546 feat(pmo): 同步IMS审批后增加字段翻译功能
- 增加表头和表体的翻译字段定义- 在构建参数时增加对翻译字段的处理逻辑
2025-09-29 13:26:52 +08:00
houyi 9f392d2142 高压-流程生产订单取消审批后推送高压MES-删除接口 2025-09-29 11:32:07 +08:00
mzr ad7bd64aa0 流程生产订单审批后推送高压IMS-增加修改sql 2025-09-29 09:14:32 +08:00
mzr 5570e015b4 流程生产订单审批后推送高压IMS 2025-09-28 23:24:40 +08:00
lihao 6af9b3c082 Merge remote-tracking branch 'origin/main' 2025-09-28 10:22:27 +08:00
mzr 6e78a0b743 Merge remote-tracking branch 'origin/main' 2025-09-28 10:21:47 +08:00
mzr 2b61df9528 流程生产订单审批后推送高压IMS-sql去掉ts 2025-09-28 10:21:33 +08:00
lihao 1ebc5d225c 备料计划领料和下达优化 2025-09-28 10:17:17 +08:00
houyi 900748953c 高压-备料计划审批后推送高压MES-修改接口 2025-09-28 10:16:08 +08:00
mzr 93ef0d982a 流程生产订单审批后推送高压IMS 2025-09-27 22:40:03 +08:00
lihao 4f213a1dee Merge remote-tracking branch 'origin/main' 2025-09-27 15:42:37 +08:00
lihao ce2874478b 备料计划下达优化修改下游单据类型 2025-09-27 15:35:04 +08:00
mzr 5077b4b7bc 导入流程生产订单-序列号-保存序列号档案id 2025-09-26 21:10:10 +08:00
houyi 2f5997b069 高压-备料计划审批后推送高压MES 优化 2025-09-26 18:22:33 +08:00
lihao 1e4cff9b2c 备料计划下达优化 2025-09-26 16:16:31 +08:00
houyi 9a9822963b 高压-备料计划审批后推送高压MES 优化 2025-09-25 16:14:58 +08:00
houyi 6c4e185294 高压-备料计划审批后推送高压MES 优化 2025-09-25 09:52:49 +08:00
lihao ed040e5c9f 请购增加校验 2025-09-25 08:59:15 +08:00
lihao 2b1f68640a 发料校验增加校验 2025-09-25 08:58:43 +08:00
mzr d9e5c58021 电力电子-流程生产订单投放前检查艾普MES的传输状态V1 2025-09-24 22:19:40 +08:00
houyi c003b14186 高压-备料计划审批后推送高压MES 优化 2025-09-24 18:16:56 +08:00
houyi 38438e7742 高压-备料计划审批后推送高压MES 2025-09-24 15:04:32 +08:00
mzr ab19b96215 PMO-艾普mes-v2 2025-09-24 12:48:35 +08:00
lihao 966ad2d606 生产订单推送艾普mes 2025-09-24 11:00:52 +08:00
mzr 27368587f3 PMO-艾普mes1 2025-09-24 10:04:46 +08:00
lihao 733c6de713 Merge remote-tracking branch 'origin/main' 2025-09-24 08:49:09 +08:00
lihao aae15b298b 高压mes调用回写行状态 2025-09-24 08:48:48 +08:00
lihao baa5472e64 流程生产订单审批后推送高压MES 2025-09-24 08:47:43 +08:00
mzr c32aabcb8d PMO-艾普mes 2025-09-23 20:49:17 +08:00
mzr ae95edbd61 电力电子-流程生产订单和BOM跳过期初 2025-09-23 19:10:49 +08:00
mzr 494dc876b4 精密-启源流程生产订单传参调整 2025-09-23 17:14:36 +08:00
mzr 6aa16c719a 流程生产订单推启源调整 2025-09-22 18:40:57 +08:00
mzr 28713967b3 内配订单推PLM-替换为正式环境的自定义字段 2025-09-21 20:33:33 +08:00
mzr 5f2d4be2cb 期初流程生产订单不填充序列号-增加组织判断 2025-09-21 20:13:44 +08:00
mzr ffd6b82aed 期初流程生产订单不填充序列号 2025-09-21 19:44:46 +08:00
lihao e76a4f94f4 备料计划优化 2025-09-21 19:35:05 +08:00
mzr a435c636e9 PMO审核后调用调整 2025-09-21 18:08:48 +08:00
mzr 6e6ee1414d 更新注释 2025-09-21 17:37:46 +08:00
mzr 99e00ca968 内配订单-PLM传输标志调整 2025-09-21 17:24:29 +08:00
lihao 734b0d7aac Merge remote-tracking branch 'origin/main' 2025-09-21 13:56:29 +08:00
lihao d56a5e2ffb 备料计划优化 2025-09-21 13:55:37 +08:00
mzr 6cc2585572 精密-启源-流程生产订单推送增加字段 2025-09-20 18:25:08 +08:00
mzr 93cee1552c 导入流程生产订单-序列号-调整 2025-09-19 16:18:38 +08:00
mzr 4296caf74f 生产领料-打印 2025-09-19 14:25:11 +08:00
lihao 9c6c656dd4 备料计划输出 2025-09-19 13:20:50 +08:00
mzr 24796e96da 导入流程生产订单-序列号V1 2025-09-19 10:06:26 +08:00
jiashuai afca6722ce Merge branch 'main' of http://124.71.197.109:3000/yonyou/taikai2312 into main 2025-09-17 17:53:20 +08:00
jiashuai 4fab8b3eb6 生产领料添加打印功能 2025-09-17 17:51:37 +08:00
mzr 5f55993e68 生产领料-打印类代码调整 2025-09-17 11:04:01 +08:00
mzr 51fbed7ed5 Merge remote-tracking branch 'origin/main' 2025-09-17 10:53:25 +08:00
mzr 0c44a83335 流程生产订单删除同步艾普MES调整 2025-09-17 10:53:16 +08:00
lihao 149d810332 Merge remote-tracking branch 'origin/main' 2025-09-17 10:50:34 +08:00
lihao efc51c7e9b 优化实现选择行推送 2025-09-17 10:50:22 +08:00
mzr 5ac6837ef4 生产领料-打印V1 2025-09-17 09:24:53 +08:00
mzr 306a703fe0 流程生产订单删除-推艾普MES 2025-09-17 09:03:50 +08:00
mzr d12c8a47a7 内配订单推PLM-传输标志字段赋值调整 2025-09-16 19:40:15 +08:00
rbw 40c7ca78ee 添加删除同步 2025-09-16 19:19:57 +08:00
mzr 974720f4fd 流程生产订单删除后同步艾普MES-V1 2025-09-16 16:56:43 +08:00
mzr 4d1cf632e7 refactor(mmpac): 优化出厂编码的赋值 2025-09-16 13:56:53 +08:00
mzr d60e215f02 艾普MES-生产订单传出厂编号调整 2025-09-15 20:10:52 +08:00
lihao d221f57fcf 实际独立需求销售订单推送生产订单统一批次号 2025-09-15 18:43:02 +08:00
lihao f01ae8b502 Merge remote-tracking branch 'origin/main' 2025-09-15 18:04:56 +08:00
lihao 2e0e2af9c5 实际独立需求销售订单推送生产订单源码 2025-09-15 18:03:57 +08:00
mzr 170009f25e 艾普MES-生产订单传出厂编号取值调整 2025-09-15 17:19:11 +08:00
mzr b3db554a76 优化 2025-09-15 17:03:07 +08:00
lihao 2196d4ed54 优化出厂编号取值改为从序列号取值 2025-09-15 15:52:18 +08:00
lihao 547e2fe5f5 Merge remote-tracking branch 'origin/main' 2025-09-15 10:56:26 +08:00
lihao 5f89006519 实际独立需求生成生产订单 批次号位置源码 2025-09-15 10:56:15 +08:00
mzr 252a054a6a 电力电子-物料同步艾普MES-调整及其它调整 2025-09-15 08:37:52 +08:00
lihao de221a16b8 生产订单完工状态同步 2025-09-12 15:46:53 +08:00
lihao 86e25e2572 生产订单完工状态修改 2025-09-12 14:05:59 +08:00
mzr 281f8846ab 流程生产订单审批后推送高压MES-代码优化 2025-09-12 13:52:57 +08:00
lihao b20511cb60 优化 2025-09-12 10:55:33 +08:00
mzr 491eae4281 箱变-流程生产订单审批后推送QMS 2025-09-11 14:08:18 +08:00
lihao 4cc545d3c2 Merge remote-tracking branch 'origin/main' 2025-09-11 11:03:40 +08:00
mzr dcea3de5af 精密-流程生产订单投放后推送QMS 2025-09-11 11:00:18 +08:00
lihao 543f9965ef 箱变公司MRP计划订单推送生产订单时生成相同的生产批次号 2025-09-11 10:59:42 +08:00
lihao 51d55b9d18 Merge remote-tracking branch 'origin/main' 2025-09-11 08:42:39 +08:00
lihao 7df29da4d8 备料计划下达请购生产 2025-09-11 08:42:23 +08:00
mzr b1a623162e fix(mmpac): 流程生产订单推送PLM-bug处理等 2025-09-10 18:25:49 +08:00
mzr 3f832e4612 配置文件同步 2025-09-09 20:50:07 +08:00
mzr 51ba56ae81 流程生产订单推QMS 2025-09-09 19:30:46 +08:00
mzr 395f09cdd5 注释调整 2025-09-09 15:58:38 +08:00
mzr 7ab84905c1 内配订单手动推PLM 2025-09-09 15:43:02 +08:00
mzr 44552c4e40 内配订单自动推PLM调整 2025-09-09 15:42:10 +08:00
lihao 30f33c6c98 内配订单推plm 2025-09-09 13:54:30 +08:00
mzr affd351c18 内配订单推PLM调整 2025-09-09 12:41:43 +08:00
mzr 0fce6eb532 内配订单推PLM调整 2025-09-09 11:13:59 +08:00
mzr 2f935db45f 内配订单推PLM调整 2025-09-09 10:49:44 +08:00
lihao c9a1cbcea0 计划订单下达生产流程生产订单源码 2025-09-08 15:26:31 +08:00
lihao e90bce565a 流程生产订单审批后推送高压MES 2025-09-08 09:02:03 +08:00
mzr 6b95f2e078 借料入库查询调整 2025-09-07 17:56:22 +08:00
mzr f1349eaefc fix(ic): 借料入库弹窗查询调整 2025-09-07 11:04:04 +08:00
lihao a94b6c7170 在备料计划“下达生产”生产的生产订单从BOM/工艺路线匹配规则那里可以按项目号取对应的生产BOM版本号 2025-09-05 09:19:47 +08:00
lihao 1ce8b41d8e 在BOM/工艺路线匹配规则那里可以按项目号取对应的生产BOM版本号 2025-09-04 19:36:46 +08:00
lihao 6eba148319 Merge remote-tracking branch 'origin/main' 2025-09-03 15:57:21 +08:00
lihao 06e7bd7acb 优化浮点数bug 2025-09-03 15:56:23 +08:00
mzr c7fa2723d3 生产订单推艾普MES调整合同号字段的赋值 2025-09-03 14:59:15 +08:00
lihao 05c0570c0f 流程生产订单审批后推送高压MES 2025-09-02 18:28:58 +08:00
lihao cffbf2577d 备料计划下达生产优化 2025-09-02 18:28:40 +08:00
lihao c45232e225 备料计划下达生产默认为电力电力内配类型 2025-09-02 18:27:37 +08:00
lihao 4964f39025 备料计划下达请购后请购单自动审核 2025-09-02 14:21:15 +08:00
lihao 089685dea6 Merge remote-tracking branch 'origin/main' 2025-09-01 08:46:54 +08:00
lihao dfb71a07a8 流程生产订单审批后推送qms 2025-09-01 08:46:33 +08:00
mzr 8804ffba21 流程生产订单保存时赋值生产BOM 2025-09-01 08:39:25 +08:00
lihao d9c232ab26 审批后推送流程生产订单到启源qms 2025-08-29 14:28:45 +08:00
lihao ee338de1da 备料计划下达请购和生产校验时如果bom中查不到子表物料类型字段就根据bom子表虚项物料进行二次查询bom 查询虚项物料子表时候包含物料和对应物料状态 2025-08-29 10:30:11 +08:00
mzr 071394bf64 feat(mmpac): 优化流程生产订单赋值生产BOM字段逻辑
- 增加配置参数检查,只处理指定的组织
- 查询并赋值生产BOM版本号和ID
- 添加异常处理和日志记录
2025-08-25 22:15:28 +08:00
mzr 9bb3a751d8 流程生产订单赋值生产BOM字段 2025-08-25 19:02:45 +08:00
lihao bb79ead554 作业量新增接口 2025-08-22 14:30:09 +08:00
lihao 5596bef445 优化 2025-08-21 16:40:34 +08:00
mzr 31f6f98451 合并代码 2025-08-20 15:43:06 +08:00
lihao 51ee57a992 计划完工时间修改为上游生产订单计划完工时间 2025-08-19 15:23:23 +08:00
lihao a2a8abe190 优化增加日志 2025-08-14 09:35:08 +08:00
lihao e5e1530a2b 优化 2025-08-14 09:00:49 +08:00
lihao 0ad96d210e Merge remote-tracking branch 'origin/main' 2025-08-14 08:57:16 +08:00
lihao a13820bee9 流程生产订单审核后推送plm 2025-08-14 08:57:05 +08:00
mzr 1b343c02f0 refactor(mmpac): 移除未使用的导入语句 2025-08-13 19:36:36 +08:00
mzr fe004487e2 借料入库-vnotebody用项目名称的值 2025-08-13 15:26:52 +08:00
lihao b93cbb0ec4 优化 2025-08-13 14:13:41 +08:00
mzr 705369e19f 备料计划转库存的其它入库-去除行备注赋值 2025-08-12 19:26:24 +08:00
mzr cdd49483ac 借料入库弹窗-数据校验提示调整 2025-08-12 08:49:41 +08:00
lihao 994bfbb60b Merge remote-tracking branch 'origin/main' 2025-08-11 18:26:46 +08:00
lihao a4aac57d67 优化 2025-08-11 18:26:37 +08:00
mzr d8f705b182 流程生产订单变更推艾普MES 2025-08-11 16:11:42 +08:00
mzr 4bcbbe8cb0 备料计划优化 2025-08-08 08:41:55 +08:00
mzr 939f7ea0d1 备料计划借料入库列表查询 2025-08-06 17:44:36 +08:00
lihao 32fab22287 优化 2025-08-06 11:17:59 +08:00
mzr ce83a23f15 备料计划-借料入库弹窗-列表查询-返回值格式调整 2025-08-06 10:16:34 +08:00
lihao 04c5029e4d Merge remote-tracking branch 'origin/main' 2025-08-06 08:54:25 +08:00
lihao 398cd9138b 优化 2025-08-06 08:54:16 +08:00
mzr d42e0f33eb refactor(mmpac): 重构同步 Epic MES 工单接口的组织相关代码
- 将 FactoryVO 替换为 OrgVO,以支持更广泛的组织类型
- 优化了组织代码和名称的获取逻辑
- 删除了未使用的取消审核流程相关代码
2025-08-06 08:41:57 +08:00
lihao 9058c4532b 查询备料明细优化 2025-08-06 08:36:07 +08:00
mzr f9c9cbff0f 备料计划-借料入库弹窗-列表查询 2025-08-05 18:13:19 +08:00
lihao 925fe589db 审核后修改 2025-08-05 13:32:59 +08:00
lihao 49c4b26cd3 Merge remote-tracking branch 'origin/main' 2025-08-04 10:34:25 +08:00
lihao 6da0efd1dd 推送锐制 2025-08-04 10:34:17 +08:00
mzr 5d3f9729f4 流程生产订单审批后推送艾普MES调整 2025-08-04 10:32:24 +08:00
lihao c96e75e6f6 备料重算后同步mes 2025-07-31 16:34:19 +08:00
mzr d715da0077 备料计划修改BP源码 2025-07-30 15:18:20 +08:00