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

Commit Graph

  • 41a9aa86a7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-11-15 16:21:52 +08:00
  • 2322758e50 wms路线规则动态选取 qihao.gong@jikimo.com 2023-11-15 16:21:40 +08:00
  • d216478679 调整这两个文件的__manifest__.py文件 mgw 2023-11-15 15:28:32 +08:00
  • b487ee127a Accept Merge Request #523: (feature/功能刀具组装优化 -> develop) 禹翔辉 2023-11-14 16:49:08 +08:00
  • 2a964bc30e 功能刀具组装刀具物料型号字段绑定对象更改为刀具标准库，并优化组装确认功能。 yuxianghui 2023-11-14 16:48:11 +08:00
  • d0132dbc3a Accept Merge Request #522: (feature/制造代码优化 -> develop) 马广威 2023-11-14 16:15:19 +08:00
  • acccb4b6f9 去掉sf_plan模块中的 工作中心计划 菜单 mgw 2023-11-14 15:42:54 +08:00
  • 48f75ad600 Accept Merge Request #521: (feature/制造代码优化 -> develop) 马广威 2023-11-14 12:22:12 +08:00
  • daeae46820 修改订单排程功能为通用方法，同时增加动态判断计划时间是否与获取cnc程序的时间冲突功能，如果冲突，时间自动延后1h;优化gantt显示 mgw 2023-11-14 12:21:08 +08:00
  • 77535fa70e Accept Merge Request #520: (feature/制造代码优化 -> develop) 马广威 2023-11-13 15:08:44 +08:00
  • 913780bc2b 修复gantt图修改日视图后其他视图的pill左移的bug。优化字段默认宽度的逻辑 mgw 2023-11-13 15:07:50 +08:00
  • f566fc1c08 Accept Merge Request #519: (feature/制造代码优化 -> develop) 马广威 2023-11-13 09:42:56 +08:00
  • a97ce9b0a7 修复订单状态回传的问题 mgw 2023-11-10 18:06:21 +08:00
  • d0e18fbd44 Accept Merge Request #518: (feature/制造代码优化 -> develop) 马广威 2023-11-10 16:29:16 +08:00
  • 3845041f7f 解决遗漏代码错误 mgw 2023-11-10 16:28:06 +08:00
  • f313a171cb Accept Merge Request #517: (feature/图文项目单选功能 -> develop) 马广威 2023-11-10 16:21:21 +08:00
  • 93731a4777 图文项目单选功能本地开发测试完成，推送线上测试 mgw 2023-11-10 16:20:48 +08:00
  • dba17d5c7a Accept Merge Request #516: (feature/制造优化 -> develop) 马广威 2023-11-10 16:13:11 +08:00
  • 2a984ba2c0 Accept Merge Request #515: (feature/修复单一制造 -> develop) 杨金灵 2023-11-09 16:32:48 +08:00
  • dbfd75b139 修复单一制造 jinling.yang 2023-11-09 16:30:05 +08:00
  • db1dc18c28 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化 mgw 2023-11-09 16:21:53 +08:00
  • 523f7a0942 梳理计划模块结构 mgw 2023-11-09 16:20:26 +08:00
  • 16b3df87c9 Accept Merge Request #514: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-09 11:35:15 +08:00
  • 8d952aa046 更换cs数据库 qihao.gong@jikimo.com 2023-11-09 11:34:20 +08:00
  • e3e253fab8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-11-09 09:44:41 +08:00
  • fe96004111 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化 mgw 2023-11-08 17:47:57 +08:00
  • 8483be5d2d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-08 17:44:45 +08:00
  • b6964e29bc Merge branch 'feature/去掉注释' into develop jinling.yang 2023-11-08 17:44:33 +08:00
  • 56d1a98c53 Accept Merge Request #513: (feature/去掉注释 -> develop) 杨金灵 2023-11-08 17:43:47 +08:00
  • 01f0902937 去掉注释，及修改转换3d模型文件的位置 jinling.yang 2023-11-08 17:41:18 +08:00
  • 6335c03cef 硬度相关字段的类型改为整数型 jinling.yang 2023-11-08 17:35:16 +08:00
  • 4f898dd8ce 去掉注释，硬度的字段类型改为整数型 jinling.yang 2023-11-08 17:29:38 +08:00
  • d012066428 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化 mgw 2023-11-08 17:21:07 +08:00
  • 4c57bbe791 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-08 17:20:07 +08:00
  • b8d590de6d Merge branch 'feature/整合产品和销售模块' into develop jinling.yang 2023-11-08 17:19:53 +08:00
  • 82a31c6f31 Accept Merge Request #512: (feature/整合产品和销售模块 -> develop) 杨金灵 2023-11-08 17:17:55 +08:00
  • 30a7f762c2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/整合产品和销售模块 jinling.yang 2023-11-08 17:14:01 +08:00
  • 3a1acb0f5a 整合所有模块依赖 jinling.yang 2023-11-08 17:13:18 +08:00
  • c0b759aa9d 优化代码 mgw 2023-11-08 11:24:05 +08:00
  • 7f5ac4ef90 Accept Merge Request #511: (feature/制造优化 -> develop) 马广威 2023-11-07 10:19:39 +08:00
  • f1c835800e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造优化 mgw 2023-11-07 10:17:52 +08:00
  • 77852900a3 增加排程后各工单时间预估功能 mgw 2023-11-07 10:17:06 +08:00
  • b2a9088354 修改路线规则 qihao.gong@jikimo.com 2023-11-03 15:48:42 +08:00
  • 3be0d1ffad Accept Merge Request #510: (feature/同步刀具标准库（刀杆） -> develop) 杨金灵 2023-11-03 10:44:46 +08:00
  • 686c049e52 修复刀具标准库 jinling.yang 2023-11-03 10:42:09 +08:00
  • 780dbd5dda Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-11-02 17:19:06 +08:00
  • 53ad002f3b Accept Merge Request #509: (feature/修复刀具标准库包含同步新增 -> develop) 杨金灵 2023-11-02 17:18:38 +08:00
  • 36270477d5 修复同步刀具标准库 jinling.yang 2023-11-02 17:17:34 +08:00
  • a45ee59a76 修改 qihao.gong@jikimo.com 2023-11-02 14:34:17 +08:00
  • d2782446b0 修改 qihao.gong@jikimo.com 2023-11-02 14:24:27 +08:00
  • eb835ae5c8 Accept Merge Request #508: (feature/去掉模型代码转换注释 -> develop) 杨金灵 2023-11-01 17:52:18 +08:00
  • 401103f17b 去掉模型代码转换注释 jinling.yang 2023-11-01 17:51:46 +08:00
  • e592d49983 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-01 17:49:28 +08:00
  • de0cb1ebbc Merge branch 'feature/刀具产品调取Cloud刀具标准库（10.11）' into develop jinling.yang 2023-11-01 17:49:16 +08:00
  • 8e91aec7f1 Accept Merge Request #507: (feature/刀具产品调取Cloud刀具标准库（10.11） -> develop) 杨金灵 2023-11-01 17:49:00 +08:00
  • 0b7dc6d09a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-11-01 17:46:24 +08:00
  • 108cb96ca5 修复刀具产品及同步刀具标准库 jinling.yang 2023-11-01 17:45:54 +08:00
  • 03efa01a85 Accept Merge Request #506: (feature/功能刀具组装优化 -> develop) 禹翔辉 2023-11-01 17:40:30 +08:00
  • ba19175472 Merge remote-tracking branch 'origin/feature/功能刀具' into feature/功能刀具组装优化 JIKIMO-YXH\xianghui 2023-11-01 17:39:21 +08:00
  • aa9464face Accept Merge Request #505: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-01 17:35:05 +08:00
  • 0c788df2f2 修改维保项目多图片展示 qihao.gong@jikimo.com 2023-11-01 17:33:50 +08:00
  • cbc9264b2c 1、优化CAM申请的组装单中功能刀具名称没有内容的问题，优化组装单等的form表名称问题；2、去除组装单弹窗输出语句 JIKIMO-YXH\xianghui 2023-11-01 17:26:23 +08:00
  • 82ce347ca4 Accept Merge Request #504: (feature/制造-计划优化 -> develop) 马广威 2023-11-01 17:10:53 +08:00
  • d13071272a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-11-01 16:53:15 +08:00
  • 74523c710f 本地测试优化完序号展示问题，准备线上测试 mgw 2023-11-01 16:52:26 +08:00
  • fc35ef687b 优化序号导致字段label变形的问题 mgw 2023-11-01 12:15:26 +08:00
  • a71d960e2d Accept Merge Request #503: (feature/功能刀具 -> develop) 禹翔辉 2023-11-01 09:44:00 +08:00
  • 0cbf01b9ec Merge remote-tracking branch 'origin/feature/功能刀具组装后' into feature/功能刀具 JIKIMO-YXH\xianghui 2023-11-01 09:26:04 +08:00
  • 869b389420 研究下载模板和列宽问题 mgw 2023-11-01 09:01:49 +08:00
  • d429a8b4b8 1、删除功能刀具缓存对象，删除出库弹窗对像，删除功能刀具组装、机台换刀申请和CAM换刀的界面跳转按钮，并在form界面添加管理界面字段；2、优化组装单编码的生成；3、将刀具管理下所以功能刀具相关的模型中的功能刀具名称字段改为绑定功能刀具产品对象，编码改为序列号并绑定产品序列号对象，4、优化刀具管理下的功能刀具界面，5、优化从组装申请到组装完成所以流程功能 JIKIMO-YXH\xianghui 2023-10-31 17:45:45 +08:00
  • deccb6e3cd 1、删除功能刀具组装的取消组装功能和出库功能；2、删除功能刀具组装单的单据来源跳转按钮；3、新增组装单编码字段和自动生成编码的方法；4、新增功能刀具序列号，绑定功能刀具产品序列号；5、完成功能刀具组装后的产品入库到位置【组装后】 JIKIMO-YXH\xianghui 2023-10-30 17:43:28 +08:00
  • 2a9c5276ab 优化刀具产品 jinling.yang 2023-10-30 17:32:16 +08:00
  • db0c83bd2b Accept Merge Request #502: (feature/制造-计划优化 -> develop) 马广威 2023-10-30 15:47:37 +08:00
  • f81ee155e7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-10-30 15:45:21 +08:00
  • 76368398ba 解决row number导致字段label变形的问题 mgw 2023-10-30 15:44:45 +08:00
  • 8e5fc5eb61 Accept Merge Request #500: (feature/修改机床参数bug -> develop) 龚启豪 2023-10-30 11:15:32 +08:00
  • a0804758f5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-30 11:14:42 +08:00
  • 4634393f6c 修改form全局宽度 qihao.gong@jikimo.com 2023-10-30 11:14:29 +08:00
  • 5ffe2ce0e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-30 10:48:13 +08:00
  • 911f464aca Accept Merge Request #501: (feature/修复获取编程单 -> develop) 杨金灵 2023-10-30 09:38:47 +08:00
  • 9f30a029c5 机床id改为设备id jinling.yang 2023-10-30 09:36:52 +08:00
  • 5b9fcb2e53 1、创建创建功能刀具该批次/序列号位置 JIKIMO-YXH\xianghui 2023-10-27 17:46:19 +08:00
  • 46807003e1 产品新增刀具物料为刀片，刀盘，刀杆，夹头，刀柄，相关联的字段，及对应页面的优化 jinling.yang 2023-10-27 17:44:12 +08:00
  • 593944cac2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-27 15:07:12 +08:00
  • 018b51e1e5 解决无法生成采购单的bug qihao.gong@jikimo.com 2023-10-27 15:06:49 +08:00
  • a29dbca0e4 Accept Merge Request #499: (feature/修改机床参数bug -> develop) Merge Request: 制造标准改成执行标准 龚启豪 2023-10-27 10:31:53 +08:00
  • 47a408d034 制造标准改成执行标准 qihao.gong@jikimo.com 2023-10-27 10:31:10 +08:00
  • d14120dfa2 Accept Merge Request #498: (feature/修改机床参数bug -> develop) Merge Request: 长宽高 龚启豪 2023-10-27 09:38:17 +08:00
  • b88c6a53ab 长宽高 qihao.gong@jikimo.com 2023-10-27 09:37:23 +08:00
  • e3d58c2a9e 1、优化产初始化生成功能刀具，解决作业类型无法选择功能刀具的问题；2、优化取消功能刀具组装功能；3、新增功能刀具组装确定后生成功能刀具序列号，生成刀具组装入库单 JIKIMO-YXH\xianghui 2023-10-26 17:39:33 +08:00
  • 04261036a5 Accept Merge Request #497: (feature/修改机床参数bug -> develop) Merge Request: 修改设备菜单默认展示页面 龚启豪 2023-10-26 17:34:01 +08:00
  • 0eaed68b82 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-10-26 17:32:15 +08:00
  • ccb53a61de 修改设备菜单默认展示页面 qihao.gong@jikimo.com 2023-10-26 17:32:00 +08:00
  • 4a01132b91 新增产品刀具参数里的走刀量 jinling.yang 2023-10-26 10:10:47 +08:00
  • 9fffcd4f04 新增规格改变事件 jinling.yang 2023-10-25 17:37:17 +08:00
  • ce86a66e92 1、新增产品初始化时生成功能刀具产品类别和功能刀具模版；2、新增库存初始化时生成组装后位置和刀具组装入库的作业类型。 JIKIMO-YXH\xianghui 2023-10-25 17:35:12 +08:00
  • 65dd8372dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） jinling.yang 2023-10-25 15:07:52 +08:00
  • 39f97131a2 1.去掉不要的代码2,.产品页面新增规格字段 jinling.yang 2023-10-25 15:07:29 +08:00
  • 7b471be4cf 洗澡基本参数回显 jinling.yang 2023-10-24 17:47:05 +08:00
  • 802bd4285c Accept Merge Request #496: (feature/修改机床参数bug -> develop) Merge Request: 修改设备日志列表展示 龚启豪 2023-10-24 17:32:39 +08:00