jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • ece4a0adba Accept Merge Request #1740: (feature/制造功能优化 -> develop) 马广威 2025-01-13 16:58:14 +08:00
  • 80384e3244 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-13 16:56:49 +08:00
  • d8a816c90e 调整写入编程记录的位置 mgw 2025-01-13 16:51:25 +08:00
  • 266927f53b Accept Merge Request #1739: (feature/customer_supply -> develop) 秦圣 2025-01-13 16:47:45 +08:00
  • b398d1236e 工艺确认后的错误提示 liaodanlong 2025-01-13 16:46:13 +08:00
  • d626303a2d Accept Merge Request #1738: (feature/customer_supply -> develop) 秦圣 2025-01-13 16:11:13 +08:00
  • a8271d851d 采购单参考销售订单可见性设置 liaodanlong 2025-01-13 16:09:51 +08:00
  • bf4d06e22b 制造订单调拨单合并排除自加工产品 liaodanlong 2025-01-13 16:08:51 +08:00
  • 45baac492a Accept Merge Request #1737: (feature/工单-质检优化_1 -> develop) 禹翔辉 2025-01-13 15:46:31 +08:00
  • 3de86cf538 Merge branch 'feature/工单-质检优化' into feature/工单-质检优化_1 yuxianghui 2025-01-13 15:08:04 +08:00
  • 186dca4618 1、取消质量检查页面根据指令检查自动筛选；2、修改送检按钮隐藏条件；3、优化工单后置三元检测page页显示时，检测结果选择返工时制造订单没有生成检测结果记录问题 yuxianghui 2025-01-13 15:07:08 +08:00
  • 29a6102620 Accept Merge Request #1736: (feature/制造功能优化 -> develop) 马广威 2025-01-13 14:00:52 +08:00
  • b2c6c9c27d 调整码值 mgw 2025-01-13 14:00:20 +08:00
  • 8d130609f1 Accept Merge Request #1735: (feature/制造功能优化 -> develop) 马广威 2025-01-13 13:52:10 +08:00
  • ed6e326539 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-13 13:51:35 +08:00
  • be9846986f 调整爆出位置 mgw 2025-01-13 13:51:07 +08:00
  • 005fa10539 Accept Merge Request #1734: (feature/customer_supply -> develop) 秦圣 2025-01-13 13:42:08 +08:00
  • e8e05bbf6d cloud 镜头资源库同步问题 liaodanlong 2025-01-13 13:40:28 +08:00
  • bfc4752e2c Accept Merge Request #1733: (feature/制造功能优化 -> develop) 马广威 2025-01-13 13:16:50 +08:00
  • 332a44e861 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-13 13:16:15 +08:00
  • d6325bd483 对程序用刀增加补充逻辑 mgw 2025-01-13 13:15:44 +08:00
  • 1820be6691 Accept Merge Request #1732: (feature/customer_supply -> develop) 廖丹龙 2025-01-13 13:03:40 +08:00
  • 6ac3bbe2af 外协工单采购单关联产品展示 liaodanlong 2025-01-13 12:57:21 +08:00
  • a2a8ea5ab1 Accept Merge Request #1731: (feature/customer_supply -> develop) 秦圣 2025-01-13 11:35:03 +08:00
  • d5c65fdc6c 客供料合并，坯料制造订单问题处理 liaodanlong 2025-01-13 11:31:24 +08:00
  • 922a8fca82 Accept Merge Request #1730: (feature/制造功能优化 -> develop) 马广威 2025-01-13 11:12:33 +08:00
  • 6a3a739e2c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-13 11:11:33 +08:00
  • 6b6f091da8 更新编程记录相关 mgw 2025-01-13 11:11:09 +08:00
  • a78b1c7eaf Accept Merge Request #1729: (feature/零件图号名称优化需求 -> develop) 管欢 2025-01-13 10:56:28 +08:00
  • 5aca6d0685 屏蔽报废 guanhuan 2025-01-13 10:48:01 +08:00
  • 0870bafdb9 制造订单、工单页面导航优化 guanhuan 2025-01-13 10:41:49 +08:00
  • 9dfe9ba572 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-13 09:08:38 +08:00
  • 0eaafbf11b Accept Merge Request #1727: (feature/工单-质检优化 -> develop) 禹翔辉 2025-01-10 17:27:37 +08:00
  • 66922f726a Merge branch 'feature/质检优化_1' into feature/工单-质检优化 yuxianghui 2025-01-10 17:26:08 +08:00
  • 629995ad9c 1、完成<工单>通用调整配置优化；2、完成<工单>后置三元检测和质检单逻辑判断及结果同步优化；3、工单新增【送检】功能按钮； yuxianghui 2025-01-10 17:25:19 +08:00
  • 2323c888b4 Accept Merge Request #1726: (feature/零件图号名称优化需求 -> develop) 管欢 2025-01-10 13:22:38 +08:00
  • 52bba95c93 Accept Merge Request #1725: (feature/customer_supply -> develop) 廖丹龙 2025-01-10 11:10:07 +08:00
  • a6c8cd8784 采购单合并后确认工单外协工序为就绪问题 liaodanlong 2025-01-10 11:08:45 +08:00
  • 28d3d6fe60 更新编程记录 mgw 2025-01-10 10:20:23 +08:00
  • 5a4ca414a5 Accept Merge Request #1723: (feature/customer_supply -> develop) 廖丹龙 2025-01-10 10:03:02 +08:00
  • 64a0009692 Accept Merge Request #1724: (feature/增加质检模块 -> develop) 胡尧 2025-01-10 09:58:53 +08:00
  • 22bac48a98 检测结果增加创建人，时间，处理人，时间 胡尧 2025-01-10 09:57:06 +08:00
  • 47f8e5dc1c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-10 09:35:16 +08:00
  • 8589da1b4d 增加多种状态对编程记录的更改 mgw 2025-01-10 09:34:38 +08:00
  • 5e8a69e252 Merge branch 'refs/heads/develop' into feature/customer_supply liaodanlong 2025-01-10 09:23:02 +08:00
  • 937145a542 Accept Merge Request #1722: (feature/质检优化_1 -> develop) 禹翔辉 2025-01-09 17:24:29 +08:00
  • 4c97719e68 Merge branch 'feature/质检优化' into feature/质检优化_1 yuxianghui 2025-01-09 17:22:54 +08:00
  • 7e9e6d0738 工艺确认修改采购单状态变动逻辑 liaodanlong 2025-01-09 17:22:40 +08:00
  • e27506fb07 错误信息修改与委外加工单报错处理 liaodanlong 2025-01-09 17:22:03 +08:00
  • 8d0e993d1a 1、取消工单点击开始按钮二次确认；2、优化质量控制标准模型；3、完成<质量_质量检查>通用调整优化， yuxianghui 2025-01-09 17:20:18 +08:00
  • 4b5661108a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2025-01-09 16:14:23 +08:00
  • 1084f4db12 错误信息修改 liaodanlong 2025-01-09 16:12:56 +08:00
  • aaf72d5e35 调整数据源 mgw 2025-01-09 16:12:54 +08:00
  • bb241095e2 Accept Merge Request #1721: (feature/customer_supply -> develop) 廖丹龙 2025-01-09 14:35:09 +08:00
  • ebf290fbb3 客供料调拨单合并 liaodanlong 2025-01-09 14:32:17 +08:00
  • fc16c867aa 申请编程需求 mgw 2025-01-09 14:07:35 +08:00
  • c658027dcc 新增零件图号 guanhuan 2025-01-09 10:45:06 +08:00
  • 0d3d3284ff Accept Merge Request #1720: (feature/制造-作业单优化 -> develop) 禹翔辉 2025-01-08 17:26:19 +08:00
  • 1a384b9902 1、优化制造-工序模块；2、新增工序个性化记录模型，并添加生成初始化值； yuxianghui 2025-01-08 17:24:58 +08:00
  • c4b2a42ac5 Accept Merge Request #1719: (feature/part_number -> develop) 廖丹龙 2025-01-08 13:38:54 +08:00
  • 284234adf2 合并代码部分还原 feature/part_number liaodanlong 2025-01-08 13:37:48 +08:00
  • d312782245 Accept Merge Request #1718: (feature/part_number -> develop) 廖丹龙 2025-01-08 13:11:30 +08:00
  • 0ce88f322c Accept Merge Request #1717: (feature/报废优化 -> develop) 管欢 2025-01-08 13:09:07 +08:00
  • d582604f13 报废解绑rfid guanhuan 2025-01-08 13:06:01 +08:00
  • 3ba79d88b5 修改错误提示 liaodanlong 2025-01-08 11:36:28 +08:00
  • 35fb6f7119 Accept Merge Request #1716: (feature/part_number -> develop) 廖丹龙 2025-01-08 11:28:33 +08:00
  • c5755c318c Merge branch 'refs/heads/release/release_2.7' into feature/part_number liaodanlong 2025-01-08 11:26:16 +08:00
  • 4a330f6c84 Accept Merge Request #1714: (feature/增加质检模块 -> develop) 胡尧 2025-01-08 11:16:41 +08:00
  • db83846588 增加质检模块 胡尧 2025-01-08 11:16:05 +08:00
  • 4fc0eab513 修复报废没有生成调拨单 guanhuan 2025-01-08 10:58:56 +08:00
  • b996c0c787 Accept Merge Request #1713: (feature/part_number -> develop) 廖丹龙 2025-01-08 10:50:02 +08:00
  • dcaca89c6f 外协工单关联采购单数量计算 liaodanlong 2025-01-08 10:47:31 +08:00
  • ea0ddf0a46 Accept Merge Request #1712: (feature/part_number -> develop) 廖丹龙 2025-01-08 09:37:48 +08:00
  • 5774f241a0 外协工艺合并采购单处理 liaodanlong 2025-01-08 09:36:38 +08:00
  • 8db80e1ed6 Merge branch 'release/release_2.7' master_sf_20250107_2.8 胡尧 2025-01-07 20:16:29 +08:00
  • 55933d6843 Accept Merge Request #1711: (feature/part_number -> develop) 秦圣 2025-01-07 13:55:10 +08:00
  • ad02cbf8cb sf-制造订单-工单添加外协工序，制造订单状态变成已完成，销售订单的收货中没有该产品的调拨 liaodanlong 2025-01-07 13:40:17 +08:00
  • 9660392495 修复报废没有生成调拨单 guanhuan 2025-01-06 14:52:24 +08:00
  • 196b427867 状态计算 release/release_2.7 liaodanlong 2025-01-06 13:39:21 +08:00
  • b6f3382e5d 状态计算 liaodanlong 2025-01-06 13:34:57 +08:00
  • f2ee382205 状态计算 liaodanlong 2025-01-06 13:33:02 +08:00
  • 081880b4bb 状态计算 liaodanlong 2025-01-06 13:20:10 +08:00
  • bc475441a2 1、去除工单开始按钮的二次确认；2、优化托盘入库后夹具物料查询中的状态还是未入库的问题 yuxianghui 2025-01-06 13:11:22 +08:00
  • a7c3a604a6 Merge remote-tracking branch 'origin/release/release_2.7' into release/release_2.7 liaodanlong 2025-01-06 13:03:30 +08:00
  • 0bd65b5da8 状态计算 liaodanlong 2025-01-06 13:03:15 +08:00
  • 79d561ba68 状态计算 liaodanlong 2025-01-06 13:01:58 +08:00
  • 63d9b4bf39 Merge branch 'refs/heads/develop' into release/release_2.7 guanhuan 2025-01-06 12:51:14 +08:00
  • 2619953be1 Accept Merge Request #1710: (feature/消息提醒优化 -> develop) 管欢 2025-01-06 12:49:14 +08:00
  • 9f1514bd14 修复销售单号和追溯参考为空问题 feature/消息提醒优化 guanhuan 2025-01-06 11:44:33 +08:00
  • 6e46d1d8dc Merge branch 'refs/heads/release/release_2.7' into feature/part_number liaodanlong 2025-01-06 11:20:44 +08:00
  • 403e64a957 表面工艺外协关联采购单查询条件修改 liaodanlong 2025-01-06 11:09:22 +08:00
  • aaded331cd 解除装夹方法增加前置判断 mgw 2025-01-06 10:11:44 +08:00
  • 5d2ddfb510 Merge branch 'refs/heads/develop' into feature/part_number liaodanlong 2025-01-06 08:46:19 +08:00
  • f68453a0c6 Merge branch 'release/release_2.7' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_2.7 mgw 2025-01-03 15:26:20 +08:00
  • 5cff411aaf r环境审批问题 mgw 2025-01-03 15:25:47 +08:00
  • ef5a3decd4 Merge remote-tracking branch 'origin/release/release_2.7' into release/release_2.7 guanhuan 2025-01-03 15:17:26 +08:00
  • ce1860b283 Merge branch 'refs/heads/develop' into release/release_2.7 guanhuan 2025-01-03 15:16:57 +08:00
  • b3f56754cd 修改翻译 mgw 2025-01-03 15:09:03 +08:00
  • 202db10cea Accept Merge Request #1709: (feature/消息提醒优化 -> develop) 管欢 2025-01-03 15:06:29 +08:00
  • 6b61df9d50 工序外协发料通知跳转 guanhuan 2025-01-03 15:04:22 +08:00