jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,547 Commits 134 Branches 31 Tags
dd60dee22d76baa59cb72ca3c28c1b1825f56c46
Commit Graph

164 Commits

Author SHA1 Message Date
qihao.gong@jikimo.com
d78fe872ae BT50 2023-09-15 14:26:04 +08:00
WEB许何哲\xuhez
e3e717ea60 设备清单看板优化 2023-09-15 11:15:40 +08:00
mgw
db5d9863b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-09-15 10:40:30 +08:00
mgw
2cc03c21ed 优化图文展示样式 2023-09-15 10:37:20 +08:00
jinling.yang
b966bdd8da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 2023-09-14 18:04:41 +08:00
jinling.yang
5fa9d1e16e 1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里 
2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间”
3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段
 2023-09-14 18:04:04 +08:00
qihao.gong@jikimo.com
5416ecb709 维保计划关联维保项目 2023-09-14 10:55:43 +08:00
qihao.gong@jikimo.com
532e4a4c7a 设备图文展示 2023-09-13 16:52:40 +08:00
qihao.gong@jikimo.com
e3b7d5ad02 设备图文展示 2023-09-13 15:39:27 +08:00
qihao.gong@jikimo.com
9e424600bc 处理机床能力数据 2023-09-13 14:32:32 +08:00
qihao.gong@jikimo.com
32b773c486 设备新增图文展示table 2023-09-01 16:57:04 +08:00
qihao.gong@jikimo.com
e6a68eb1eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-29 15:48:48 +08:00
qihao.gong@jikimo.com
b7f2c4a000 sf修改设备table，品牌图片改成图片 2023-08-29 15:47:58 +08:00
yuxianghui
5ccd754261 所有自建模块日志警告信息处理 2023-08-29 11:06:59 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
qihao.gong@jikimo.com
a9954c1231 维保计划中维保项目可以上传多张图片 2023-08-25 11:10:28 +08:00
qihao.gong@jikimo.com
f31a6d0d43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-08-24 15:00:41 +08:00
qihao.gong@jikimo.com
3b3847990d 工作重心看板展示设备状态以及图片，设备看板增加负责人 2023-08-24 14:51:03 +08:00
许何哲
a2f5dbd70d Accept Merge Request #341: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改看板样式

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
 2023-08-24 09:04:02 +08:00
WEB许何哲\xuhez
f67c8169bf 修改看板样式 2023-08-24 09:02:15 +08:00
qihao.gong@jikimo.com
76293f5cca 修改维保table 2023-08-21 17:22:53 +08:00
qihao.gong@jikimo.com
a5a9ae150f 修改设备看板 2023-08-21 15:41:40 +08:00
qihao.gong@jikimo.com
82322b5024 修改设备table和跳转到维保 设备改为维保 2023-08-21 10:27:50 +08:00
qihao.gong@jikimo.com
08ac2978a1 移除托盘对象 并清除所有关联关系 2023-08-17 16:33:40 +08:00
qihao.gong@jikimo.com
28fcf5c4fa 优化机场看板以及机床表单 2023-08-17 11:11:47 +08:00
qihao.gong@jikimo.com
cd0f455db3 修改设备模块看板 2023-08-16 17:30:30 +08:00
qihao.gong@jikimo.com
fac3450257 设备基础参数 2023-08-16 15:00:03 +08:00
qihao.gong@jikimo.com
fcf5963079 修改设备清单看板 2023-08-16 11:56:41 +08:00
qihao.gong@jikimo.com
e0f43fa9fe 修改机床型号参数缺陷 2023-08-15 17:31:27 +08:00
qihao.gong@jikimo.com
f0e1939b95 修改设备参数以及机床型号基础参数以及同步cloud方法 2023-08-07 16:00:26 +08:00
qihao.gong@jikimo.com
2321304e2a 修改设备 2023-08-04 17:31:47 +08:00
mgw
95c57a3ffb 新增翻译问题解决 2023-08-03 11:55:46 +08:00
qihao.gong@jikimo.com
06de46c084 修改设备模块 2023-07-28 15:33:31 +08:00
qihao.gong@jikimo.com
f246827d3d 修改设备模块布局 2023-07-25 17:27:11 +08:00
qihao.gong@jikimo.com
65157e93a9 设备新需求（根据维保项目生成维保计划） 2023-07-24 17:44:07 +08:00
qihao.gong@jikimo.com
8d024ad625 修改sf设备修改过的需求 2023-07-21 17:15:43 +08:00
qihao.gong@jikimo.com
9c556c5f40 修改设备布局 2023-07-19 17:10:49 +08:00
qihao.gong@jikimo.com
fc93d5c646 修改设备菜单名称以及二级目录结构 2023-07-18 10:47:23 +08:00
qihao.gong@jikimo.com
bb464a2351 修改设备参数布局 2023-07-17 15:44:04 +08:00
qihao.gong@jikimo.com
ad84eedda3 修改设备菜单名称 2023-07-17 10:38:54 +08:00
qihao.gong@jikimo.com
4bb3ab3e16 维保计划视图优化 2023-07-14 17:27:11 +08:00
jinling.yang
31d335af48 设备模块文件解决冲突 2023-07-14 10:16:22 +08:00
jinling.yang
98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py
 2023-07-14 10:05:01 +08:00
qihao.gong@jikimo.com
8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-07-14 09:02:48 +08:00
jinling.yang
36bb77ccb0 工单的完成按钮代码还原 2023-07-13 17:17:48 +08:00
jinling.yang
7a690abe1a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 
# Conflicts:
#	sf_maintenance/__manifest__.py
 2023-07-13 16:58:49 +08:00
yuxianghui
81842dc5ec 将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录 2023-07-13 16:05:38 +08:00
jinling.yang
7743c9658c 工单菜单优化 2023-07-10 17:33:17 +08:00
qihao.gong@jikimo.com
3544c6a957 密码策略模块测试 2023-07-10 17:33:06 +08:00
yuxianghui
6dfced8541 新增班次对象，新增工作日对象，修改了工作日历设置的班次、工作日字段类型；新增工作日历表对象 2023-07-10 17:26:43 +08:00