jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
514 Commits 134 Branches 31 Tags
6dfced854166bf181ad3db9f2a8b6cfb4335e2a8
Commit Graph

514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
6dfced8541 新增班次对象，新增工作日对象，修改了工作日历设置的班次、工作日字段类型；新增工作日历表对象 2023-07-10 17:26:43 +08:00
禹翔辉
1d970712e3 Accept Merge Request #230: (feature/计划管理-基础设置 -> develop) 
Merge Request: 优化了产线设备资源设置模型

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/230?initial=true
 2023-07-07 17:37:19 +08:00
yuxianghui
9a03235cfa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-07 17:36:59 +08:00
yuxianghui
e711ff0ab3 优化了产线设备资源设置，新增根据选取的工作中心自动带出设备的数据，新增根据选择的工作日历自动带出班次的数据，新增搜索视图 2023-07-07 17:36:42 +08:00
禹翔辉
e7075a83ca Accept Merge Request #229: (feature/计划管理-基础设置 -> develop) 
Merge Request: 新增生产线模型，优化了计划管理-基础设置模块

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/229?initial=true
 2023-07-07 14:38:15 +08:00
yuxianghui
e78a60b6ef Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-07 14:37:08 +08:00
yuxianghui
5b5d41559c 优化了工作日历时间输入，新增工作日历设置自动计算时长功能，修改了生产线模型的位置（移至sf_maintenance模块下），优化了部分的产线设备资源设置模型 2023-07-07 14:36:27 +08:00
yuxianghui
123adcfc76 在sf_base下新增生产线模型，优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式 2023-07-06 17:38:08 +08:00
马广威
621b75d437 Accept Merge Request #228: (feature/优化库存模块功能 -> develop) 
Merge Request: 优化货位状态，以及产品显隐逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/228?initial=true
 2023-07-06 15:05:38 +08:00
mgw
b72c3ce08a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化库存模块功能 2023-07-06 15:04:11 +08:00
mgw
20c6a67f34 优化货位状态，以及产品显隐逻辑 2023-07-06 15:03:35 +08:00
许何哲
8dfcd943f0 Accept Merge Request #227: (feature/前端分支 -> develop) 
Merge Request: 修改导航栏

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/227?initial=true
 2023-07-06 14:29:10 +08:00
马广威
c0b7e3679b Accept Merge Request #226: (feature/为看板设置颜色 -> develop) 
Merge Request: 在看板xml中增加判断逻辑选择不同的class属性值，以匹配对应的css颜色

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/226?initial=true
 2023-07-06 12:28:00 +08:00
mgw
bc7f516d2d 在看板xml中增加判断逻辑选择不同的class属性值，以匹配对应的css颜色 2023-07-06 12:26:35 +08:00
马广威
f31becc215 Accept Merge Request #225: (feature/改造原生库存模块 -> develop) 
Merge Request: 原生库存模块初步升级已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/225?initial=true
 2023-07-06 09:44:08 +08:00
mgw
3943b0994e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/改造原生库存模块 2023-07-06 09:41:42 +08:00
mgw
3a653a9485 优化货位看板显示字段 2023-07-06 09:38:57 +08:00
mgw
b754534b5b 完善库存模块新增功能及编码规则，已实现据货架分别展示下属货位的看板，待优化 2023-07-05 23:02:22 +08:00
禹翔辉
52674a6747 Accept Merge Request #224: (feature/计划管理-基础设置 -> develop) 
Merge Request: 新增计划管理模块，新增计划管理-工作日志设置模型（未完成），新增计划管理-工序设备资源设置模型（未完成）

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/224?initial=true
 2023-07-05 14:51:21 +08:00
yuxianghui
a962af0f57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-05 14:48:03 +08:00
yuxianghui
caf367b10d 新增工序设备资源设置模型 2023-07-05 14:47:29 +08:00
龚启豪
afa630682c Accept Merge Request #222: (feature/设备模块优化，自动生成维保计划 -> develop) 
Merge Request: 设备模块优化

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/222?initial=true
 2023-07-05 14:34:13 +08:00
