jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,795 Commits 134 Branches 31 Tags
37c47b0a54610ddebdba1944b9c7dd4ff10f3d6d
Commit Graph

4795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
37c47b0a54 对合并后的采购单修改匹配逻辑 2024-12-05 18:14:19 +08:00
mgw
0601e123fb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-05 17:01:36 +08:00
mgw
08e4541a96 特殊表面工艺采购单还是有合并的情况-且重复了 2024-12-05 17:01:10 +08:00
胡尧
66acc19e89 Accept Merge Request #1605: (feature/sale_order_route_pick -> develop) 
Merge Request: 工艺设计新增工序只选择了参数时确认增加提示

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1605?initial=true
 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) 
Merge Request: 处理供应商相同的特殊表面工艺不能删除的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1604?initial=true
 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) 
Merge Request: 解决删除表面工艺，多增加了采购单的bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1603
 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) 
Merge Request: 特殊表面工艺工单没有完成对应采购单时工单处于等待组件

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1602?initial=true
 2024-12-05 13:42:33 +08:00
胡尧
dbf75684ee 特殊表面工艺工单没有完成对应采购单时工单处于等待组件 2024-12-05 13:42:07 +08:00
马广威
cb2319492b Accept Merge Request #1601: (feature/制造功能优化 -> develop) 
Merge Request: 制造订单退回调整-删除表面工艺后对应的外协出入库单没有变成取消状态

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1601
 2024-12-05 11:49:03 +08:00
mgw
731e6abc90 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-12-05 11:48:07 +08:00
mgw
58b33b6c8d 制造订单退回调整-删除表面工艺后对应的外协出入库单没有变成取消状态 2024-12-05 11:05:43 +08:00
胡尧
43c8bbda71 Accept Merge Request #1600: (feature/sale_order_route_pick -> develop) 
Merge Request: 解决表面工艺工单完成后，生产入库单未就绪的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1600?initial=true
 2024-12-05 09:32:00 +08:00
胡尧
e011e4cfd6 解决表面工艺工单完成后，生产入库单未就绪的问题 2024-12-05 09:31:06 +08:00
胡尧
c8fd2d69bd Accept Merge Request #1599: (feature/sale_order_route_pick -> develop) 
Merge Request: 修改工艺外协工单

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1599?initial=true
 2024-12-05 08:37:05 +08:00
胡尧
ef1f7b1d08 解决冲突 2024-12-05 08:36:48 +08:00
胡尧
5f12976d8f 修改表面工艺外协工单流程 2024-12-05 01:33:46 +08:00
胡尧
ef60f36c90 修改工艺外协工单 2024-12-04 20:42:34 +08:00
廖丹龙
c8ed45b1a7 Accept Merge Request #1598: (feature/manufactur_order -> develop) 
Merge Request: 坯料长宽高修改

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1598?initial=true
 2024-12-04 16:43:58 +08:00
liaodanlong
57fe68bae8 Merge remote-tracking branch 'origin/feature/manufactur_order' into feature/manufactur_order 2024-12-04 16:42:13 +08:00
liaodanlong
aa32fdcd07 坯料长宽高修改 2024-12-04 16:41:42 +08:00
管欢
d0d59135e3 Accept Merge Request #1597: (feature/manufactur_order -> develop) 
Merge Request: 多个制造订单菜单修复

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1597
 2024-12-04 16:39:44 +08:00
guanhuan
27ec5b1b74 多个制造订单菜单修复 2024-12-04 16:13:55 +08:00
禹翔辉
2c1caabce6 Accept Merge Request #1596: (feature/界面优化 -> develop) 
Merge Request: 界面优化

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1596
 2024-12-04 15:41:11 +08:00
yuxianghui
8f3cd9ff36 Merge branch 'feature/隐藏返工入口' into feature/界面优化 2024-12-04 15:39:05 +08:00
yuxianghui
6366904c91 添加客供料入库单的合并选项 2024-12-04 15:37:58 +08:00
马广威
7f3e6de127 Accept Merge Request #1595: (feature/制造功能优化 -> develop) 
Merge Request: 处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了”

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1595?initial=true
 2024-12-04 12:24:18 +08:00
yuxianghui
5b43cceb94 计划模块的【制造订单生产计划】页面菜单名称改为【CNC产线计划排程】 2024-12-04 11:56:38 +08:00
mgw
d933416b2d 处理“制造订单退回调整删除特殊表面工艺后对应坯料的采购单也变成取消状态了” 2024-12-04 11:52:52 +08:00
yuxianghui
e260ef01f0 隐藏销售模块的 快速订单 菜单 2024-12-04 11:43:02 +08:00
廖丹龙
0fef3d7a63 Accept Merge Request #1594: (feature/manufactur_order -> develop) 
Merge Request: 表面工艺采购单与调拨单拆分

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1594?initial=true
 2024-12-04 10:49:12 +08:00
liaodanlong
dc5c0b1d1e Merge branch 'refs/heads/develop' into feature/manufactur_order 2024-12-04 10:46:38 +08:00
liaodanlong
9a1cde6abc 表面工艺采购单与调拨单拆分 2024-12-04 10:45:46 +08:00
胡尧
29864b8bb2 Accept Merge Request #1591: (feature/manufactur_order -> develop) 
Merge Request: 修复表面工艺询价单查询

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1591
 2024-12-04 10:23:35 +08:00
胡尧
aa5294f110 Accept Merge Request #1593: (feature/sale_order_route_pick -> develop) 
Merge Request: 处理报错是英文的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1593?initial=true
 2024-12-04 10:23:19 +08:00
胡尧
4387d343b5 处理报错是英文的问题 2024-12-04 10:22:50 +08:00
胡尧
ff979aa34b Accept Merge Request #1592: (feature/sale_order_route_pick -> develop) 
Merge Request: 解决外协调拨单不能完成的bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1592?initial=true
 2024-12-04 10:17:34 +08:00
胡尧
21af368068 解决外协调拨单不能完成的bug 2024-12-04 10:16:30 +08:00
guanhuan
d6afd556d3 询价单查询 2024-12-03 15:59:10 +08:00
胡尧
778d2c4ec5 Accept Merge Request #1590: (feature/sale_order_route_pick -> develop) 
Merge Request: 去掉多余的视图

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1590?initial=true
 2024-12-03 10:04:29 +08:00
禹翔辉
fff29b36ee Accept Merge Request #1587: (feature/隐藏返工入口 -> develop) 
Merge Request: 隐藏手动返工报废入口

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1587
 2024-12-03 10:04:23 +08:00
胡尧
fedb79a142 去掉多余的视图 2024-12-03 10:03:05 +08:00
胡尧
d06816052f Accept Merge Request #1589: (feature/sale_order_route_pick -> develop) 
Merge Request: 修改文件位置

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1589?initial=true
 2024-12-02 19:48:02 +08:00
胡尧
5739e167f4 修改文件位置 2024-12-02 19:46:45 +08:00
胡尧
a249548a20 Accept Merge Request #1588: (feature/sale_order_route_pick -> develop) 
Merge Request: 修改文件位置

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1588?initial=true
 2024-12-02 16:37:26 +08:00
胡尧
7b6538d01e 修改文件位置 2024-12-02 16:29:33 +08:00
yuxianghui
7025bde56e 隐藏手动返工报废入口 2024-12-02 13:46:20 +08:00
胡尧
3585af0cea Accept Merge Request #1586: (feature/sale_order_route_pick -> develop) 
Merge Request: 调整文件结构

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1586?initial=true
 2024-12-02 11:03:46 +08:00