jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,367 Commits 134 Branches 0 Tags
5f9c5961a52e81e7b5820a667d314ff1b6b6e117
Commit Graph

3367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
5f9c5961a5 报废 2024-08-09 10:39:48 +08:00
jinling.yang
4399700c3d 优化报废向导 2024-08-08 17:24:41 +08:00
jinling.yang
45b9177da4 优化工单 2024-08-08 16:09:00 +08:00
jinling.yang
745658eff2 1.制造订单添加报废状态， 
2.返工操作制造订单添加过滤条件：状态为报废
3.cnc工单完成检测结果添加报废
 2024-08-08 15:40:29 +08:00
jinling.yang
ce8b0127b8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-08-08 15:08:17 +08:00
jinling.yang
f58fb2ea13 Merge branch 'feature/优化表面工艺' into develop 2024-08-08 15:08:08 +08:00
杨金灵
d333621c7a Accept Merge Request #1216: (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/1216
 2024-08-08 15:07:37 +08:00
jinling.yang
563023fa3c 中控接口身份验证放开 2024-08-08 15:07:22 +08:00
jinling.yang
3d2c7425c4 还原代码 2024-08-08 15:03:45 +08:00
jinling.yang
aaa19b96fd 还原注释代码 2024-08-08 14:57:55 +08:00
jinling.yang
1547a6064f 优化表面工艺 2024-08-07 17:30:29 +08:00
禹翔辉
55b2daa0a3 Accept Merge Request #1215: (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/1215
 2024-08-07 17:13:57 +08:00
yuxianghui
d469c09f15 Merge branch 'feature/制造订单优化' into feature/销售单优化 2024-08-07 17:11:57 +08:00
yuxianghui
a03cb31b29 1、处理 SF销售单需求优化 需求 2024-08-07 17:11:12 +08:00
廖丹龙
d2b20761b5 Accept Merge Request #1214: (feature/tax_sync -> develop) 
Merge Request: bom原材料查询出现多条会导致bfm 分配工厂时报错

Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1214
 2024-08-07 09:49:20 +08:00
liaodanlong
0f47b4b8c3 bom原材料查询限制只拿一条 2024-08-07 09:44:04 +08:00
liaodanlong
0cfb16b9d9 Merge remote-tracking branch 'origin/develop' into develop 2024-08-06 09:09:59 +08:00
廖丹龙
8ec5e05739 Accept Merge Request #1213: (feature/tax_sync -> develop) 
Merge Request: bfm 加工订单税信息同步

Created By: @廖丹龙
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1213
 2024-08-06 09:09:37 +08:00
jinling.yang
5393ef686a 优化表面工艺 2024-08-05 17:28:48 +08:00
yuxianghui
e92c9675b6 1、 处理 内部调拨单，在选择目标货位时，隐藏带循环货位标签的货位不进行展示 2024-08-05 17:18:54 +08:00
liaodanlong
e6bad80031 Merge branch 'refs/heads/feature/tax_sync' into develop 2024-08-05 17:12:37 +08:00
yuxianghui
070890e3b6 解决 SF，根据制造订单生成的采购单坯料入库时到原材料库BUG 2024-08-05 16:26:54 +08:00
jinling.yang
ed0d57c364 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_workorder.py
 2024-08-02 14:41:42 +08:00
禹翔辉
3f27ae0f35 Accept Merge Request #1212: (feature/bug优化 -> develop) 
Merge Request: 修改夹具重量单位为kg

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1212
 2024-08-02 11:22:06 +08:00
yuxianghui
cec426920b Merge branch 'feature/优化工单状态' into feature/bug优化 2024-08-02 11:19:45 +08:00
杨金灵
0a6cf74bc2 Accept Merge Request #1210: (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/1210?initial=true
 2024-08-01 16:41:49 +08:00
jinling.yang
c0202330f8 去掉工单输出 2024-08-01 16:40:46 +08:00
杨金灵
1dabdd157e Accept Merge Request #1209: (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/1209
 2024-08-01 15:20:54 +08:00
jinling.yang
36dc8070fa 注释及还原代码 2024-08-01 15:18:57 +08:00
yuxianghui
a5da18bbc7 1、修改夹具重量单位为kg 2024-08-01 11:34:20 +08:00
liaodanlong
510e8d49fb 功能刀具拆解失败问题 2024-08-01 10:46:14 +08:00
liaodanlong
051273017d Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync 2024-08-01 10:45:09 +08:00
yuxianghui
f49557090a 1、优化刀具拆解单拆解时生成的调拨单单据验证出现数据缺失问题 2024-08-01 10:40:25 +08:00
杨金灵
d1656278ea Accept Merge Request #1208: (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/1208?initial=true
 2024-07-31 17:02:05 +08:00
jinling.yang
0675937588 优化制造订单列表 2024-07-31 17:00:14 +08:00
马广威
c0d006d139 Accept Merge Request #1207: (feature/优化工单状态 -> develop) 
Merge Request: 调整代码

Created By: @禹翔辉
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1207
 2024-07-31 15:07:51 +08:00
yuxianghui
2fa47eae27 1 2024-07-31 15:06:55 +08:00
yuxianghui
cb2e1ecabe 1 2024-07-31 15:06:14 +08:00
yuxianghui
9f1233d20e 1 2024-07-31 15:04:37 +08:00
禹翔辉
a783f7ec7b Accept Merge Request #1206: (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/1206?initial=true
 2024-07-31 15:02:31 +08:00
yuxianghui
db50253100 Merge branch 'feature/优化工单_6' into feature/优化工单状态 2024-07-31 15:00:48 +08:00
yuxianghui
5f7f905540 优化工单状态 2024-07-31 14:59:57 +08:00
杨金灵
1c86cc1421 Accept Merge Request #1205: (feature/优化ftp（pdf路径） -> develop) 
Merge Request: 优化ftp（pdf路径）

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1205
 2024-07-31 14:56:14 +08:00
jinling.yang
1ea6f649f0 优化ftp（pdf路径） 2024-07-31 14:54:15 +08:00
liaodanlong
115a3e0712 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/tax_sync 2024-07-31 14:41:02 +08:00
jinling.yang
f0421b873c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-07-31 11:55:55 +08:00
jinling.yang
913feea2a9 Merge branch 'feature/优化三次元检测报告' into develop 2024-07-31 11:55:46 +08:00
杨金灵
5d36513e59 Accept Merge Request #1204: (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/1204
 2024-07-31 11:54:40 +08:00
jinling.yang
94d6085f92 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-07-31 11:51:31 +08:00
jinling.yang
f361106c40 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化三次元检测报告 2024-07-31 11:51:16 +08:00