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

Commit Graph

  • 5450c9996f Merge branch 'feature/返工优化_1' into feature/客供料入库单优化 yuxianghui 2024-11-22 09:46:42 +08:00
  • 70f8aadd66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废 jinling.yang 2024-11-22 09:42:38 +08:00
  • 119083ac2b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-22 09:42:11 +08:00
  • dd768e938c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废 jinling.yang 2024-11-22 09:41:06 +08:00
  • 611aa0fe05 1、优化客供料入库单的追溯参考字段自动计算方法 yuxianghui 2024-11-22 09:40:33 +08:00
  • 73564d574c Accept Merge Request #1538: (feature/制造功能优化 -> develop) 马广威 2024-11-22 09:24:49 +08:00
  • ea5231adff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-22 09:23:59 +08:00
  • 2b3da48e9b 调整开料要求展示范围 mgw 2024-11-22 09:23:36 +08:00
  • 2632c4a5a0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-22 09:22:54 +08:00
  • 2420987f95 Accept Merge Request #1537: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-22 08:57:33 +08:00
  • d80f3c4d5c 修改调拨单的追溯参考 胡尧 2024-11-21 17:56:57 +08:00
  • 5cb726bb2d 注释代码 jinling.yang 2024-11-21 17:45:53 +08:00
  • f6b8fa5665 Accept Merge Request #1536: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-21 17:45:10 +08:00
  • 113d0abb4b 增加追踪参考 胡尧 2024-11-21 17:44:55 +08:00
  • 3f3c494f7f 增加追踪参考 胡尧 2024-11-21 17:43:50 +08:00
  • 3632a3f98f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-21 17:43:04 +08:00
  • 73402d1c5a Merge branch 'feature/工单添加工艺设计id字段' into develop jinling.yang 2024-11-21 17:42:22 +08:00
  • 4e41efd423 Accept Merge Request #1535: (feature/工单添加工艺设计id字段 -> develop) 杨金灵 2024-11-21 17:42:06 +08:00
  • 0b931f8255 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单添加工艺设计id字段 jinling.yang 2024-11-21 17:41:07 +08:00
  • b49135f5f9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-21 17:40:26 +08:00
  • ed6d28cc21 工单添加工艺设计id字段 jinling.yang 2024-11-21 17:40:04 +08:00
  • 9857787d5a Accept Merge Request #1534: (feature/返工优化_1 -> develop) 禹翔辉 2024-11-21 17:32:57 +08:00
  • c6e62f65b6 Merge remote-tracking branch 'origin/feature/返工优化' into feature/返工优化_1 yuxianghui 2024-11-21 17:26:49 +08:00
  • 6c0b034147 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-21 17:24:19 +08:00
  • c0d520a47f Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop jinling.yang 2024-11-21 17:23:57 +08:00
  • de11c57800 Accept Merge Request #1533: (feature/优化外协采购和出入库单（工艺退回调整） -> develop) 杨金灵 2024-11-21 17:23:18 +08:00
  • d4ff4be32e 还原注释代码 jinling.yang 2024-11-21 17:19:41 +08:00
  • 48371b01cd 还原注释代码 jinling.yang 2024-11-21 17:13:38 +08:00
  • 310d8b33df 优化制造订单报废 jinling.yang 2024-11-21 17:12:50 +08:00
  • 6d61e45028 删除无用的模块引用 yuxianghui 2024-11-21 17:08:40 +08:00
  • fff22a74b1 工单状态优化 yuxianghui 2024-11-21 17:02:32 +08:00
  • 3588288434 Accept Merge Request #1532: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-21 15:48:50 +08:00
  • 7408cc00f9 处理订单客供料的问题 胡尧 2024-11-21 15:48:17 +08:00
  • 9b3d1170b0 Accept Merge Request #1531: (feature/制造功能优化 -> develop) 马广威 2024-11-21 15:38:04 +08:00
  • a774c74e6a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-21 15:36:45 +08:00
  • 1d53f47488 线切割、人工线下加工生成工单异常处理 mgw 2024-11-21 15:36:16 +08:00
  • 60cc49238c Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整） jinling.yang 2024-11-21 11:46:54 +08:00
  • b415278997 优化坯料的制造订单 jinling.yang 2024-11-21 11:45:48 +08:00
  • ac32494944 Accept Merge Request #1530: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-21 11:34:11 +08:00
  • 8c81315c33 更新时不更新初始化数据 胡尧 2024-11-21 11:33:04 +08:00
  • 1d66c1dbea 工单状态优化 yuxianghui 2024-11-21 11:25:00 +08:00
  • 085d26669f Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整） jinling.yang 2024-11-21 10:44:51 +08:00
  • bb7b72b540 优化工序设计 jinling.yang 2024-11-21 10:44:11 +08:00
  • ded0d06f86 工单状态方法优化 yuxianghui 2024-11-21 10:43:22 +08:00
  • fe08ee4173 Accept Merge Request #1529: (feature/制造功能优化 -> develop) 马广威 2024-11-21 10:42:28 +08:00
  • 25ee849796 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-21 10:41:41 +08:00
  • bafcf35ac9 工序类型增加项目 mgw 2024-11-21 10:41:07 +08:00
  • cc1455b22c 修改制造订单中子MO子为子MO 胡尧 2024-11-21 10:21:18 +08:00
  • 1d38334c81 Accept Merge Request #1528: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-21 10:01:01 +08:00
  • 13d99b1bcc 成品的零件图号修改为零件图号 胡尧 2024-11-21 09:49:12 +08:00
  • 269be36d86 隐藏制造订单待生产按钮，人工线下加工状态下的功能刀具 胡尧 2024-11-21 09:48:26 +08:00
  • ebd76afb29 Accept Merge Request #1527: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-21 09:28:04 +08:00
  • a1807e05db 修复不同产品调拨单合并的bug 胡尧 2024-11-21 09:26:23 +08:00
  • 11866629c5 修复工艺设计 jinling.yang 2024-11-20 17:56:29 +08:00
  • f8f5286568 返工流程优化 yuxianghui 2024-11-20 17:34:46 +08:00
  • 36908f13d3 Accept Merge Request #1525: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-20 16:53:50 +08:00
  • a7ed317b09 修改订单客供料显示，修改内部调拨、生产发料合并单据 胡尧 2024-11-20 16:53:15 +08:00
  • fe4346b802 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整） jinling.yang 2024-11-20 16:08:54 +08:00
  • 23da273af1 修复bug和优化制造订单报废 jinling.yang 2024-11-20 16:08:27 +08:00
  • 68fdea4520 Accept Merge Request #1523: (feature/delivery_status -> develop) 廖丹龙 2024-11-20 15:32:01 +08:00
  • c5ac62060d Merge branch 'refs/heads/develop' into feature/delivery_status liaodanlong 2024-11-20 15:23:07 +08:00
  • 350cf0a74b Accept Merge Request #1524: (feature/制造功能优化 -> develop) 马广威 2024-11-20 15:19:08 +08:00
  • e204d693cf 调整采购单查找逻辑 mgw 2024-11-20 15:18:08 +08:00
  • a6422330b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-20 12:01:38 +08:00
  • 230e87a9f1 增加日志输出 mgw 2024-11-20 10:29:32 +08:00
  • e634e9726f 优化工艺设计显示 jinling.yang 2024-11-19 17:56:21 +08:00
  • e8d07abe05 人工线下加工工单的计划时间计算优化需求 liaodanlong 2024-11-19 14:18:44 +08:00
  • 808bbd7b22 Accept Merge Request #1522: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-19 14:18:08 +08:00
  • fabcca1188 排程单过滤掉关联制造订单处于草稿跟工艺设计状态 胡尧 2024-11-19 14:15:29 +08:00
  • 97c8b1dcc1 Accept Merge Request #1521: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-19 11:57:29 +08:00
  • f99a35932f 修改坯料冗余 胡尧 2024-11-19 11:56:49 +08:00
  • ce7dfdbd36 Accept Merge Request #1520: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-19 09:00:38 +08:00
  • d53f3837c3 增加坯料冗余量 胡尧 2024-11-19 08:59:52 +08:00
  • 1cb646ec48 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整） jinling.yang 2024-11-18 17:41:10 +08:00
  • c73706555f 优化外协采购和出入库单（工艺退回调整） jinling.yang 2024-11-18 17:40:41 +08:00
  • 21f961d893 Accept Merge Request #1519: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-18 15:00:56 +08:00
  • 08a682143f 增加坯料冗余量 胡尧 2024-11-18 15:00:05 +08:00
  • ebdeb95b0e Accept Merge Request #1518: (feature/新增工艺退回调整 -> develop) 杨金灵 2024-11-18 11:45:12 +08:00
  • 0f26cac68d Merge branch refs/heads/develop into refs/heads/feature/新增工艺退回调整 杨金灵 2024-11-18 11:43:12 +08:00
  • 45c96276ff 还原代码 jinling.yang 2024-11-18 11:42:35 +08:00
  • a2855f1f08 还原代码 jinling.yang 2024-11-18 11:40:24 +08:00
  • e8c006d495 还原代码 jinling.yang 2024-11-18 11:25:19 +08:00
  • 9671efeced 外协出入库修复 jinling.yang 2024-11-18 11:24:32 +08:00
  • 1e3fd6bc09 Accept Merge Request #1517: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-18 10:55:08 +08:00
  • 73aa4af118 增加依赖 胡尧 2024-11-18 10:54:48 +08:00
  • 38a8a298b5 Accept Merge Request #1516: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-18 09:45:48 +08:00
  • bc0b8bdecb 增加坯料冗余量，调整坯料客供料的名称 胡尧 2024-11-18 09:44:50 +08:00
  • a8e9fe40ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整 jinling.yang 2024-11-15 18:08:31 +08:00
  • 5c5606749a 优化制造订单 jinling.yang 2024-11-15 18:06:32 +08:00
  • 8add4b5ad1 优化制造订单 jinling.yang 2024-11-15 17:31:28 +08:00
  • f579c8928c Accept Merge Request #1515: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-15 15:31:22 +08:00
  • 9410ca82db 解决冲突 胡尧 2024-11-15 15:30:35 +08:00
  • 73c986cd50 增加制造类型字段，增加依赖 胡尧 2024-11-15 15:29:04 +08:00
  • f8a9a38778 Accept Merge Request #1514: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-15 15:03:31 +08:00
  • 9d723c5e00 修改人工线下加工状态的继承位置 胡尧 2024-11-15 15:03:06 +08:00
  • 722a044707 移动deadline_of_delivery 方法位置 liaodanlong 2024-11-15 11:37:14 +08:00
  • 967effe8f1 Accept Merge Request #1505: (feature/delivery_status -> develop) 廖丹龙 2024-11-15 10:44:10 +08:00
  • 5f5877699c 交期状态修改 liaodanlong 2024-11-15 10:39:45 +08:00
  • 4787cb451d Merge branch 'refs/heads/develop' into feature/delivery_status liaodanlong 2024-11-15 10:37:13 +08:00
  • 811a79c7c1 交期状态修改 liaodanlong 2024-11-15 10:33:47 +08:00