马广威
|
2c1d90ae63
|
Accept Merge Request #1955: (feature/制造功能优化 -> develop)
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1955?initial=true
|
2025-03-24 13:40:20 +08:00 |
|
mgw
|
8e21434fba
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-24 13:39:46 +08:00 |
|
mgw
|
956cefbd9f
|
调整按钮显隐
|
2025-03-24 13:39:19 +08:00 |
|
mgw
|
85789d137b
|
修复线上pdf版本报告变形
|
2025-03-24 13:35:43 +08:00 |
|
禹翔辉
|
6e731cfadc
|
Accept Merge Request #1954: (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/1954
|
2025-03-24 13:17:57 +08:00 |
|
yuxianghui
|
f51f8bebb2
|
新增按规格生成的采购申请订单跳过审核环节自动更新为已批准状态
|
2025-03-24 13:16:02 +08:00 |
|
胡尧
|
e10648ad07
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-24 11:13:48 +08:00 |
|
胡尧
|
2bd18def8f
|
Accept Merge Request #1953: (feature/mrp_bug_fixed -> develop)
Merge Request: 修改采购单需要审批提醒的方式
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1953?initial=true
|
2025-03-24 11:13:10 +08:00 |
|
胡尧
|
61b2b05367
|
修改采购单需要审批提醒的方式
|
2025-03-24 11:11:50 +08:00 |
|
mgw
|
d2b02bb6f7
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-24 11:03:07 +08:00 |
|
马广威
|
e7b4f51736
|
Accept Merge Request #1952: (feature/制造功能优化 -> develop)
Merge Request: 调整报告样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1952
|
2025-03-24 11:02:08 +08:00 |
|
mgw
|
8832b01408
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-24 11:01:11 +08:00 |
|
mgw
|
a5c5b499f1
|
调整报告样式
|
2025-03-24 11:00:49 +08:00 |
|
胡尧
|
0e1c44c3ac
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-24 09:56:19 +08:00 |
|
胡尧
|
4212ed763b
|
Accept Merge Request #1951: (feature/mrp_bug_fixed -> develop)
Merge Request: 取消物流单屏蔽
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1951?initial=true
|
2025-03-24 09:54:48 +08:00 |
|
胡尧
|
a6ac46617d
|
取消物流单屏蔽
|
2025-03-24 09:54:04 +08:00 |
|
胡尧
|
43ba241b42
|
增加采购申请翻译
|
2025-03-24 09:51:05 +08:00 |
|
胡尧
|
5ffbe4c6fc
|
Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-24 09:00:22 +08:00 |
|
胡尧
|
5ae167c133
|
去掉取消自动加工原因
|
2025-03-24 09:00:16 +08:00 |
|
mgw
|
0702e1dd51
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 18:26:58 +08:00 |
|
马广威
|
d9d434d994
|
Accept Merge Request #1950: (feature/制造功能优化 -> develop)
Merge Request: 调整报告样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1950?initial=true
|
2025-03-21 18:26:18 +08:00 |
|
mgw
|
08fa26d9c8
|
调整报告样式
|
2025-03-21 18:25:20 +08:00 |
|
mgw
|
e861897527
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 18:18:29 +08:00 |
|
马广威
|
4ba3a56794
|
Accept Merge Request #1949: (feature/制造功能优化 -> develop)
Merge Request: 增加已批准为无异动
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1949?initial=true
|
2025-03-21 18:17:32 +08:00 |
|
mgw
|
4c995d00d0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-21 18:16:18 +08:00 |
|
mgw
|
30b01b6e2c
|
增加已批准为无异动
|
2025-03-21 18:15:37 +08:00 |
|
胡尧
|
19a66d2c81
|
屏蔽物流下单按钮
|
2025-03-21 16:44:49 +08:00 |
|
禹翔辉
|
b2b9120577
|
Accept Merge Request #1948: (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/1948
|
2025-03-21 16:14:32 +08:00 |
|
yuxianghui
|
ad8f63570d
|
请购明细添加供货方式搜索
|
2025-03-21 16:10:30 +08:00 |
|
胡尧
|
3bb909c2ee
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 15:39:56 +08:00 |
|
禹翔辉
|
e8b22cedea
|
Accept Merge Request #1947: (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/1947
|
2025-03-21 15:39:00 +08:00 |
|
yuxianghui
|
d202e7ee93
|
零件名称字段计算方法修改
|
2025-03-21 15:37:10 +08:00 |
|
胡尧
|
da19b86bf5
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 15:29:49 +08:00 |
|
胡尧
|
2876d56803
|
Accept Merge Request #1946: (feature/mrp_bug_fixed -> develop)
Merge Request: 销售订单自动确认
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1946?initial=true
|
2025-03-21 15:29:22 +08:00 |
|
胡尧
|
e1fd4c465e
|
销售订单自动确认
|
2025-03-21 15:27:11 +08:00 |
|
胡尧
|
dc318769af
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 15:13:28 +08:00 |
|
禹翔辉
|
31820dfef1
|
Accept Merge Request #1945: (feature/采购申请字段调整 -> develop)
Merge Request: Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1945
|
2025-03-21 15:07:48 +08:00 |
|
yuxianghui
|
1cb46bb1e1
|
Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整
|
2025-03-21 15:06:29 +08:00 |
|
yuxianghui
|
80e9085e29
|
采购申请字段调整
|
2025-03-21 15:05:42 +08:00 |
|
mgw
|
311b95bca5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 13:18:22 +08:00 |
|
马广威
|
d1f8bdb1f4
|
Accept Merge Request #1944: (feature/制造功能优化 -> develop)
Merge Request: 调整原有质检单图纸获取逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1944
|
2025-03-21 13:17:11 +08:00 |
|
mgw
|
08267ba1e6
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-21 13:16:18 +08:00 |
|
mgw
|
c6f1bc80a7
|
调整原有质检单图纸获取逻辑
|
2025-03-21 13:15:59 +08:00 |
|
廖丹龙
|
384761514b
|
Accept Merge Request #1943: (feature/tool_standard_library_process -> 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/1943
|
2025-03-21 11:34:57 +08:00 |
|
胡尧
|
80118b61c2
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 11:24:02 +08:00 |
|
禹翔辉
|
eab3ba9478
|
Accept Merge Request #1942: (feature/采购申请代码搬迁 -> develop)
Merge Request: Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1942
|
2025-03-21 11:23:27 +08:00 |
|
yuxianghui
|
c2be45f204
|
Merge branch 'feature/采购单优化' into feature/采购申请代码搬迁
|
2025-03-21 11:21:08 +08:00 |
|
yuxianghui
|
86d2fb1ac2
|
efms-purchase_request模块新增修改代码搬迁到sf-jikimo_purchase_request模块
|
2025-03-21 11:20:24 +08:00 |
|
禹翔辉
|
f28d07e58f
|
Accept Merge Request #1941: (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/1941
|
2025-03-20 17:03:28 +08:00 |
|
yuxianghui
|
7124eebabe
|
采购单采购类型计算方法添加新判断条件
|
2025-03-20 17:01:36 +08:00 |
|