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

Commit Graph

  • 0cf3e6e7d6 Accept Merge Request #767: (feature/修复供应商重复验证 -> develop) 杨金灵 2024-01-10 17:18:40 +08:00
  • 027537080d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复供应商重复验证 jinling.yang 2024-01-10 16:43:58 +08:00
  • 95d29bb20d 修复供应商名称，税，邮箱重复验证问题 jinling.yang 2024-01-10 16:43:28 +08:00
  • 461bc1f86e Accept Merge Request #766: (feature/修改机床参数bug -> develop) 龚启豪 2024-01-10 15:50:57 +08:00
  • 1bc09a4424 制造订单 qihao.gong@jikimo.com 2024-01-10 15:50:09 +08:00
  • e6866552bc 处理CNC文件下发失败的bug qihao.gong@jikimo.com 2024-01-10 15:48:03 +08:00
  • fd7b0630fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-10 15:28:08 +08:00
  • 6e6575eadb Merge branch 'feature/修复采购库存销售模块问题' into develop jinling.yang 2024-01-10 15:27:19 +08:00
  • cc6ec38bfa Accept Merge Request #765: (feature/修复采购库存销售模块问题 -> develop) 杨金灵 2024-01-10 15:27:01 +08:00
  • 8eefbeba54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题 jinling.yang 2024-01-10 15:25:19 +08:00
  • 94a24bb469 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-10 15:24:55 +08:00
  • 82c0269761 1.材料型号新增获取方式和供应商的输入验证2.每齿走刀量去掉切削速度字段 jinling.yang 2024-01-10 15:24:31 +08:00
  • 631f72bfe9 Accept Merge Request #764: (feature/制造代码优化 -> develop) 马广威 2024-01-10 12:20:49 +08:00
  • b5147678b1 修复排程时，工单时间未生成的问题 mgw 2024-01-10 12:20:03 +08:00
  • 9047e54afa Accept Merge Request #763: (feature/修复采购库存销售模块问题 -> develop) 杨金灵 2024-01-09 17:34:53 +08:00
  • 8a15ce12d9 修复销售总监创建报价单时在其他信息中不能选择其他销售人员 jinling.yang 2024-01-09 17:05:35 +08:00
  • 4c3e7e40cb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题 jinling.yang 2024-01-09 16:55:19 +08:00
  • 128dd60a89 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-09 16:54:33 +08:00
  • f82cb462cf 1.去掉警告2.销售订单详情显示进度状态字段3.修复采购权限组没有存库模块包括以内的相关菜单的访问权限 jinling.yang 2024-01-09 16:54:16 +08:00
  • 7f6025afc0 Accept Merge Request #762: (feature/制造代码优化 -> develop) 马广威 2024-01-09 16:10:24 +08:00
  • 9bbe3f28a5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-09 16:08:18 +08:00
  • 3f2a13448d 修改一些访问权限 mgw 2024-01-09 16:02:41 +08:00
  • e11976bb61 Accept Merge Request #761: (feature/制造代码优化 -> develop) 马广威 2024-01-09 14:52:17 +08:00
  • 00541c1c8f Accept Merge Request #760: (feature/修改机床参数bug -> develop) 龚启豪 2024-01-09 14:50:20 +08:00
  • cac7815369 处理引入缺失报错 qihao.gong@jikimo.com 2024-01-09 14:47:06 +08:00
  • c336230287 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-09 14:17:50 +08:00
  • 1a896a730e 拉取最新代码 qihao.gong@jikimo.com 2024-01-09 14:17:38 +08:00
  • eaad8337d4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-09 14:16:41 +08:00
  • b4ee93bc5a Merge branch 'feature/修复采购按钮显示及产品字段问题' into develop jinling.yang 2024-01-09 12:22:37 +08:00
  • 3919290985 Accept Merge Request #759: (feature/修复采购按钮显示及产品字段问题 -> develop) 杨金灵 2024-01-09 12:22:13 +08:00
  • ec3f00f4a3 去掉待删除字段 jinling.yang 2024-01-09 12:05:14 +08:00
  • f15ac2c7fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-09 12:03:15 +08:00
  • cc9e6fa3d1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购按钮显示及产品字段问题 jinling.yang 2024-01-09 12:01:47 +08:00
  • 3c3ffa1ebc 1.修复采购订单确认按钮显示问题2.修复涉及适合冷却方式字段的相关模型内该字段的过滤查询条件3.修改产品的适合刀柄型号字段类型4.修改销售订单的输入验证 jinling.yang 2024-01-09 12:01:20 +08:00
  • 776515a861 Accept Merge Request #758: (feature/功能刀具新增字段 -> develop) 禹翔辉 2024-01-09 11:18:04 +08:00
  • 8332c5d141 1、删除产品中和夹具相关的无用代码；2、添加夹具型号和联装类型必填判断条件 yuxianghui 2024-01-09 11:15:48 +08:00
  • e6c77e7b35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-09 10:38:40 +08:00
  • 1fab9ad253 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-09 10:36:13 +08:00
  • e4de4f2af0 Accept Merge Request #757: (feature/功能刀具新增字段 -> develop) 禹翔辉 2024-01-09 10:35:51 +08:00
  • afdfde245a Merge remote-tracking branch 'origin/feature/产品添加夹具型号信息' into feature/功能刀具新增字段 yuxianghui 2024-01-09 10:33:16 +08:00
  • 86366cc6cb 修改工单完成后，自动完成制造订单，完工产品就绪状态 qihao.gong@jikimo.com 2024-01-09 10:31:43 +08:00
  • 4e6a66c681 1、删除功能刀具组装单的加工工厂字段 yuxianghui 2024-01-09 10:30:18 +08:00
  • f5805ce6ae 修改标签翻译 mgw 2024-01-09 10:11:13 +08:00
  • 8239e53a76 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-09 09:45:40 +08:00
  • bbaede2166 Merge branch 'feature/修复销售和采购' into develop jinling.yang 2024-01-09 09:45:24 +08:00
  • 6e68611f6e Accept Merge Request #756: (feature/修复销售和采购 -> develop) 杨金灵 2024-01-09 09:44:53 +08:00
  • 31dd710f6a 修改确认按钮名称 jinling.yang 2024-01-09 09:40:56 +08:00
  • 8b2b58dfa1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售和采购 jinling.yang 2024-01-09 09:32:30 +08:00
  • 84f62ebe1c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-09 09:32:10 +08:00
  • ce2f8714d0 修复bug jinling.yang 2024-01-09 09:31:44 +08:00
  • 931b78ee03 修复批量排程缺少工具包的问题 mgw 2024-01-08 23:24:42 +08:00
  • 61554bf3e5 Accept Merge Request #755: (feature/制造代码优化 -> develop) 马广威 2024-01-08 19:52:10 +08:00
  • 0b070de19c 去掉tree视图的schedule_state字段 mgw 2024-01-08 19:34:24 +08:00
  • 7077b8a297 Accept Merge Request #754: (feature/制造代码优化 -> develop) 马广威 2024-01-08 19:06:45 +08:00
  • e8995acc87 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-08 19:03:34 +08:00
  • fbaa81fe7a 修改制造订单的状态字段以及与排程单的交互逻辑，优化一些翻译 mgw 2024-01-08 19:02:59 +08:00
  • 3742a3b163 修改自动完成制造订单得方法，完工产品捡取需变成就绪状态 qihao.gong@jikimo.com 2024-01-08 17:51:16 +08:00
  • 498e1c12af 1、所有功能刀具相关模型添加刀具组字段对象，并且功能刀具名称根据规则自动生成；2、功能刀具组装时按规则自动生成功能刀具编码； yuxianghui 2024-01-08 17:42:34 +08:00
  • 317b5d4ced Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-08 16:39:15 +08:00
  • 3c65b3e3df Accept Merge Request #753: (feature/前端样式修改 -> develop) 黄焱 2024-01-08 16:33:13 +08:00
  • 4dde30f9f9 修改sf表格样式 黄焱 2024-01-08 16:28:49 +08:00
  • 631d59f95e 处理本地报错 qihao.gong@jikimo.com 2024-01-08 16:18:15 +08:00
  • 8928d497ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-08 16:12:31 +08:00
  • 99b1d5f534 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-08 15:56:44 +08:00
  • 61d13b90dc Merge branch 'feature/优化刀具基本参数同步' into develop jinling.yang 2024-01-08 15:56:22 +08:00
  • 31bb7f0c97 Accept Merge Request #752: (feature/优化刀具基本参数同步 -> develop) 杨金灵 2024-01-08 15:56:06 +08:00
  • d980a036cd 还原代码 jinling.yang 2024-01-08 15:52:33 +08:00
  • f8c6c766cb 优化刀具模版和刀具标准库 jinling.yang 2024-01-08 15:44:16 +08:00
  • 41fe63d948 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-08 15:30:05 +08:00
  • ce53afe1b0 修改权限组访问权限 qihao.gong@jikimo.com 2024-01-08 15:29:48 +08:00
  • bc4a4df53e tree视图中的"批量排程"按钮优化为向导的实现方式 mgw 2024-01-08 14:52:29 +08:00
  • 3f448bc6da Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步 jinling.yang 2024-01-08 10:08:50 +08:00
  • d1c10f56d1 1、sf_base新增刀具组模型；2、所以功能刀具相关模型添加刀具组对象字段（进行中）； yuxianghui 2024-01-05 17:33:06 +08:00
  • edf4699e9e 1.新增每日同步切削速度和每齿走刀量及切削宽度和深度的接口 2.优化产品模版 jinling.yang 2024-01-05 17:30:13 +08:00
  • ad025eb6da Accept Merge Request #751: (feature/产品添加夹具型号信息 -> develop) 禹翔辉 2024-01-05 14:48:11 +08:00
  • e5bf0d8205 Merge remote-tracking branch 'origin/feature/夹具型号同步' into feature/产品添加夹具型号信息 yuxianghui 2024-01-05 14:43:48 +08:00
  • 831a91c925 1、产品新添七种夹具物料前端字段完成布局展示；2、产品选取夹具型号规格后自动带入规格数据到产品夹具物料参数； yuxianghui 2024-01-05 14:42:38 +08:00
  • bc3325bd3b Accept Merge Request #750: (feature/前端样式修改 -> develop) 黄焱 2024-01-05 14:13:52 +08:00
  • e29883d0de 修改表格，等样式 黄焱 2024-01-05 14:10:43 +08:00
  • 5b9b700372 Accept Merge Request #749: (feature/修改机床参数bug -> develop) 龚启豪 2024-01-05 14:03:31 +08:00
  • c81dc99aef 修改获取CNC程序从工单到制造订单 qihao.gong@jikimo.com 2024-01-05 11:23:27 +08:00
  • c0a3a550d7 Accept Merge Request #748: (feature/制造代码优化 -> develop) 马广威 2024-01-05 10:29:32 +08:00
  • 0c67b2b659 修复设备清单无法被计划人员看到的问题 mgw 2024-01-05 10:22:48 +08:00
  • 974b112b3a 优化设备、库存权限相关问题 mgw 2024-01-05 08:53:39 +08:00
  • 57f5d138e8 1、修改夹装单元数修改成装夹单元数；2、重构产品的夹具物料信息(进行中)；3、完善夹具物料的同步功能； yuxianghui 2024-01-04 17:44:22 +08:00
  • 2b117e9192 产品序列号权限优化 mgw 2024-01-04 11:39:38 +08:00
  • 688a39363b Accept Merge Request #747: (feature/制造代码优化 -> develop) 马广威 2024-01-04 08:56:12 +08:00
  • 9443a07eb4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-04 08:54:12 +08:00
  • ce58e989dd 基本的批量排程已实现 mgw 2024-01-04 08:51:25 +08:00
  • b9bb528db0 客户列表公司类型卡片增加税ID，计划处tree视图增加批量排程button mgw 2024-01-03 23:03:08 +08:00
  • da8cbe4cce 1.修改刀具标准库同步6个物料的方法 2.刀具基础参数的刃数和刀片的刃数两个字段新增选项，新增active字段，xml中修改适配刀片型号字段 jinling.yang 2024-01-03 17:41:44 +08:00
  • ce69127250 1、夹具型号同步(进行中)；2、删除功能刀具组装的功能刀具切削类型字段； yuxianghui 2024-01-03 17:31:16 +08:00
  • 583f6503ec 修改cnc获取在制造订单的逻辑，制造订单所有工单完成时 制造订单自动完成，以及组件自动消耗掉 qihao.gong@jikimo.com 2024-01-03 17:29:37 +08:00
  • 7f050b62f9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步 jinling.yang 2024-01-03 14:39:20 +08:00
  • 5d09d1585b Accept Merge Request #746: (feature/权限修复 -> develop) 杨金灵 2024-01-03 11:52:12 +08:00
  • f373003d2c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限修复 jinling.yang 2024-01-03 11:42:41 +08:00
  • 45e8e380db 修复销售质量采购bug jinling.yang 2024-01-03 11:42:23 +08:00
  • c2263c9318 Accept Merge Request #745: (feature/功能刀具相关模型及组装流程优化 -> develop) 禹翔辉 2024-01-03 09:40:23 +08:00
  • f09a6cde3e Merge remote-tracking branch 'origin/feature/功能刀具优化' into feature/功能刀具相关模型及组装流程优化 yuxianghui 2024-01-03 09:37:36 +08:00
  • ccdbfda019 优化代码，修复检测人功能 mgw 2024-01-02 17:55:02 +08:00