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

155 Commits

Author SHA1 Message Date
jinling.yang
8add4b5ad1 优化制造订单 2024-11-15 17:31:28 +08:00
jinling.yang
018d51e25f 批量处理工艺调整 2024-11-14 18:02:24 +08:00
jinling.yang
33a1837274 优化工单 2024-11-13 17:59:47 +08:00
jinling.yang
ff072a32bb 添加退回调整 2024-11-12 17:53:17 +08:00
jinling.yang
d646019c93 修复表面工艺 2024-11-12 13:56:40 +08:00
jinling.yang
efa1e2b60f 表面工艺生成采购单 2024-11-12 11:51:18 +08:00
jinling.yang
8bbc65ef88 新增退回调整 2024-11-12 11:43:40 +08:00
杨金灵
a12eb12678 Accept Merge Request #1495: (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/1495
 2024-11-11 15:41:36 +08:00
jinling.yang
741f2ad8b2 还原代码 2024-11-11 14:50:38 +08:00
jinling.yang
e981d68805 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 
# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_manufacturing/security/ir.model.access.csv
 2024-11-08 09:27:45 +08:00
jinling.yang
d419efa3c3 优化工艺确认 2024-11-07 17:59:28 +08:00
yuxianghui
330726007d 1、添加只有客供料入库单才能看见收货人/联系地址/电话号码等字段; 2024-11-07 16:26:48 +08:00
yuxianghui
9a4d7e87ec 1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法； 2024-11-07 10:43:08 +08:00
jinling.yang
01df55ef35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 
# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv
 2024-11-06 17:54:29 +08:00
jinling.yang
fa30e0c1da 添加工艺设计 2024-11-06 17:44:13 +08:00
yuxianghui
211d74d9ff 处理 客供料入库单优化 需求 2024-11-06 17:24:10 +08:00
jinling.yang
aa9bdfe372 添加工艺设计 2024-11-06 10:40:11 +08:00
guanhuan
18a7dbbff9 辅助文件上传 2024-10-28 10:21:33 +08:00
guanhuan
6054ce39f3 附件文件名 2024-10-23 17:43:03 +08:00
guanhuan
cf34ac5bbc 辅助文件上传 2024-10-17 16:31:13 +08:00
guanhuan
ccbe311c58 快速订单填写的零件图号和零件图纸传给制造订单 2024-09-13 10:45:08 +08:00
guanhuan
4c58f4d7f3 快速订单填写的零件图号和零件图纸传给制造订单 2024-09-13 10:22:14 +08:00
jinling.yang
09ee1c26b1 修复报废-外协入库验证 2024-09-02 17:33:06 +08:00
jinling.yang
821a7a63be 优化工单 2024-08-28 17:30:46 +08:00
jinling.yang
35c13dc51c 修复报废-坯料序列号 2024-08-27 16:12:48 +08:00
jinling.yang
b40a87df88 修复报废 2024-08-27 11:24:04 +08:00
jinling.yang
e662490cb5 修复报废 2024-08-26 17:31:14 +08:00
jinling.yang
7fee98cdee 修复报废 2024-08-23 16:13:03 +08:00
jinling.yang
6668e0ee2f 还原OCC代码 2024-08-21 14:43:22 +08:00
jinling.yang
3c8dac799d 修复报废 2024-08-16 17:28:21 +08:00
jinling.yang
e2d7576a5e 优化报废 2024-08-15 17:31:37 +08:00
jinling.yang
a9b7f99944 修复表面工艺外协 2024-08-09 15:39:58 +08:00
jinling.yang
34e858ffe4 添加表面工艺服务产品验证 2024-08-09 11:31:30 +08:00
jinling.yang
41efe81119 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺外协 2024-08-09 10:43:34 +08:00
jinling.yang
7cab8cd287 调拨单新增表面工艺参数字段 2024-08-09 10:42:59 +08:00
jinling.yang
112efccb7c 修复表面工艺外协采购 2024-08-08 16:21:15 +08:00
jinling.yang
f58fb2ea13 Merge branch 'feature/优化表面工艺' into develop 2024-08-08 15:08:08 +08:00
jinling.yang
aaa19b96fd 还原注释代码 2024-08-08 14:57:55 +08:00
jinling.yang
1547a6064f 优化表面工艺 2024-08-07 17:30:29 +08:00
jinling.yang
5393ef686a 优化表面工艺 2024-08-05 17:28:48 +08:00
yuxianghui
070890e3b6 解决 SF，根据制造订单生成的采购单坯料入库时到原材料库BUG 2024-08-05 16:26:54 +08:00
jinling.yang
39214e5352 注释代码 2024-07-28 11:47:12 +08:00
jinling.yang
36a2bcca6e 优化表面工yi 2024-07-26 15:49:25 +08:00
jinling.yang
19c4b99bae 创建制造订单后生成询价单 2024-07-25 17:21:44 +08:00
jinling.yang
2deaffb4eb 添加表面工艺产品校验 2024-07-25 14:07:36 +08:00
jinling.yang
f0fdeff699 修复cnc工单按钮显示问题 2024-07-24 11:40:16 +08:00
mgw
e02f792300 修改订单状态 2024-07-11 11:22:25 +08:00
mgw
ed4903b6f1 解除装夹处打印成品二维码 2024-07-09 10:18:13 +08:00
jinling.yang
4c66d86ee6 修复表面工艺 2024-07-01 10:47:05 +08:00
jinling.yang
404a41294c 修复表面工艺外协单状态 2024-06-30 19:16:48 +08:00