jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • a8c817d704 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-08-16 17:30:40 +08:00
  • cd0f455db3 修改设备模块看板 qihao.gong@jikimo.com 2023-08-16 17:30:30 +08:00
  • fac3450257 设备基础参数 qihao.gong@jikimo.com 2023-08-16 15:00:03 +08:00
  • fcf5963079 修改设备清单看板 qihao.gong@jikimo.com 2023-08-16 11:56:41 +08:00
  • 2f732e41ed Merge remote-tracking branch 'origin/develop' into feature/必填字段label添加星号 WEB许何哲\xuhez 2023-08-16 11:23:46 +08:00
  • 1747f38bca 必填字段label添加星号 WEB许何哲\xuhez 2023-08-16 11:22:50 +08:00
  • d17cfc7793 Accept Merge Request #319: (feature/制造工单界面布局优化 -> develop) Merge Request: 将记录的讨论和评论窗口从form视图右侧移动到视图最下方。 禹翔辉 2023-08-16 11:03:05 +08:00
  • ddce0ab436 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造工单界面布局优化 yuxianghui 2023-08-16 11:01:11 +08:00
  • 9d025c10b4 将记录的讨论和评论窗口从form视图右侧移动到视图最下方。 yuxianghui 2023-08-16 11:00:34 +08:00
  • 928257f125 Accept Merge Request #318: (feature/坯料排程 -> develop) Merge Request: 修改生产线驾驶舱形式为searchpanel，贴近整体布局 马广威 2023-08-16 10:14:48 +08:00
  • 2169c10417 修改生产线驾驶舱形式为searchpanel，贴近整体布局 mgw 2023-08-16 10:11:40 +08:00
  • ab61902deb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 mgw 2023-08-16 09:43:29 +08:00
  • 06ed10bd5e 优化界面展示 mgw 2023-08-16 09:42:51 +08:00
  • 4e2bf6534a Accept Merge Request #317: (feature/tree视图表格样式修改 -> develop) Merge Request: 完成tree视图样式修改 许何哲 2023-08-16 09:28:58 +08:00
  • b780b50a42 Merge branch 'develop' into feature/tree视图表格样式修改 WEB许何哲\xuhez 2023-08-16 09:26:19 +08:00
  • f4428fde9f gantt图样式修改 WEB许何哲\xuhez 2023-08-16 09:25:13 +08:00
  • 42066865be Accept Merge Request #316: (feature/修改机床参数bug -> develop) Merge Request: 修改机床型号参数缺陷 龚启豪 2023-08-15 17:32:13 +08:00
  • 8a99bd8589 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 jinling.yang 2023-08-15 17:31:49 +08:00
  • e0f43fa9fe 修改机床型号参数缺陷 qihao.gong@jikimo.com 2023-08-15 17:31:27 +08:00
  • 0ecd4e4c3b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop qihao.gong@jikimo.com 2023-08-15 14:27:03 +08:00
  • a79a3ef64f Merge branch 'feature/修改设备模块' into develop qihao.gong@jikimo.com 2023-08-15 14:26:47 +08:00
  • 5b64664bbb Accept Merge Request #315: (feature/修改设备模块 -> develop) Merge Request: 修改控制系统同步接口 龚启豪 2023-08-15 14:26:34 +08:00
  • 0f5e5d6ebe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 qihao.gong@jikimo.com 2023-08-15 14:23:23 +08:00
  • abddb82f94 修改数控系统同步参数 qihao.gong@jikimo.com 2023-08-15 14:21:41 +08:00
  • 9856bb65fb Accept Merge Request #314: (feature/修改设备模块 -> develop) Merge Request: 新增主生产计划模块 龚启豪 2023-08-15 10:36:38 +08:00
  • 1533ef7be9 新增主生产计划模块 qihao.gong@jikimo.com 2023-08-15 10:36:04 +08:00
  • 4a5fb0c6e4 Accept Merge Request #313: (feature/坯料排程 -> develop) Merge Request: 解决翻译问题 马广威 2023-08-14 10:25:05 +08:00
  • ea958ed489 解决翻译问题 mgw 2023-08-14 10:24:39 +08:00
  • 5556274d8b Accept Merge Request #312: (feature/坯料排程优化 -> develop) Merge Request: 临时解决看板报错的问题 马广威 2023-08-14 08:53:53 +08:00
  • d3e6315269 临时解决看板报错的问题 mgw 2023-08-14 08:52:51 +08:00
  • 9c7d27f860 Accept Merge Request #311: (feature/修改设备模块 -> develop) Merge Request: 处理控制系统参数缺失 以及name同步不全问题 龚启豪 2023-08-11 17:08:33 +08:00
  • 9e90c98454 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 qihao.gong@jikimo.com 2023-08-11 17:07:13 +08:00
  • ce3ffb75ae 处理控制系统参数丢失问题 qihao.gong@jikimo.com 2023-08-11 17:06:57 +08:00
  • b83a3cc185 Accept Merge Request #310: (feature/刀具管理缺陷优化 -> develop) Merge Request: 新增出入库记录对象，功能刀具出入库记录对象多对一关联出入库记录对象，优化功能刀具出入库布局；新增功能刀具列表、刀具物料查询的分组展示全部信息；对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段 禹翔辉 2023-08-11 17:05:32 +08:00
  • d103a1cd29 新增出入库记录对象，功能刀具出入库记录对象多对一关联出入库记录对象，优化功能刀具出入库布局；新增功能刀具列表、刀具物料查询的分组展示全部信息；对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段 yuxianghui 2023-08-11 17:04:08 +08:00
  • 150c40f9b1 处理数控系统同步数据 name缺失问题 qihao.gong@jikimo.com 2023-08-11 16:55:50 +08:00
  • 4d650a9aca Accept Merge Request #309: (feature/坯料排程 -> develop) Merge Request: char字段聚焦全选功能已完成，坯料排程基本功能已完成 马广威 2023-08-11 12:28:28 +08:00
  • 9b239dbcb2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 mgw 2023-08-11 12:24:35 +08:00
  • 68805fee4a char字段聚焦全选功能已完成 mgw 2023-08-11 12:22:59 +08:00
  • fc490f1612 坯料排程基本功能完成 mgw 2023-08-11 12:18:47 +08:00
  • e6a496d062 Accept Merge Request #308: (feature/修改设备模块 -> develop) Merge Request: 处理同步报错bug 龚启豪 2023-08-11 10:28:14 +08:00
  • fb2cc0e504 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 qihao.gong@jikimo.com 2023-08-11 10:26:35 +08:00
  • 94efe4e7ca 处理同步报错 qihao.gong@jikimo.com 2023-08-11 10:26:15 +08:00
  • 8a736775d8 Merge branch 'develop' into feature/tree视图表格样式修改 WEB许何哲\xuhez 2023-08-11 10:19:47 +08:00
  • 4b34335963 看板视图样式还原 WEB许何哲\xuhez 2023-08-11 10:19:00 +08:00
  • 6116434399 Accept Merge Request #307: (feature/刀具管理缺陷优化 -> develop) Merge Request: 刀具管理测试的缺陷优化 禹翔辉 2023-08-10 17:15:42 +08:00
  • eccc4c3ade 新增功能刀具组装对象组装新刀具时创建功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录；新增新刀具取消组装时删除功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录；新增同步功能刀具列表数据到功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象；新增同步功能刀具组装数据到功能刀具预警对象；新增功能刀具出入库记录和功能刀具实时分布对象分组展示全部功能刀具类型。 yuxianghui 2023-08-10 16:41:41 +08:00
  • a764f42d23 Accept Merge Request #306: (feature/刀具管理问题优化 -> develop) Merge Request: 优化了刀具管理模块的功能刀具组装、CAM工单程序用刀计划、机床换刀申请模型的问题。 禹翔辉 2023-08-09 15:04:02 +08:00
  • 650a29b74f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化 yuxianghui 2023-08-09 15:01:39 +08:00
  • 1e1b0dd359 新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮；功能刀具预警新增展示分组展示全部CNC机床，功能刀具实时分布修改数量相关字段类型为Integer，并新增自动计算合计数和总数功能 yuxianghui 2023-08-09 15:00:59 +08:00
  • 8d126a0024 Accept Merge Request #305: (feature/修改设备模块 -> develop) Merge Request: 修改路线多规则条件选取 龚启豪 2023-08-09 10:00:17 +08:00
  • 06d73a815f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 qihao.gong@jikimo.com 2023-08-09 09:59:11 +08:00
  • 386b5eb11c 修改采购入库路线多规则条件选取 qihao.gong@jikimo.com 2023-08-09 09:58:51 +08:00
  • 9fe58a1fba 刀具型号页面布局 jinling.yang 2023-08-08 18:17:49 +08:00
  • 924b838a83 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化 yuxianghui 2023-08-08 18:09:49 +08:00
  • b2012c004a 新增刀具管理按键使用提示，调整相关按键布局；新增机床换刀申请、CAM装刀申请界面、功能刀具组装界面的tree视图左侧分组显示全部信息；优化三个界面相关字段；新增功能刀具组装界面刀具物料信息无数据隐藏，功能刀具组装申请组装界面刀具物料信息根据不同情况隐藏；新增功能刀具组装的刀具物料字段根据所选型号自动带出。 yuxianghui 2023-08-08 18:08:53 +08:00
  • e638245b8a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 jinling.yang 2023-08-08 17:18:06 +08:00
  • be53b012f1 Accept Merge Request #304: (feature/tree视图表格样式修改 -> develop) Merge Request: 调试线上sf的bug 许何哲 2023-08-08 14:45:47 +08:00
  • 35ef00a8cd Merge branch 'develop' into feature/tree视图表格样式修改 WEB许何哲\xuhez 2023-08-08 14:43:48 +08:00
  • 0e292ea597 调试线上sf的bug WEB许何哲\xuhez 2023-08-08 14:42:10 +08:00
  • b3f2065edd 夹具物料注册 jinling.yang 2023-08-07 17:29:17 +08:00
  • 7fb585dfdd Accept Merge Request #303: (feature/tree视图表格样式修改 -> develop) Merge Request: 标签页筛选完后看板视图的样式修改 许何哲 2023-08-07 16:58:41 +08:00
  • 194bb28085 Merge branch 'develop' into feature/tree视图表格样式修改 WEB许何哲\xuhez 2023-08-07 16:51:09 +08:00
  • 46f40ec480 修改标签页筛选完后看板视图的样式 WEB许何哲\xuhez 2023-08-07 16:49:36 +08:00
  • a99fe44408 Accept Merge Request #302: (feature/修改设备模块 -> develop) Merge Request: 修改设备基础参数以及同步方法 龚启豪 2023-08-07 16:06:08 +08:00
  • 432920b100 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 qihao.gong@jikimo.com 2023-08-07 16:03:13 +08:00
  • f0e1939b95 修改设备参数以及机床型号基础参数以及同步cloud方法 qihao.gong@jikimo.com 2023-08-07 16:00:26 +08:00
  • f85a0e4c85 删除searchPannel WEB许何哲\xuhez 2023-08-07 15:06:35 +08:00
  • 578d9c46d9 Merge branch 'develop' into feature/tree视图表格样式修改 WEB许何哲\xuhez 2023-08-07 14:51:55 +08:00
  • 5a28ec7579 工作中心看板视图标签页的动态添加并实现点击筛选 WEB许何哲\xuhez 2023-08-07 14:48:55 +08:00
  • d971cbd5f1 Accept Merge Request #301: (feature/坯料排程 -> develop) Merge Request: 看板视图一句标签进行筛选基础功能已完成 马广威 2023-08-07 14:39:48 +08:00
  • 72a0be3a54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 mgw 2023-08-07 14:38:18 +08:00
  • 5f04cbb896 看板视图css调整（老许做的） mgw 2023-08-07 14:37:58 +08:00
  • 4f893929ca 工作中心看板视图动态添加标签页并可初步进行点击晒选 mgw 2023-08-07 10:50:44 +08:00
  • de32f5db78 看板视图筛选实现功能的条件已具备（看板已抠，字段存在），待优化 mgw 2023-08-07 08:58:50 +08:00
  • aa7e39c28a 新增采购入库时实时注册夹具产品到cloud jinling.yang 2023-08-04 17:33:21 +08:00
  • 0838ff417f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 qihao.gong@jikimo.com 2023-08-04 17:32:09 +08:00
  • 2321304e2a 修改设备 qihao.gong@jikimo.com 2023-08-04 17:31:47 +08:00
  • 1910b461f3 Accept Merge Request #300: (feature/刀具管理 -> develop) Merge Request: 优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题 禹翔辉 2023-08-04 16:54:36 +08:00
  • 2a1b39b0fb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-08-04 16:24:43 +08:00
  • cd042a8073 优化了功能刀具组装对象组装和取消组装时功能刀具列表的many2many类型字段赋值为[]时值不修改的问题 yuxianghui 2023-08-04 16:24:12 +08:00
  • c75e1b3c19 Accept Merge Request #299: (feature/刀具管理 -> develop) Merge Request: 优化了功能刀具组装出库bug，优化了功能刀具组装对象组装旧刀具时的bug 禹翔辉 2023-08-04 10:43:02 +08:00
  • 7f6ea605d2 优化了功能刀具组装出库bug，优化了功能刀具组装对象组装旧刀具时的bug yuxianghui 2023-08-04 10:40:35 +08:00
  • 9203f13161 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-08-04 09:20:31 +08:00
  • cb011a9bd7 Accept Merge Request #298: (feature/tree视图表格样式修改 -> develop) Merge Request: sf工作中心看板视图标签页的动态添加 许何哲 2023-08-03 17:36:29 +08:00
  • da7184d841 Merge branch 'develop' into feature/tree视图表格样式修改 WEB许何哲\xuhez 2023-08-03 17:34:54 +08:00
  • 921336ad13 no message WEB许何哲\xuhez 2023-08-03 17:32:43 +08:00
  • 17476fdcf4 工作中心看板视图动态添加标签页 WEB许何哲\xuhez 2023-08-03 17:31:11 +08:00
  • fe310de31d 新增功能刀具列表缓存对象，新增组装旧刀是创建缓存数据，新增取消组装时清除缓存数据 yuxianghui 2023-08-03 17:29:26 +08:00
  • d0fab40b03 Accept Merge Request #297: (feature/odoo16前端rpc拿取后端生产线数据 -> develop) Merge Request: 实现基础的rpc拿取后端生产线数据功能 马广威 2023-08-03 17:25:06 +08:00
  • 810ef41c05 实现基础的rpc拿取后端生产线数据功能 mgw 2023-08-03 17:24:37 +08:00
  • 30ad60c2c1 Accept Merge Request #296: (feature/夹具型号和功能夹具反向注册到cloud -> develop) Merge Request: 制造模块里的配置内的页面优化 杨金灵 2023-08-03 16:57:56 +08:00
  • 5df00e14da 制造模块里的配置内的页面优化 jinling.yang 2023-08-03 16:57:18 +08:00
  • 1929fb1b57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud jinling.yang 2023-08-03 15:58:18 +08:00
  • 06bb0f77c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud jinling.yang 2023-08-03 15:57:38 +08:00
  • aed5ac4c3d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-08-03 14:31:46 +08:00
  • 03cc5b2281 新增功能刀具组装对象取消组装时删除组装时所创建的功能刀具列表信息，删除了功能刀具组装对象组装时创建功能刀具预警、实时分布、出入库记录信息的功能。 yuxianghui 2023-08-03 14:31:16 +08:00
  • 8c963be133 Accept Merge Request #295: (feature/odoo16翻译研究 -> develop) Merge Request: 优化未生效翻译 马广威 2023-08-03 13:06:19 +08:00
  • 1afd164712 优化未生效翻译 mgw 2023-08-03 13:05:49 +08:00
  • 0eedca58e9 Accept Merge Request #294: (feature/odoo16翻译研究 -> develop) Merge Request: 新增翻译问题解决 马广威 2023-08-03 11:58:53 +08:00