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

Commit Graph

  • 153f599fe8 Accept Merge Request #1513: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-15 09:13:16 +08:00
  • f6f9d14f0a 给坯料模板增加按订单补给 胡尧 2024-11-15 09:12:34 +08:00
  • 018d51e25f 批量处理工艺调整 jinling.yang 2024-11-14 18:02:24 +08:00
  • ac03192119 Accept Merge Request #1512: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-14 16:59:40 +08:00
  • b8d5d655ea 增加依赖 胡尧 2024-11-14 16:59:18 +08:00
  • 00f986cdb5 Accept Merge Request #1511: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-14 16:53:19 +08:00
  • 5dc5c814c8 增加加工类型 胡尧 2024-11-14 16:52:58 +08:00
  • c64ede58fd Accept Merge Request #1510: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-14 16:36:46 +08:00
  • 6e17bb933f 增加是否线下加工日志 胡尧 2024-11-14 16:36:02 +08:00
  • 99aa161834 Accept Merge Request #1509: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-14 15:36:24 +08:00
  • ed641c85b3 修改注释 胡尧 2024-11-14 15:36:01 +08:00
  • cf7756f51e Accept Merge Request #1508: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-14 15:15:22 +08:00
  • a75269b3a3 增加制造类型 胡尧 2024-11-14 15:14:57 +08:00
  • 6b184d7df3 Accept Merge Request #1507: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-14 15:04:50 +08:00
  • daba7d5155 将数据初始化由产品辩题改为为模板 胡尧 2024-11-14 15:02:11 +08:00
  • 33a1837274 优化工单 jinling.yang 2024-11-13 17:59:47 +08:00
  • 6b3e3aa49c Accept Merge Request #1506: (feature/单据页面优化 -> develop) 禹翔辉 2024-11-13 17:36:06 +08:00
  • a7b5fc898e 优化自动生成批次序列号方法 yuxianghui 2024-11-13 17:34:39 +08:00
  • 9a9bfd198b 交期状态 liaodanlong 2024-11-13 14:46:58 +08:00
  • 2446065172 Accept Merge Request #1504: (feature/单据页面优化 -> develop) 禹翔辉 2024-11-13 13:41:58 +08:00
  • 7565094077 Merge branch 'feature/工单工序优化_y' into feature/单据页面优化 yuxianghui 2024-11-13 13:40:25 +08:00
  • ac2708404a 处理sf工厂单据页面优化需求 yuxianghui 2024-11-13 13:39:41 +08:00
  • 63b9f495e9 Merge branch 'develop' into feature/sale_order_route_pick 胡尧 2024-11-13 11:49:02 +08:00
  • 012bb9fd54 初始化更新模板categ_type字段 胡尧 2024-11-13 11:37:16 +08:00
  • 7bcb54861b Accept Merge Request #1503: (feature/delivery_status -> develop) 廖丹龙 2024-11-13 11:25:12 +08:00
  • 2f64a3a612 Accept Merge Request #1502: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-13 10:51:32 +08:00
  • 5365211f49 修改细节 胡尧 2024-11-13 10:50:48 +08:00
  • e38407c0a5 交期状态开发 liaodanlong 2024-11-13 10:37:19 +08:00
  • 13ef106c0e Accept Merge Request #1501: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-13 09:08:01 +08:00
  • 433f3bd2dc 修改工艺工程师菜单权限 胡尧 2024-11-13 09:07:14 +08:00
  • ff072a32bb 添加退回调整 jinling.yang 2024-11-12 17:53:17 +08:00
  • de7098a7d4 Accept Merge Request #1500: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-12 15:21:06 +08:00
  • 205bfd0538 修改人工线下加工工序domain 胡尧 2024-11-12 15:19:57 +08:00
  • 37538141bf 修改材料型号获取方式名称 胡尧 2024-11-12 14:57:59 +08:00
  • 975ced08cb 增加成品工序模板（人工线下加工） 胡尧 2024-11-12 14:00:27 +08:00
  • d646019c93 修复表面工艺 jinling.yang 2024-11-12 13:56:40 +08:00
  • efa1e2b60f 表面工艺生成采购单 jinling.yang 2024-11-12 11:51:18 +08:00
  • 8bbc65ef88 新增退回调整 jinling.yang 2024-11-12 11:43:40 +08:00
  • e1121cc3b5 增加快速订单逻辑，修改报价筛选逻辑 胡尧 2024-11-12 11:16:42 +08:00
  • 026bf17a68 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整 jinling.yang 2024-11-12 09:12:37 +08:00
  • fdcd825142 Accept Merge Request #1499: (feature/修复工艺设计 -> develop) 马广威 2024-11-12 09:02:39 +08:00
  • 317f44d6c2 修复工艺设计 jinling.yang 2024-11-12 09:00:45 +08:00
  • 7d5c7bceb1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-12 08:59:47 +08:00
  • 359fd40ed3 添加工艺退回调整 jinling.yang 2024-11-11 17:55:05 +08:00
  • 13a930b59c Accept Merge Request #1497: (feature/工单工序优化_y -> develop) 禹翔辉 2024-11-11 16:53:50 +08:00
  • 359a246793 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-11 16:42:30 +08:00
  • 2b658d7be0 Accept Merge Request #1498: (feature/sale_order_route_pick -> develop) 胡尧 2024-11-11 16:40:49 +08:00
  • cd9f485fc0 增加零件名称 胡尧 2024-11-11 16:38:28 +08:00
  • dda627f20a 工单工序排序方法重构 yuxianghui 2024-11-11 16:38:06 +08:00
  • e8858559f6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-11 16:35:41 +08:00
  • d68a9249c6 解决冲突 胡尧 2024-11-11 16:32:54 +08:00
  • eebb143778 多供货方式选择 胡尧 2024-11-11 16:26:45 +08:00
  • a12eb12678 Accept Merge Request #1495: (feature/修复表面工艺工单完成入库操作 -> develop) 杨金灵 2024-11-11 15:41:36 +08:00
  • f5f67c52af Accept Merge Request #1496: (feature/sf视图展示界面优化 -> develop) 禹翔辉 2024-11-11 14:58:07 +08:00
  • 3df2306e1b Merge branch 'feature/客供料入库单优化_1' into feature/sf视图展示界面优化 yuxianghui 2024-11-11 14:55:23 +08:00
  • 5dae0ea973 1、sf视图展示界面优化 yuxianghui 2024-11-11 14:52:44 +08:00
  • e7b18233f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 jinling.yang 2024-11-11 14:51:11 +08:00
  • e55e42fe6b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-11 14:50:52 +08:00
  • 741f2ad8b2 还原代码 jinling.yang 2024-11-11 14:50:38 +08:00
  • 1b87a81a5a 多供货方式选择 胡尧 2024-11-11 11:06:56 +08:00
  • 7042eb0d7b Accept Merge Request #1494: (feature/10月迭代优化 -> develop) 管欢 2024-11-11 10:32:21 +08:00
  • 28788e2a81 Merge branch 'develop' into feature/sale_order_route_pick 胡尧 2024-11-11 10:24:14 +08:00
  • 0f37b45b30 开发 胡尧 2024-11-11 10:22:53 +08:00
  • 38c4aba45c 根据工序生成工单 jinling.yang 2024-11-08 18:01:23 +08:00
  • 3b686a8272 新增零件名称 feature/10月迭代优化 guanhuan 2024-11-08 16:56:00 +08:00
  • 2798ce6183 开发 胡尧 2024-11-08 16:23:34 +08:00
  • e981d68805 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 jinling.yang 2024-11-08 09:27:45 +08:00
  • cd3ab04728 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-08 09:26:14 +08:00
  • d419efa3c3 优化工艺确认 jinling.yang 2024-11-07 17:59:28 +08:00
  • 8b4eb325ef Accept Merge Request #1493: (feature/制造功能优化 -> develop) 马广威 2024-11-07 16:40:11 +08:00
  • 330726007d 1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段; yuxianghui 2024-11-07 16:26:48 +08:00
  • 4d7b1f557b 询价单区分类型 mgw 2024-11-07 14:26:33 +08:00
  • 1699f61d3f Accept Merge Request #1492: (feature/客供料入库单优化_1 -> develop) 禹翔辉 2024-11-07 11:24:19 +08:00
  • a0eec00749 暂时删除权限 yuxianghui 2024-11-07 11:22:31 +08:00
  • f5365b4a3a Accept Merge Request #1491: (feature/客供料入库单优化_1 -> develop) 禹翔辉 2024-11-07 10:45:30 +08:00
  • 8b9aa1c454 Merge branch 'feature/客供料入库单优化' into feature/客供料入库单优化_1 yuxianghui 2024-11-07 10:43:58 +08:00
  • 9a4d7e87ec 1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法； yuxianghui 2024-11-07 10:43:08 +08:00
  • 6679c200e1 开发 胡尧 2024-11-07 08:41:25 +08:00
  • 01df55ef35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 jinling.yang 2024-11-06 17:54:29 +08:00
  • d2b028ed4e Merge branch 'develop' into feature/sale_order_route_pick 胡尧 2024-11-06 17:53:52 +08:00
  • de1b97bfb7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-11-06 17:53:44 +08:00
  • 111c0f6dae 开发 胡尧 2024-11-06 17:53:33 +08:00
  • 11da893b17 Merge branch 'feature/添加工艺工程师权限组' into develop jinling.yang 2024-11-06 17:50:57 +08:00
  • b434329fc4 Accept Merge Request #1490: (feature/添加工艺工程师权限组 -> develop) 杨金灵 2024-11-06 17:50:43 +08:00
  • 72998f04c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/添加工艺工程师权限组 jinling.yang 2024-11-06 17:49:01 +08:00
  • 23db164452 制造模块添加工艺工程师权限组 jinling.yang 2024-11-06 17:48:27 +08:00
  • 1f11d188c1 添加工艺工程师权限组 jinling.yang 2024-11-06 17:46:14 +08:00
  • fa30e0c1da 添加工艺设计 jinling.yang 2024-11-06 17:44:13 +08:00
  • 5106768330 Accept Merge Request #1489: (feature/客供料入库单优化 -> develop) 禹翔辉 2024-11-06 17:27:52 +08:00
  • 6c0d9486fc Merge branch 'feature/报价单优化' into feature/客供料入库单优化 yuxianghui 2024-11-06 17:24:57 +08:00
  • 211d74d9ff 处理 客供料入库单优化 需求 yuxianghui 2024-11-06 17:24:10 +08:00
  • 84db3a92be 表面工艺外协采购单添加“采购类型",默认consignment（委外加工） jinling.yang 2024-11-06 10:46:21 +08:00
  • 487a2936c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 jinling.yang 2024-11-06 10:41:27 +08:00
  • aa9bdfe372 添加工艺设计 jinling.yang 2024-11-06 10:40:11 +08:00
  • 6134ac3b4c Accept Merge Request #1488: (feature/制造功能优化 -> develop) 马广威 2024-11-06 09:24:43 +08:00
  • 85c24e3d94 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 mgw 2024-11-06 09:23:42 +08:00
  • 106945fba7 添加采购类型字段 mgw 2024-11-06 09:23:14 +08:00
  • 8ea72198ea 1、完成报价单优化需求；2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘ yuxianghui 2024-11-05 17:52:18 +08:00
  • 77c303e1fe Merge remote-tracking branch 'origin/develop' into develop feature/销售和排程添加消息推送 liaodanlong 2024-11-05 10:59:36 +08:00
  • ba9ce1f0ee 刀具标准库图片相关的参数更新 liaodanlong 2024-11-05 10:58:46 +08:00