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

Commit Graph

  • 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
  • 95c57a3ffb 新增翻译问题解决 mgw 2023-08-03 11:55:46 +08:00
  • 48d673a48e Accept Merge Request #293: (feature/odoo16翻译研究 -> develop) Merge Request: 制造订单处字段调整完成，翻译优化完成 马广威 2023-08-02 18:04:16 +08:00
  • 3f3a72a905 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究 mgw 2023-08-02 18:03:41 +08:00
  • 3c934e3a4b 制造订单处字段调整完成，翻译优化完成 mgw 2023-08-02 18:01:28 +08:00
  • 24afa53028 新增功能夹具接口 jinling.yang 2023-08-02 17:35:09 +08:00
  • 5c2a9f62dc Accept Merge Request #292: (feature/刀具管理 -> develop) Merge Request: 优化了刀具管理-功能刀具组装的刀具物料字段，新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能 禹翔辉 2023-08-02 17:30:45 +08:00
  • 57de3f9456 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-08-02 17:29:31 +08:00
  • 6c001b6950 优化了刀具管理-功能刀具组装的刀具物料字段，新增功能刀具组装完成时新建功能刀具列表、预警、实时分布、出入库记录数据功能 yuxianghui 2023-08-02 17:29:02 +08:00
  • f940d1bf24 Accept Merge Request #291: (feature/odoo16翻译研究 -> develop) Merge Request: 补充部分未生效翻译 马广威 2023-08-02 10:18:11 +08:00
  • aaeab9a241 补充部分未生效翻译 mgw 2023-08-02 10:17:00 +08:00
  • 109674bdb5 修改 概述 为 生产线驾驶舱 mgw 2023-08-02 10:10:38 +08:00
  • 49e0c64dfd Accept Merge Request #290: (feature/odoo16翻译研究 -> develop) Merge Request: 修改设备处翻译 马广威 2023-08-02 10:00:08 +08:00
  • f71c437b46 修改设备处翻译 mgw 2023-08-02 09:59:13 +08:00
  • 26a6d01654 Accept Merge Request #289: (feature/odoo16翻译研究 -> develop) Merge Request: odoo16质量模块翻译本地测试完成 马广威 2023-08-02 09:33:41 +08:00
  • 1670b3fd78 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究 mgw 2023-08-02 09:31:56 +08:00
  • d7729028cf 质量模块的改造已完成，本地已测试 mgw 2023-08-02 09:31:06 +08:00
  • 858acf053e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-08-01 17:41:54 +08:00
  • d574925122 1、刀具管理-机床换刀申请、CAM工单程序用刀计划、功能刀具组装增加了机床、功能刀具和功能刀具类型字段的关联关系，增加了tree视图功能按键 2、优化了CAM工单程序用刀计划的按键功能 3、对三个对象的字段的可读性进行了调整 yuxianghui 2023-08-01 17:41:21 +08:00
  • 5c2e7c80da 1.产品模板优化：增加产品类别的搜索面板 2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口 3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显 jinling.yang 2023-08-01 17:39:40 +08:00
  • 6abafcaf68 设备处翻译优化完成 mgw 2023-08-01 17:15:30 +08:00
  • f6e50161c6 Accept Merge Request #288: (feature/产品增加搜索面板 -> develop) Merge Request: 产品新增搜索面板 杨金灵 2023-08-01 15:09:23 +08:00
  • 7c8e470199 产品新增搜索面板 jinling.yang 2023-08-01 15:08:32 +08:00
  • a4f511b47b Accept Merge Request #287: (feature/odoo16翻译研究 -> develop) Merge Request: 测试制造模块的翻译效果 马广威 2023-08-01 10:17:44 +08:00
  • 84aeb0d8eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究 mgw 2023-08-01 10:17:08 +08:00
  • 501756d4e7 测试制造模块更改后的翻译，本地已生效 mgw 2023-08-01 10:16:47 +08:00
  • 06630fb85e Accept Merge Request #286: (feature/修改设备模块 -> develop) Merge Request: 修改设备模块bug 龚启豪 2023-07-28 15:46:37 +08:00
  • 10fde2b175 Merge branch 'feature/修改设备基础参数' into develop qihao.gong@jikimo.com 2023-07-28 15:33:55 +08:00
  • 06de46c084 修改设备模块 qihao.gong@jikimo.com 2023-07-28 15:33:31 +08:00
  • 2b69524c57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 qihao.gong@jikimo.com 2023-07-28 15:32:37 +08:00
  • 7eca8110cf Accept Merge Request #285: (feature/同步的相关模型页面优化 -> develop) Merge Request: 同步的模型的页面不可增删改 杨金灵 2023-07-27 15:47:01 +08:00
  • 47b2e8c709 1.同步的模型的页面不可增删改 2.工单的物料里新增长宽高字段 jinling.yang 2023-07-27 15:45:45 +08:00
  • 6380e1ad0a Accept Merge Request #284: (feature/库存扫码研究 -> develop) Merge Request: 修改位置占用bug 马广威 2023-07-27 09:23:49 +08:00
  • 0e2973f01e 修改位置占用bug mgw 2023-07-27 09:21:24 +08:00
  • d7a7256929 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-07-26 18:57:56 +08:00
  • eebc4f7a63 Merge branch 'feature/Bug修复' into develop jinling.yang 2023-07-26 18:55:24 +08:00
  • 0f3f27ff26 Accept Merge Request #283: (feature/Bug修复 -> develop) Merge Request: 夹具优化 杨金灵 2023-07-26 18:54:18 +08:00
  • 21a69a1048 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复 jinling.yang 2023-07-26 18:52:56 +08:00
  • 7ee652d021 1.夹具物料,联装类型，功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段 2.品牌模型新增厂家型号字段 3.修复3D模型全屏展示及不显示模型Bug jinling.yang 2023-07-26 18:52:27 +08:00
  • 72b3e736c0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复 jinling.yang 2023-07-26 18:39:59 +08:00
  • 459a9c3fbb Accept Merge Request #282: (feature/修复粗心导致的同步bug -> develop) Merge Request: 修复同步bug 马广威 2023-07-26 16:53:36 +08:00
  • 7671830648 修复同步bug mgw 2023-07-26 16:52:56 +08:00
  • b1ea52cbe3 Accept Merge Request #281: (feature/修改缺陷 -> develop) Merge Request: 去掉自定义barcode，暂时取消功能刀具的同步 马广威 2023-07-26 15:27:09 +08:00
  • 503361a847 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷 mgw 2023-07-26 15:25:42 +08:00
  • bace7aa175 去掉自定义barcode，暂时取消同步功能刀具 mgw 2023-07-26 15:25:12 +08:00
  • fd7875b24e Accept Merge Request #280: (feature/刀具管理 -> develop) Merge Request: 刀具管理-功能刀具列表、预警、实时分布、出入库记录优化 禹翔辉 2023-07-26 15:19:50 +08:00
  • e5c5aa6cdd 刀具管理-新增功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象（tree视图、form视图已完成）；功能刀具管理对象修改为功能刀具列表对象，并优化了字段信息，优化了tree视图展示字段，新增form视图；解除了功能刀具列表对象与功能刀具对象的继承关系。 yuxianghui 2023-07-26 15:17:12 +08:00
  • 98f9269766 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-07-25 17:43:02 +08:00
  • d3c7f8cd56 新增了功能刀具列表的form视图，简化了tree视图字段 yuxianghui 2023-07-25 17:42:47 +08:00
  • f246827d3d 修改设备模块布局 qihao.gong@jikimo.com 2023-07-25 17:27:11 +08:00
  • bcec481268 Accept Merge Request #279: (feature/刀具管理 -> develop) Merge Request: 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图，简化了tree视图的字段 禹翔辉 2023-07-25 14:40:12 +08:00
  • 810ec1fd6c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-07-25 14:38:24 +08:00
  • fc2d77a0dc 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图，简化了tree视图的字段， yuxianghui 2023-07-25 14:38:06 +08:00
  • 65157e93a9 设备新需求（根据维保项目生成维保计划） qihao.gong@jikimo.com 2023-07-24 17:44:07 +08:00
  • a43e423c06 Accept Merge Request #278: (feature/修改设备基础参数 -> develop) Merge Request: 质量模块和库存扫码 龚启豪 2023-07-24 11:44:31 +08:00
  • abc7e1c8c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 qihao.gong@jikimo.com 2023-07-24 11:42:44 +08:00
  • 3c89404543 质量模块和库存扫码 qihao.gong@jikimo.com 2023-07-24 11:42:15 +08:00
  • ae2fdad4f1 1.物料page里的库存模型新增物料长宽高三个字段 2.修复功能夹具同步Bug 3.夹具物料新增不可删除控制 jinling.yang 2023-07-21 17:35:44 +08:00
  • 8d024ad625 修改sf设备修改过的需求 qihao.gong@jikimo.com 2023-07-21 17:15:43 +08:00
  • 24e9cc0658 Accept Merge Request #277: (feature/刀具管理 -> develop) Merge Request: 优化了刀具管理的功能刀具预警，功能刀具列表，功能刀具出入库记录，功能刀具实时分布的字段，优化了功能刀具预警界面显示错误问题 禹翔辉 2023-07-20 17:31:38 +08:00
  • b15d574d8b 优化了刀具管理的功能刀具预警，功能刀具列表，功能刀具出入库记录，功能刀具实时分布的字段，优化了功能刀具预警界面显示错误问题 yuxianghui 2023-07-20 17:29:03 +08:00
  • 507392b23e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-07-20 15:40:34 +08:00
  • 8765a00ead Accept Merge Request #276: (feature/夹具查询页面去掉创建按钮 -> develop) Merge Request: 夹具相关查询页面去掉创建按钮 杨金灵 2023-07-20 15:20:41 +08:00
  • 9334d5cdc8 夹具相关查询页面去掉创建按钮 jinling.yang 2023-07-20 15:19:09 +08:00
  • a94bc7073d 测试翻译项目是否生效 mgw 2023-07-20 12:12:17 +08:00
  • fe8402b856 Accept Merge Request #275: (feature/修改缺陷 -> develop) Merge Request: 修改功能刀具模块继承方式 马广威 2023-07-20 09:18:34 +08:00
  • b37656d4fe 修改功能刀具模块继承方式 mgw 2023-07-20 09:17:21 +08:00
  • 399aaa9e2d 修改功能刀具出入库记录的字段展示 yuxianghui 2023-07-19 17:30:40 +08:00
  • 80616bf9bd Accept Merge Request #274: (feature/修改设备基础参数 -> develop) Merge Request: 修改设备模块布局以及报错处理 龚启豪 2023-07-19 17:12:49 +08:00
  • 3832b9216f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 qihao.gong@jikimo.com 2023-07-19 17:11:07 +08:00
  • 9c556c5f40 修改设备布局 qihao.gong@jikimo.com 2023-07-19 17:10:49 +08:00
  • 532d5cbc6d Accept Merge Request #273: (feature/tree视图表格样式修改 -> develop) Merge Request: 修改表格样式css的选择器 许何哲 2023-07-19 14:50:04 +08:00
  • 292af4d1ef 修改表格样式css的选择器 WEB许何哲\xuhez 2023-07-19 14:49:42 +08:00
  • 4b16fc2ec5 Accept Merge Request #272: (feature/刀具管理 -> develop) Merge Request: 优化刀具管理的弹窗界面布局 禹翔辉 2023-07-19 11:26:15 +08:00
  • de0b37bf43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 yuxianghui 2023-07-19 11:24:25 +08:00
  • 89eec3250a 优化刀具管理弹窗界面的展示布局 yuxianghui 2023-07-19 11:24:05 +08:00
  • 07a06ae598 Accept Merge Request #271: (feature/tree视图表格样式修改 -> develop) Merge Request: tree视图表格样式修改 许何哲 2023-07-19 10:40:47 +08:00
  • 3b09297600 tree视图表格样式修改 WEB许何哲\xuhez 2023-07-19 10:40:15 +08:00
  • 1bae5ecb55 Accept Merge Request #270: (feature/修改缺陷 -> develop) Merge Request: sf处功能刀具修改及其同步，目录位置调整 马广威 2023-07-19 10:05:04 +08:00
  • e44e44df41 sf处功能刀具修改及其同步，目录位置调整 mgw 2023-07-19 10:03:53 +08:00
  • e6ecc6068d Accept Merge Request #269: (feature/tree视图表格中字段的样式修改 -> develop) Merge Request: tree视图表格中字段样式的修改 许何哲 2023-07-18 17:10:00 +08:00
  • a7028e00f9 tree视图表格中字段样式的修改 WEB许何哲\xuhez 2023-07-18 17:09:17 +08:00
  • 66f0097b80 Accept Merge Request #268: (feature/创建工作日历代码测试 -> develop) Merge Request: 工作日历设置---新增将中文的星期转换成英文的星期的方法，删除了大部分日志。 禹翔辉 2023-07-18 16:27:26 +08:00
  • b5484ecda6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试 yuxianghui 2023-07-18 16:27:42 +08:00
  • 2462c3774d 工作日历设置---新增将中文的星期转换成英文的星期的方法，删除了大部分日志。 yuxianghui 2023-07-18 16:27:24 +08:00
  • baf13117dc Accept Merge Request #267: (feature/夹具型号新增搜索面板 -> develop) Merge Request: 优化夹具型号功能 杨金灵 2023-07-18 16:21:16 +08:00
  • 988f70bf69 1.夹具型号新增搜索面板 2.夹具查询列表新增创建人和创建时间字段展示 jinling.yang 2023-07-18 16:20:09 +08:00
  • 4f60118f37 Accept Merge Request #266: (feature/创建工作日历代码测试 -> develop) Merge Request: 新增工作日历设置的日志 禹翔辉 2023-07-18 14:37:03 +08:00
  • b7e1bff0f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试 yuxianghui 2023-07-18 14:37:00 +08:00
  • a0758b4b61 新增工作日历设置的日志 yuxianghui 2023-07-18 14:36:44 +08:00
  • b614eed79d Accept Merge Request #265: (feature/修改logo图片 -> develop) Merge Request: 修改登录页面logo 许何哲 2023-07-18 11:36:41 +08:00
  • b22cc7f19f 修改登录页面logo WEB许何哲\xuhez 2023-07-18 11:36:12 +08:00
  • a11dcc16f0 Accept Merge Request #264: (feature/修改设备基础参数 -> develop) Merge Request: 修改设备菜单以及二级菜单结构 龚启豪 2023-07-18 10:48:29 +08:00
  • 8333a834fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 qihao.gong@jikimo.com 2023-07-18 10:47:43 +08:00
  • fc93d5c646 修改设备菜单名称以及二级目录结构 qihao.gong@jikimo.com 2023-07-18 10:47:23 +08:00
  • 92a04d5f2a Accept Merge Request #263: (feature/创建工作日历代码测试 -> develop) Merge Request: 优化产线设备资源设置的form视图界面名字显示 禹翔辉 2023-07-18 10:30:08 +08:00
  • ff0786def7 优化产线设备资源设置的form视图界面名字显示 yuxianghui 2023-07-18 10:30:01 +08:00
  • ad5a8c06a5 Accept Merge Request #262: (feature/创建工作日历代码测试 -> develop) Merge Request: 添加工作日历设置创建工作日历时的输出日志 禹翔辉 2023-07-18 09:45:15 +08:00
  • 4907f06183 添加工作日历设置创建工作日历时的输出日志 yuxianghui 2023-07-18 09:45:53 +08:00