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

Commit Graph

  • 9d85f56af3 Accept Merge Request #1631: (feature/消息提醒优化 -> develop) 管欢 2024-12-24 15:00:25 +08:00
  • 78eea6aad0 消息提醒 guanhuan 2024-12-24 14:49:17 +08:00
  • cbfa9d517a 调试 liaodanlong 2024-12-24 14:13:47 +08:00
  • fd9e028c5a Merge branch 'refs/heads/develop' into feature/customer_material_optimization liaodanlong 2024-12-24 09:11:48 +08:00
  • 5306e45f83 Accept Merge Request #1630: (feature/part_number -> develop) 廖丹龙 2024-12-24 09:08:58 +08:00
  • 4bd40aeeb0 工艺确认报错问题解决 liaodanlong 2024-12-24 09:07:11 +08:00
  • f6d69ea193 Accept Merge Request #1629: (feature/采购、外协优化 -> develop) 禹翔辉 2024-12-23 17:15:43 +08:00
  • fe5990ff9a Merge branch 'feature/制造、采购、工单优化' into feature/采购、外协优化 yuxianghui 2024-12-23 17:14:00 +08:00
  • 6db5e72752 1、采购单的采购类型优化，外协优化 yuxianghui 2024-12-23 17:13:12 +08:00
  • 62fcc93a21 Accept Merge Request #1628: (feature/part_number -> develop) 廖丹龙 2024-12-23 15:44:40 +08:00
  • d6c8120b7c 工艺确认创建工单通过工艺设计排序再进行数据生成 liaodanlong 2024-12-23 15:42:07 +08:00
  • 20994e6656 Accept Merge Request #1627: (feature/消息提醒优化 -> develop) 管欢 2024-12-23 14:27:24 +08:00
  • 7a64851761 Accept Merge Request #1626: (feature/制造、采购、工单优化 -> develop) 禹翔辉 2024-12-23 14:22:58 +08:00
  • 88f3155132 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/消息提醒优化 guanhuan 2024-12-23 14:06:11 +08:00
  • 8bd2250d45 Merge branch 'feature/工单rfid优化' into feature/制造、采购、工单优化 yuxianghui 2024-12-23 13:47:22 +08:00
  • 0e7e7af85a 1、优化销售订单状态；2、优化夹具物料查询的托盘可用状态；3、优化工单开始按键；4、优化采购订单的采购类型，根据销售订单的供货方式和工艺确认时是否外协自动选择对应采购类型； yuxianghui 2024-12-23 13:46:30 +08:00
  • 0bff8669ee Merge branch 'refs/heads/develop' into feature/customer_material_optimization liaodanlong 2024-12-23 13:24:14 +08:00
  • 098e8c2518 工单工序优化 yuxianghui 2024-12-20 17:22:56 +08:00
  • 5a06811732 发送消息 guanhuan 2024-12-20 16:12:30 +08:00
  • c4b02f7717 发送消息 guanhuan 2024-12-20 15:31:55 +08:00
  • a2f29766e6 Accept Merge Request #1625: (feature/part_number -> develop) 廖丹龙 2024-12-20 15:25:27 +08:00
  • 091b9940ef 零件图号零件名称 liaodanlong 2024-12-20 14:59:26 +08:00
  • c0db279414 Merge branch 'refs/heads/develop' into feature/part_number liaodanlong 2024-12-20 14:56:46 +08:00
  • 41096c9c65 零件图号零件名称 liaodanlong 2024-12-20 14:55:04 +08:00
  • bf227e3e92 交期状态 guanhuan 2024-12-20 14:33:23 +08:00
  • fa9ed5885b Accept Merge Request #1624: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-20 14:16:59 +08:00
  • c8df5ed179 修复 工艺外协工序采购单已创建账单并且过账，退回调整删除后报错的问题 胡尧 2024-12-20 14:16:25 +08:00
  • 9d883d112c 消息提醒 guanhuan 2024-12-20 13:51:11 +08:00
  • 142b94139c Accept Merge Request #1623: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-20 13:02:37 +08:00
  • 2a20d54530 选择工序时，排除已经选择的工序 胡尧 2024-12-20 13:02:10 +08:00
  • f2e8d0175b 选择工序时，排除已经选择的工序 胡尧 2024-12-20 12:51:42 +08:00
  • 690e8ca1b2 Accept Merge Request #1622: (feature/工单rfid优化 -> develop) 禹翔辉 2024-12-20 11:09:07 +08:00
  • 18073cb726 Merge branch 'feature/制造、工单优化' into feature/工单rfid优化 yuxianghui 2024-12-20 11:07:48 +08:00
  • bdac1e7460 1、处理工单返工时就解除rfid绑定问题；2、同步bfm的订单状态到销售订单 yuxianghui 2024-12-20 11:06:41 +08:00
  • 8cfccfb2e0 Accept Merge Request #1621: (feature/delivery_status -> develop) 廖丹龙 2024-12-20 10:36:46 +08:00
  • 791d6b7fb1 客供料优化 liaodanlong 2024-12-20 09:16:19 +08:00
  • 283950db39 Accept Merge Request #1620: (feature/制造、工单优化 -> develop) 禹翔辉 2024-12-19 17:22:40 +08:00
  • 9cb1cff671 Merge branch 'feature/销售、制造、返工优化' into feature/制造、工单优化 yuxianghui 2024-12-19 17:21:04 +08:00
  • 03dbeaf988 1、隐藏返工状态工单的开始按钮；2、优化工单状态方法；3、优化制造订单状态 yuxianghui 2024-12-19 17:14:48 +08:00
  • bef8ba46cd Accept Merge Request #1619: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-19 17:02:34 +08:00
  • 23afbc14c9 增加agv配送重新下发与取消 胡尧 2024-12-19 17:00:40 +08:00
  • 72bf8ad011 消息提醒 guanhuan 2024-12-19 14:36:16 +08:00
  • 93b87ec8ff Accept Merge Request #1618: (feature/销售、制造、返工优化 -> develop) 禹翔辉 2024-12-19 13:47:26 +08:00
  • d4fb6ef049 Merge branch 'feature/返工、工序优化' into feature/销售、制造、返工优化 yuxianghui 2024-12-19 13:46:01 +08:00
  • 97facdaf9c 1、销售订单状态添加【加工中】、【物流中】、【已交付】三种状态；2、优化 获取mrs下发的编程单 接口，添加对返工重新编程的处理 yuxianghui 2024-12-19 13:45:10 +08:00
  • 5eda4427df 消息提醒 guanhuan 2024-12-19 13:09:20 +08:00
  • 6b2b792df8 Accept Merge Request #1617: (feature/制造功能优化 -> develop) 马广威 2024-12-18 16:58:50 +08:00
  • aad68b23ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-18 16:56:53 +08:00
  • ff91aa1ad6 sf-创建员工时提示员工已存在 mgw 2024-12-18 16:56:26 +08:00
  • 15eb36a5bc 1、优化销售订单列表页、详情页字段显示；2、优化新增采购订单列表页、详情页字段显示； yuxianghui 2024-12-18 16:39:54 +08:00
  • 79d188fb5c 消息提醒 guanhuan 2024-12-18 16:26:28 +08:00
  • 42444e6c83 消息提醒 guanhuan 2024-12-17 17:21:36 +08:00
  • d7a25580d1 消息提醒 guanhuan 2024-12-17 14:42:15 +08:00
  • 1da3989fa3 消息提醒 guanhuan 2024-12-17 11:34:24 +08:00
  • 202fafac84 采购模块界面优化、采购类型新增【工序外协】、【外购订单】选项 yuxianghui 2024-12-16 17:22:39 +08:00
  • 2b9a44761f 1、采购单详情页添加销售订单号关联字段，关联跳转至对应销售订单；2、采购页面优化 yuxianghui 2024-12-13 17:03:45 +08:00
  • d24b0e8af8 Accept Merge Request #1616: (feature/逾期工单批量重新安排 -> develop) 管欢 2024-12-13 16:29:45 +08:00
  • b551777d49 逾期工单不能批量重新安排的优化需求 feature/逾期工单批量重新安排 guanhuan 2024-12-13 16:24:25 +08:00
  • 3253b26818 1、报价、销售订单列表视图添加平台订单号字段。2、销售订单详情的采购链接按采购类型拆分为委外加工和采购的跳转链接； yuxianghui 2024-12-13 13:38:22 +08:00
  • 9f67dbe9aa 工序外协工单没有自动触发工单开始、结束的优化需求处理 feature/delivery_status liaodanlong 2024-12-12 16:06:55 +08:00
  • 01fa7bbe87 批量重新安排 guanhuan 2024-12-12 14:39:10 +08:00
  • e8644962c5 Accept Merge Request #1614: (feature/delivery_status -> develop) 廖丹龙 2024-12-12 09:32:37 +08:00
  • c793089131 工艺确认弹框优化 guanhuan 2024-12-12 09:29:48 +08:00
  • 8fe7a47367 Accept Merge Request #1615: (feature/返工、工序优化 -> develop) 禹翔辉 2024-12-11 17:27:19 +08:00
  • b7e35ce5e5 Merge branch 'feature/制造、销售、采购优化' into feature/返工、工序优化 yuxianghui 2024-12-11 17:25:24 +08:00
  • 7c17241882 1、制造订单点击返工按钮添加新的过滤条件；2、优化工单工序逻辑；3、返工添加校验限制条件； yuxianghui 2024-12-11 17:24:32 +08:00
  • ab32f881c2 制造订单退回调整删除表面工艺再次确认后-没被删除的表面工艺的外协出入库单变成了草稿状态问题处理 liaodanlong 2024-12-11 17:09:51 +08:00
  • b06becead4 Accept Merge Request #1613: (feature/delivery_status -> develop) 廖丹龙 2024-12-11 11:23:34 +08:00
  • f32ca13dff 修改日志的使用库 liaodanlong 2024-12-11 11:05:25 +08:00
  • 83028b3b3d Accept Merge Request #1612: (feature/制造、销售、采购优化 -> develop) 禹翔辉 2024-12-11 10:36:24 +08:00
  • ad74fd989b Merge branch 'feature/返工入口' into feature/制造、销售、采购优化 yuxianghui 2024-12-11 10:34:09 +08:00
  • 179ce86bef 1、去除工单页面的时效状态自动筛选项；2、坯料制造订单添加批量确认加工工艺功能；3、处理返工新生成的工单工序错误问题；4、采购、销售页面优化 yuxianghui 2024-12-11 10:33:10 +08:00
  • 1b321b424e Accept Merge Request #1611: (feature/delivery_status -> develop) 廖丹龙 2024-12-11 10:16:19 +08:00
  • d1ba2cc3d4 Merge branch 'refs/heads/develop' into feature/delivery_status liaodanlong 2024-12-11 10:07:34 +08:00
  • 4738b03a45 销售订单与制造订单关联 liaodanlong 2024-12-11 10:03:20 +08:00
  • 83e57b63ec 报废新生成的制造订单没关联新采购单 guanhuan 2024-12-10 17:18:33 +08:00
  • e14e750bd9 Accept Merge Request #1610: (feature/返工入口 -> develop) 禹翔辉 2024-12-09 16:08:52 +08:00
  • 1c4a6ca85e 开放返工入口 yuxianghui 2024-12-09 16:07:34 +08:00
  • c922ae1571 Accept Merge Request #1609: (feature/manufactur_order -> develop) 管欢 2024-12-09 09:48:12 +08:00
  • ed6189a963 Merge remote-tracking branch 'origin/feature/manufactur_order' into feature/manufactur_order feature/manufactur_order guanhuan 2024-12-09 09:36:08 +08:00
  • a6979b213b 手动创建的采购单生成的内部调拨单没有源单据 guanhuan 2024-12-09 09:35:41 +08:00
  • fc378df597 Merge branch 'release/release_2.6' master_sf_20241208_2.7 胡尧 2024-12-08 19:56:05 +08:00
  • f873ebe079 Accept Merge Request #1608: (release/release_2.6 -> develop) 马广威 2024-12-05 18:26:29 +08:00
  • ab692dfb25 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 release/release_2.6 mgw 2024-12-05 18:25:08 +08:00
  • e50b601ccf Accept Merge Request #1607: (feature/制造功能优化 -> develop) 马广威 2024-12-05 18:15:09 +08:00
  • 37c47b0a54 对合并后的采购单修改匹配逻辑 mgw 2024-12-05 18:14:19 +08:00
  • 6f9cea2759 Accept Merge Request #1606: (feature/制造功能优化 -> develop) 马广威 2024-12-05 17:03:08 +08:00
  • 0601e123fb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-05 17:01:36 +08:00
  • 08e4541a96 特殊表面工艺采购单还是有合并的情况-且重复了 mgw 2024-12-05 17:01:10 +08:00
  • 66acc19e89 Accept Merge Request #1605: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-05 16:56:20 +08:00
  • 5b94a0624c 工艺设计新增工序只选择了参数时确认增加提示 胡尧 2024-12-05 16:55:51 +08:00
  • 1b5b2fd6f9 Accept Merge Request #1604: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-05 16:36:55 +08:00
  • 54c502dd64 处理供应商相同的特殊表面工艺不能删除的问题 胡尧 2024-12-05 16:36:33 +08:00
  • e3db40ae25 Accept Merge Request #1603: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-05 15:09:49 +08:00
  • 52ab962ace 解决删除表面工艺，多增加了采购单的bug 胡尧 2024-12-05 15:09:04 +08:00
  • 05247ee8d9 Accept Merge Request #1602: (feature/sale_order_route_pick -> develop) 胡尧 2024-12-05 13:42:33 +08:00
  • dbf75684ee 特殊表面工艺工单没有完成对应采购单时工单处于等待组件 胡尧 2024-12-05 13:42:07 +08:00
  • cb2319492b Accept Merge Request #1601: (feature/制造功能优化 -> develop) 马广威 2024-12-05 11:49:03 +08:00
  • 731e6abc90 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-12-05 11:48:07 +08:00
  • 58b33b6c8d 制造订单退回调整-删除表面工艺后对应的外协出入库单没有变成取消状态 mgw 2024-12-05 11:05:43 +08:00