mgw
|
5b51cc3de4
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 12:55:23 +08:00 |
|
马广威
|
625188d46d
|
Accept Merge Request #1932: (feature/制造功能优化 -> develop)
Merge Request: 修改取消明细状态
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1932?initial=true
|
2025-03-19 12:54:18 +08:00 |
|
mgw
|
6178ad0f8e
|
修改取消明细状态
|
2025-03-19 12:53:40 +08:00 |
|
mgw
|
9e939467e5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:35:27 +08:00 |
|
马广威
|
6c89a2c4fb
|
Accept Merge Request #1931: (feature/制造功能优化 -> develop)
Merge Request: 调整名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1931?initial=true
|
2025-03-19 11:34:38 +08:00 |
|
mgw
|
dc5e70c118
|
调整名称
|
2025-03-19 11:33:59 +08:00 |
|
mgw
|
b05492615f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:23:49 +08:00 |
|
马广威
|
03d6f9a32e
|
Accept Merge Request #1930: (feature/制造功能优化 -> develop)
Merge Request: 调整字段名
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1930?initial=true
|
2025-03-19 11:22:21 +08:00 |
|
mgw
|
8634c1fc40
|
调整字段名
|
2025-03-19 11:21:28 +08:00 |
|
mgw
|
32ed0e9693
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:18:28 +08:00 |
|
马广威
|
e1c535f907
|
Accept Merge Request #1929: (feature/制造功能优化 -> develop)
Merge Request: 增加包名映射
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1929
|
2025-03-19 11:17:38 +08:00 |
|
mgw
|
a556c21196
|
增加包名映射
|
2025-03-19 11:16:36 +08:00 |
|
mgw
|
623ebe3ec3
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:09:16 +08:00 |
|
马广威
|
b1821d3ed6
|
Accept Merge Request #1928: (feature/制造功能优化 -> develop)
Merge Request: state字段添加ondelete策略
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1928?initial=true
|
2025-03-19 11:08:34 +08:00 |
|
mgw
|
a8d8bcbcee
|
state字段添加ondelete策略
|
2025-03-19 11:07:49 +08:00 |
|
mgw
|
da06688571
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:02:40 +08:00 |
|
马广威
|
e7d8587a32
|
Accept Merge Request #1927: (feature/制造功能优化 -> develop)
Merge Request: 取消列表增加采购申请明细
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1927?initial=true
|
2025-03-19 11:01:51 +08:00 |
|
mgw
|
b53ea2e0e9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-19 11:01:21 +08:00 |
|
mgw
|
5b979ffc34
|
取消列表增加采购申请明细
|
2025-03-19 11:00:48 +08:00 |
|
mgw
|
c01451336d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 10:24:26 +08:00 |
|
马广威
|
e5fc3dfe62
|
Accept Merge Request #1926: (feature/制造功能优化 -> develop)
Merge Request: 判断文件是否上传
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1926?initial=true
|
2025-03-19 10:23:38 +08:00 |
|
mgw
|
08cd1a176b
|
判断文件是否上传
|
2025-03-19 10:22:44 +08:00 |
|
mgw
|
2db5068e85
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 10:06:52 +08:00 |
|
马广威
|
bab21d7b76
|
Accept Merge Request #1925: (feature/制造功能优化 -> develop)
Merge Request: 出厂检验报告bug修改
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1925?initial=true
|
2025-03-19 10:05:59 +08:00 |
|
mgw
|
6bdaad8718
|
出厂检验报告上传模板后-没有自动新增有数值的列
|
2025-03-19 10:03:59 +08:00 |
|
mgw
|
94441422cd
|
出厂检验报告已经发布-还可以编辑页面内容-发布后要禁掉编辑功能
|
2025-03-19 09:43:23 +08:00 |
|
mgw
|
5f48dad86c
|
发料出库单质检弹窗发布前校验
|
2025-03-19 08:44:23 +08:00 |
|
mgw
|
c955953335
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 16:51:19 +08:00 |
|
马广威
|
f5bf727b34
|
Accept Merge Request #1924: (feature/制造功能优化 -> develop)
Merge Request: 修正问题
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1924?initial=true
|
2025-03-18 16:50:35 +08:00 |
|
mgw
|
c55231555c
|
修正问题
|
2025-03-18 16:49:50 +08:00 |
|
mgw
|
9220c4b7c4
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 16:42:51 +08:00 |
|
马广威
|
e4606ece75
|
Accept Merge Request #1923: (feature/制造功能优化 -> develop)
Merge Request: 修正数据类型转换
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1923
|
2025-03-18 16:42:14 +08:00 |
|
mgw
|
972c06cdc1
|
修正数据类型转换
|
2025-03-18 16:41:35 +08:00 |
|
mgw
|
70b21c607e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 16:31:48 +08:00 |
|
马广威
|
f8bfb7ba40
|
Accept Merge Request #1922: (feature/制造功能优化 -> develop)
Merge Request: 调整报告逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1922
|
2025-03-18 16:29:24 +08:00 |
|
mgw
|
b2c3694a23
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-18 16:28:33 +08:00 |
|
mgw
|
be0df6e66b
|
调整报告逻辑
|
2025-03-18 16:26:39 +08:00 |
|
mgw
|
242f9c9050
|
总数量问题
|
2025-03-18 15:58:05 +08:00 |
|
胡尧
|
4fe7300ec0
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-18 15:56:19 +08:00 |
|
廖丹龙
|
307bfa19f2
|
Accept Merge Request #1921: (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/1921
|
2025-03-18 15:55:27 +08:00 |
|
liaodanlong
|
83b051e0b9
|
材料型号同步添加材料代号
|
2025-03-18 15:51:56 +08:00 |
|
liaodanlong
|
5bbcd8ec23
|
材料型号同步添加材料代号
|
2025-03-18 15:46:22 +08:00 |
|
mgw
|
282458c945
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 13:45:19 +08:00 |
|
马广威
|
b211ffdff9
|
Accept Merge Request #1920: (feature/制造功能优化 -> develop)
Merge Request: 修改模板样式
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1920?initial=true
|
2025-03-18 13:44:28 +08:00 |
|
mgw
|
cb445393ce
|
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-18 13:43:36 +08:00 |
|
hyyy
|
25ba61607f
|
修改模板样式
|
2025-03-18 13:42:42 +08:00 |
|
胡尧
|
f6e87493d3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-18 11:28:23 +08:00 |
|
廖丹龙
|
8c4c65a00f
|
Accept Merge Request #1919: (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/1919
|
2025-03-18 11:27:43 +08:00 |
|
liaodanlong
|
3642398724
|
表面工艺零件图号没有问题
|
2025-03-18 11:25:46 +08:00 |
|
禹翔辉
|
23bcf13d95
|
Accept Merge Request #1918: (feature/质检弹窗优化_2 -> develop)
Merge Request: 1、质检弹窗和数量应用弹窗顺序调整
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1918
|
2025-03-18 11:22:47 +08:00 |
|