jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,024 Commits 134 Branches 0 Tags
f9e41f262c2fc485e3c42f6f07acf1e44c92ea75
Commit Graph

1024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
禹翔辉
f9e41f262c Accept Merge Request #379: (feature/刀具优化 -> develop) 
Merge Request: 刀具优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/379?initial=true
 2023-09-12 17:38:20 +08:00
yuxianghui
7fcd079535 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化 2023-09-12 17:37:08 +08:00
yuxianghui
165f961fb4 注释刀具管理-刀具物料查询-整体式刀具参数限制，调整整体式刀具参数位置，添加能力参数图文展示功能，直径类参数增加φ的前缀单位；注释产品-刀具参数-cutting_tool_screw。 2023-09-12 17:36:45 +08:00
禹翔辉
2793bd2472 Accept Merge Request #378: (feature/刀具优化 -> develop) 
Merge Request: 放开配备螺丝参数注释

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/378?initial=true
 2023-09-12 15:06:47 +08:00
yuxianghui
f554c2073f 放开配备螺丝参数注释 2023-09-12 15:06:21 +08:00
马广威
3a9f408be2 Accept Merge Request #377: (feature/制造-计划优化 -> develop) 
Merge Request: 冗余菜单优化完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/377?initial=true
 2023-09-12 11:13:14 +08:00
mgw
4bcb12d3f1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 2023-09-12 11:12:19 +08:00
mgw
7cbaf7373a 冗余菜单处理完成 2023-09-12 11:12:00 +08:00
禹翔辉
d6960c2717 Accept Merge Request #376: (feature/刀具优化 -> develop) 
Merge Request: 隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/376?initial=true
 2023-09-11 17:24:51 +08:00
yuxianghui
cf7e6ea33d 隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。 2023-09-11 17:21:32 +08:00
jinling.yang
49d41539b0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-09-08 17:28:58 +08:00
jinling.yang
0d40171f13 Merge branch 'feature/刀柄和夹头反注册到Cloud生成动态刀具物料' into develop 2023-09-08 17:28:41 +08:00
杨金灵
e919858e63 Accept Merge Request #375: (feature/刀柄和夹头反注册到Cloud生成动态刀具物料 -> develop) 
Merge Request: 整体式刀具，刀柄和夹头反注册到Cloud生成动态刀具物料

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/375?initial=true
 2023-09-08 17:28:21 +08:00
jinling.yang
c1be9a90fe 采购刀具产品反注册接口新增图片字段，3d模型代码放开 2023-09-08 17:14:57 +08:00
jinling.yang
26db256336 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 2023-09-08 17:06:02 +08:00
jinling.yang
aa17de3384 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_dlm/views/product_template_view.xml
 2023-09-08 17:05:44 +08:00
许何哲
9cbc1428e9 Accept Merge Request #374: (feature/sf品牌页面表格样式的修改 -> develop) 
Merge Request: many2many图文展示及点击交互效果

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/374?initial=true
 2023-09-08 16:34:56 +08:00
WEB许何哲\xuhez
857a26231d Merge branch 'develop' into feature/sf品牌页面表格样式的修改 2023-09-08 16:32:19 +08:00
WEB许何哲\xuhez
b76c192f33 many2many图文展示及点击交互效果 2023-09-08 16:31:06 +08:00
jinling.yang
e50f0c4465 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2023-09-08 14:10:48 +08:00
jinling.yang
41641f69fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2023-09-08 14:08:08 +08:00
禹翔辉
5802c55ab3 Accept Merge Request #373: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 放开OCC相关的代码

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/373?initial=true
 2023-09-08 10:41:09 +08:00
yuxianghui
b12880da50 放开OCC相关的代码 2023-09-08 10:39:47 +08:00
禹翔辉
a23fe9942d Accept Merge Request #372: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； 

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/372?initial=true
 2023-09-08 10:25:41 +08:00
yuxianghui
5e9b376721 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-08 10:23:01 +08:00
yuxianghui
35afdd3b2a 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段； 2023-09-08 10:20:52 +08:00
马广威
00dd03bb2c Accept Merge Request #371: (feature/参考web模块将widget统一管理 -> develop) 
Merge Request: custom_many2many widget整合到前端包中

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/371?initial=true
 2023-09-07 17:57:49 +08:00