qihao.gong@jikimo.com
3e6130da15 维保计划新增确认维保计划和标记已完成按钮，处理自动生成维保计划的方法报错的bug 2023-07-05 14:32:22 +08:00
mgw
0d7c269c3b 继承原生库存模块，为位置模型增加库区库位等字段 2023-07-04 20:05:59 +08:00
yuxianghui
f685c9a3d4 新增计划管理模块，新增工作日历设置模块（已完成，手动输入时间部分需优化） 2023-07-04 17:37:20 +08:00
qihao.gong@jikimo.com
e6060b9bab 修改维保标准维保项目参数为One2many对象 并与设备，维保计划关联，修改原生维保计划方法 根据保养和检修生成不同的维保计划单 2023-07-04 17:30:50 +08:00
马广威
4199a86264 Accept Merge Request #221: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 修改依赖关系，解决依赖冲突

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/221?initial=true
 2023-06-30 15:17:49 +08:00
mgw
e0315bafc7 修改依赖关系，解决依赖冲突 2023-06-30 15:17:10 +08:00
马广威
1a937a7476 Accept Merge Request #220: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 解决代码冲突


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/220?initial=true
 2023-06-29 20:00:14 +08:00
mgw
576d2d7758 解决代码冲突 2023-06-29 19:59:39 +08:00
杨金灵
1f61cf7b5a Accept Merge Request #219: (feature/释放模型转换格式代码 -> develop) 
Merge Request: 刀具产品模板根据型号展示不同字段和值


Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/219?initial=true
 2023-06-29 18:55:52 +08:00
jinling.yang
05227b9022 刀具产品模板根据型号展示不同字段和值 2023-06-29 18:53:11 +08:00
马广威
4212340519 Accept Merge Request #218: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 解决代码冲突问题


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/218?initial=true
 2023-06-29 17:43:44 +08:00
mgw
dbb3ea8a35 解决代码冲突问题 2023-06-29 17:43:16 +08:00
jinling.yang
36fe0cab18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-29 17:17:05 +08:00
jinling.yang
8f841314b5 Merge branch 'feature/新增夹具功能' into develop 2023-06-29 17:16:51 +08:00
杨金灵
5bcd1e579d Accept Merge Request #217: (feature/新增夹具功能 -> develop) 
Merge Request: 新增夹具功能

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/217?initial=true
 2023-06-29 17:16:35 +08:00
jinling.yang
2c71439a96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:15:33 +08:00
jinling.yang
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:14:48 +08:00
禹翔辉
0c515cd563 Accept Merge Request #216: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了功能刀具自动申请装刀功能的数据显示问题


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/216?initial=true
 2023-06-29 16:54:10 +08:00
yuxianghui
80a88b8afb 优化了功能刀具自动申请装刀功能的数据显示问题 2023-06-29 16:54:18 +08:00
yuxianghui
69cb1adc3e 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成 2023-06-29 15:56:08 +08:00
禹翔辉
7795cfef29 Accept Merge Request #215: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/215?initial=true
 2023-06-29 15:55:58 +08:00
马广威
e77eb4d20d Accept Merge Request #214: (feature/刀具管理同步优化，增加字段 -> develop) 
Merge Request: 刀具物料查询功能本地测试完成，推至线上测试


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/214?initial=true
 2023-06-29 14:23:53 +08:00
mgw
8664c196f0 刀具物料查询功能本地测试完成，推至线上测试 2023-06-29 14:23:10 +08:00
yuxianghui
d5938bf407 优化了申请换刀功能的数据， 2023-06-29 14:16:10 +08:00
禹翔辉
b32722ca54 Accept Merge Request #213: (feature/sf刀具功能分支 -> develop) 
Merge Request: 优化了申请换刀功能的数据

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/213?initial=true
 2023-06-29 14:15:57 +08:00
jinling.yang
3907901dc3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-29 11:18:13 +08:00
jinling.yang
6ad7a1e613 Merge branch 'feature/刀具产品模板优化' into develop 2023-06-29 11:17:49 +08:00
杨金灵
89475f46a3 Accept Merge Request #212: (feature/刀具产品模板优化 -> develop) 
Merge Request: 刀具产品模板优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/212?initial=true
 2023-06-29 11:17:30 +08:00