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

Commit Graph

  • 81cae99093 屏蔽测试内容 mgw 2023-09-26 14:24:43 +08:00
  • 587daef6ee Merge branch 'feature/制造-计划优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-26 14:11:51 +08:00
  • 9217372097 调整代码结构 mgw 2023-09-26 14:09:25 +08:00
  • 256d86567e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-26 11:36:59 +08:00
  • 37541fdcd6 优化gantt的间隔为变量 mgw 2023-09-26 11:34:03 +08:00
  • b574175a56 调整菜单顺序，修改”开票“翻译为”应收应付“，增加背景图片 mgw 2023-09-26 11:31:14 +08:00
  • 8e13d2011c Accept Merge Request #404: (feature/sf看板样式统一 -> develop) Merge Request: 表头固定bug修改 许何哲 2023-09-25 15:12:03 +08:00
  • aba664375f 表头固定bug修改 WEB许何哲\xuhez 2023-09-25 15:10:50 +08:00
  • a50501e75e Accept Merge Request #403: (feature/功能刀具优化 -> develop) Merge Request: 计划管理模块和刀具管理模块优化 禹翔辉 2023-09-25 13:44:19 +08:00
  • 16534bb348 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化 yuxianghui 2023-09-25 13:43:27 +08:00
  • a538477272 1、计划管理-产线设备资源设置模块优化，工作日历设置模块优化，添加选择提示；2、刀具管理-功能刀具组装、列表、预警、实时分布、出入库记录和组装界面的刀具物料字段绑定对象更改为库存下的刀具物料；3、功能刀具组装-组装界面添加选择提示，4、功能刀具列表下的能力参数对没有选择的图片不展示 yuxianghui 2023-09-25 13:43:08 +08:00
  • 9c2d4dbc24 Accept Merge Request #402: (feature/sf看板样式统一 -> develop) Merge Request: 工作中心增加字段并调整样式 许何哲 2023-09-25 09:21:11 +08:00
  • 1acfefa555 Merge branch 'develop' into feature/sf看板样式统一 WEB许何哲\xuhez 2023-09-22 17:34:57 +08:00
  • 52a7e2d698 新时间尺度下pill已可正确展示（包括左边距和宽度） mgw 2023-09-22 17:34:45 +08:00
  • d8363f2637 看板添加字段并调整样式 WEB许何哲\xuhez 2023-09-22 17:33:56 +08:00
  • f42383fd10 Accept Merge Request #401: (feature/修改机床参数bug -> develop) Merge Request: 设备类别增加参数 龚启豪 2023-09-22 17:20:32 +08:00
  • c919f0724a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-22 17:01:28 +08:00
  • 681b769356 设备类别新增选项 qihao.gong@jikimo.com 2023-09-22 17:01:03 +08:00
  • cee39f3e1f 优化看板样式展示 mgw 2023-09-22 11:13:13 +08:00
  • 9dc653694a 修改前暂存 mgw 2023-09-22 09:31:56 +08:00
  • a9f51df151 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 jinling.yang 2023-09-21 16:11:04 +08:00
  • 3aa34ee0cf http权限代码优化 jinling.yang 2023-09-21 16:10:18 +08:00
  • cde801a837 Accept Merge Request #400: (feature/制造-计划优化 -> develop) Merge Request: 增加排程结果反馈给制造订单的功能 马广威 2023-09-21 14:33:32 +08:00
  • e9e25c582e 增加排程结果反馈给制造订单的功能 mgw 2023-09-21 14:32:05 +08:00
  • 90fa7c159a Accept Merge Request #399: (feature/功能刀具优化 -> develop) Merge Request: 功能刀具优化 禹翔辉 2023-09-19 17:32:33 +08:00
  • d4180df7e9 1、刀具管理模块下的功能刀具内的刀具物料字段类型从many2many更改为many2one，绑定对象从刀具型号更改为刀具物料；2、对功能刀具组装的组装功能和取消组装功能进行了逻辑优化；3、新增功能刀具组装弹窗对象的刀具物料信息根据所选功能刀具字段计算功能；4、关闭了功能刀具列表、预警、实时分布、出入库记录的创建、修改、删除功能；5、功能刀具列表对象新增刀具能力参数；6、优化了刀具管理模块的权限相关警告； yuxianghui 2023-09-19 16:14:29 +08:00
  • ab42bde8f2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 jinling.yang 2023-09-18 17:42:13 +08:00
  • a96c7a34c1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 jinling.yang 2023-09-18 17:40:30 +08:00
  • 0ac82acbad Accept Merge Request #398: (feature/修改机床参数bug -> develop) Merge Request: 优化sf容器 龚启豪 2023-09-18 10:41:33 +08:00
  • f03b77f9bb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-18 10:40:48 +08:00
  • dc796abd4a 优化sf容器 qihao.gong@jikimo.com 2023-09-18 10:40:29 +08:00
  • cf7551011e Accept Merge Request #397: (feature/修改机床参数bug -> develop) Merge Request: 优化sf容器 龚启豪 2023-09-18 10:08:31 +08:00
  • 586dc5dbe2 优化sf容器 qihao.gong@jikimo.com 2023-09-18 10:07:52 +08:00
  • 3dbc6f0d6a Accept Merge Request #396: (feature/sf看板样式统一 -> develop) Merge Request: 表头固定优化 许何哲 2023-09-15 17:18:30 +08:00
  • 0ae5d724d6 表头固定优化 WEB许何哲\xuhez 2023-09-15 17:15:35 +08:00
  • 2dcd9bef53 Accept Merge Request #395: (feature/sf看板样式统一 -> develop) Merge Request: 优化表头固定 许何哲 2023-09-15 14:44:50 +08:00
  • 38331f1501 优化表头固定 WEB许何哲\xuhez 2023-09-15 14:42:12 +08:00
  • e35b4af123 Accept Merge Request #394: (feature/修改机床参数bug -> develop) Merge Request: 取消注释occ 龚启豪 2023-09-15 14:37:14 +08:00
  • 618d4718c9 取消注释occ qihao.gong@jikimo.com 2023-09-15 14:36:29 +08:00
  • f36e9c3d99 Accept Merge Request #393: (feature/修改机床参数bug -> develop) Merge Request: BT50 龚启豪 2023-09-15 14:28:25 +08:00
  • 0de26c4f2f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-15 14:27:16 +08:00
  • d78fe872ae BT50 qihao.gong@jikimo.com 2023-09-15 14:26:04 +08:00
  • 3c25b829e2 Accept Merge Request #392: (feature/制造-计划优化 -> develop) Merge Request: 增加表头固定 马广威 2023-09-15 11:19:50 +08:00
  • fd60505eec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-15 11:17:32 +08:00
  • 42cc64db74 表头固定 mgw 2023-09-15 11:17:07 +08:00
  • 496fb40807 Accept Merge Request #391: (feature/sf看板样式统一 -> develop) Merge Request: 设备清单看板优化 许何哲 2023-09-15 11:16:50 +08:00
  • e3e717ea60 设备清单看板优化 WEB许何哲\xuhez 2023-09-15 11:15:40 +08:00
  • 1e29f7010a Accept Merge Request #390: (feature/制造-计划优化 -> develop) Merge Request: 工作中心看板、图文展示样式修改 马广威 2023-09-15 11:00:33 +08:00
  • c514af2511 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-15 10:59:28 +08:00
  • 6d4221a565 Accept Merge Request #389: (feature/刀具优化 -> develop) Merge Request: 解决功能刀具组装时选取刀具型号报错问题； 禹翔辉 2023-09-15 10:59:06 +08:00
  • 5148ad3952 工作中心看板样式修改 mgw 2023-09-15 10:58:53 +08:00
  • be3df9817c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化 yuxianghui 2023-09-15 10:57:19 +08:00
  • 95e095c184 解决功能刀具组装时选取刀具型号报错问题； yuxianghui 2023-09-15 10:56:58 +08:00
  • db5d9863b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-15 10:40:30 +08:00
  • 2cc03c21ed 优化图文展示样式 mgw 2023-09-15 10:37:20 +08:00
  • 480d628125 Accept Merge Request #388: (feature/刀具优化 -> develop) Merge Request: 修改机床换刀申请字段状态，新增选择字段提示； 禹翔辉 2023-09-15 09:52:01 +08:00
  • 9e212a2684 修改机床换刀申请字段状态，新增选择字段提示； yuxianghui 2023-09-15 09:51:53 +08:00
  • a7da1dbadd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 jinling.yang 2023-09-14 18:08:05 +08:00
  • 99f078fad9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-09-14 18:07:47 +08:00
  • 0445c3bbc4 Merge branch 'feature/页面优化' into develop jinling.yang 2023-09-14 18:07:35 +08:00
  • 23214ae6e6 Accept Merge Request #387: (feature/页面优化 -> develop) Merge Request: 优化销售和报价及快速订单 杨金灵 2023-09-14 18:07:07 +08:00
  • b966bdd8da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 jinling.yang 2023-09-14 18:04:41 +08:00
  • 5fa9d1e16e 1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里 2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间” 3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段 jinling.yang 2023-09-14 18:04:04 +08:00
  • c45c45607f Accept Merge Request #386: (feature/sf看板样式统一 -> develop) Merge Request: sf看板样式统一 许何哲 2023-09-14 17:25:37 +08:00
  • 69506af2ab sf看板样式统一 WEB许何哲\xuhez 2023-09-14 17:23:50 +08:00
  • 00cb9cb8db Accept Merge Request #385: (feature/修改机床参数bug -> develop) Merge Request: 维保计划关联维保项目many2many 龚启豪 2023-09-14 10:57:29 +08:00
  • 757a1ef102 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-14 10:56:03 +08:00
  • 5416ecb709 维保计划关联维保项目 qihao.gong@jikimo.com 2023-09-14 10:55:43 +08:00
  • 766771e435 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 jinling.yang 2023-09-14 09:47:14 +08:00
  • eb0d83aa3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 jinling.yang 2023-09-14 09:46:28 +08:00
  • 826119aea6 Accept Merge Request #384: (feature/刀具优化 -> develop) Merge Request: 解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。 禹翔辉 2023-09-14 09:45:22 +08:00
  • 650bf2cf86 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 jinling.yang 2023-09-14 09:30:48 +08:00
  • ad0603f921 报价和销售订单页面优化 jinling.yang 2023-09-14 09:29:03 +08:00
  • 4613dc791b Accept Merge Request #383: (feature/制造-计划优化 -> develop) Merge Request: 排产代码优化后合并 马广威 2023-09-14 09:19:49 +08:00
  • 6026244783 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-14 09:18:05 +08:00
  • 43d9c54626 优化代码结构 mgw 2023-09-14 09:17:38 +08:00
  • 400f4b6201 解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。 yuxianghui 2023-09-13 17:13:21 +08:00
  • ce62f90ede Accept Merge Request #382: (feature/修改机床参数bug -> develop) Merge Request: 设备图文展示 龚启豪 2023-09-13 16:54:29 +08:00
  • 778ce3e409 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-13 16:52:56 +08:00
  • 532e4a4c7a 设备图文展示 qihao.gong@jikimo.com 2023-09-13 16:52:40 +08:00
  • 4d9c0474e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-13 15:42:18 +08:00
  • c1739feabb 优化现有逻辑 mgw 2023-09-13 15:40:36 +08:00
  • 6dbdcd2eb9 Accept Merge Request #381: (feature/修改机床参数bug -> develop) Merge Request: 设备图文展示 龚启豪 2023-09-13 15:40:22 +08:00
  • 2e508c7a85 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-13 15:39:45 +08:00
  • e3b7d5ad02 设备图文展示 qihao.gong@jikimo.com 2023-09-13 15:39:27 +08:00
  • a65a3ecfbe Accept Merge Request #380: (feature/刀具优化 -> develop) Merge Request: 解决产品-整体式刀具-刃部直径字段数据同步问题。 禹翔辉 2023-09-13 15:24:20 +08:00
  • 1f0f7ae0c7 解决产品-整体式刀具-刃部直径字段数据同步问题。 yuxianghui 2023-09-13 15:21:51 +08:00
  • 0ffe66b501 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-09-13 14:32:51 +08:00
  • 9e424600bc 处理机床能力数据 qihao.gong@jikimo.com 2023-09-13 14:32:32 +08:00
  • f9e41f262c Accept Merge Request #379: (feature/刀具优化 -> develop) Merge Request: 刀具优化 禹翔辉 2023-09-12 17:38:20 +08:00
  • 7fcd079535 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具优化 yuxianghui 2023-09-12 17:37:08 +08:00
  • 165f961fb4 注释刀具管理-刀具物料查询-整体式刀具参数限制，调整整体式刀具参数位置，添加能力参数图文展示功能，直径类参数增加φ的前缀单位；注释产品-刀具参数-cutting_tool_screw。 yuxianghui 2023-09-12 17:36:45 +08:00
  • 2793bd2472 Accept Merge Request #378: (feature/刀具优化 -> develop) Merge Request: 放开配备螺丝参数注释 禹翔辉 2023-09-12 15:06:47 +08:00
  • f554c2073f 放开配备螺丝参数注释 yuxianghui 2023-09-12 15:06:21 +08:00
  • 3a9f408be2 Accept Merge Request #377: (feature/制造-计划优化 -> develop) Merge Request: 冗余菜单优化完成 马广威 2023-09-12 11:13:14 +08:00
  • 4bcb12d3f1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 mgw 2023-09-12 11:12:19 +08:00
  • 7cbaf7373a 冗余菜单处理完成 mgw 2023-09-12 11:12:00 +08:00
  • d6960c2717 Accept Merge Request #376: (feature/刀具优化 -> develop) Merge Request: 隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。 禹翔辉 2023-09-11 17:24:51 +08:00
  • cf7e6ea33d 隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。 yuxianghui 2023-09-11 17:21:32 +08:00
  • 49d41539b0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-09-08 17:28:58 +08:00