mgw
121217d70f custom_many2many widget整合到前端包中 2023-09-07 17:54:07 +08:00
jinling.yang
3225916629 1.优化产品页面： 
①“产品类别”字段放在开票策略后面；“内部编码”和“条码”字段放在产品标签后面；当“产品类别”为“成品”时“上传模型文件“和“模型“字段放在"销售价格"前面；
②当“产品类别”为“刀具”时，且“刀具物料”字段为“整体式刀具”,"刀柄"或"夹头"时，页面根据选择的刀具物料而新增所对应需要的字段及页面布局展示
2.采购产品时，产品的“产品类别”为”刀具“且“刀具物料”为“整体式刀具”,"刀柄"或"夹头"时，在收货单进行验证操作时，优化实时注册到Cloud的动态资源里的工厂刀具物料的接口
3.优化“产品模板"模型的部分字段
 2023-09-07 17:46:22 +08:00
马广威
75fabfb63d Accept Merge Request #370: (feature/生产排程 -> develop) 
Merge Request: 调整“程序下载”按钮位置，更新本地代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/370
 2023-09-07 17:02:51 +08:00
mgw
255786325b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程 2023-09-07 15:38:28 +08:00
mgw
797a7207e9 调整“程序下载”按钮位置 2023-09-07 15:32:15 +08:00
马广威
f49f63a32a Accept Merge Request #369: (feature/生产排程 -> develop) 
Merge Request: 实现Many2many的图文展示，并增加图片方法功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/369?initial=true
 2023-09-07 15:17:22 +08:00
mgw
e0bfea40e1 增加点击图片放大图片的功能 2023-09-07 15:16:03 +08:00
mgw
78e3a0f24f 自定义widget显示many2many图文基本实现 2023-09-07 12:33:35 +08:00
禹翔辉
408a5c72c8 Accept Merge Request #368: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/368?initial=true
 2023-09-07 09:35:35 +08:00
yuxianghui
ae3f7c9c0c 新增切削速度Vc对象，产品-整体式刀具物料新增切削速度Vc关联字段；删除部分产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 17:24:08 +08:00
禹翔辉
093badd3a7 Accept Merge Request #367: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化  

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/367?initial=true
 2023-09-06 16:49:08 +08:00
yuxianghui
9331a22a10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-06 16:48:43 +08:00
yuxianghui
5353630975 撤销制造-配置-刀具型号新增的参数；对产品刀具物料字段的限制优化 2023-09-06 16:48:07 +08:00
禹翔辉
1983271a9b Accept Merge Request #366: (feature/整体式刀具能力参数补充 -> develop) 
Merge Request: 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/366?initial=true
 2023-09-06 11:11:55 +08:00
yuxianghui
0b8042f07a 配置-刀具型号新增整体式刀具能力参数补充；补充产品-整体式刀具同步配置-刀具型号-整体式刀具参数。 2023-09-06 11:02:55 +08:00
马广威
1f5cabad1a Accept Merge Request #365: (feature/生产排程 -> develop) 
Merge Request: 生产计划优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/365?initial=true
 2023-09-06 09:23:50 +08:00
mgw
48e30865af 生产计划优化 2023-09-06 09:22:58 +08:00
yuxianghui
fe78d91fa9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-06 09:12:11 +08:00
许何哲
4ac95c20ad Accept Merge Request #364: (feature/sf品牌页面表格样式的修改 -> develop) 
Merge Request: 对sf样式进行集中管理

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/364?initial=true
 2023-09-05 17:24:19 +08:00
WEB许何哲\xuhez
4a712ff9f1 Merge branch 'develop' into feature/sf品牌页面表格样式的修改 2023-09-05 17:22:58 +08:00
yuxianghui
f8c5553837 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整体式刀具能力参数补充 2023-09-05 17:22:45 +08:00
WEB许何哲\xuhez
7ea997219b 对sf的css样式进行集中管理 2023-09-05 17:22:37 +08:00
yuxianghui
a6ddfa22a1 对产品的整体式刀具能力参数进行补充，对参数字段进行优化；对刀具物料查询的字段类型进行调整。 2023-09-05 17:21:39 +08:00