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

Commit Graph

  • 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
  • ec9435bb82 修复销售和采购的部分bug jinling.yang 2024-01-02 17:42:06 +08:00
  • 77db3d57c9 设备类别非必填 qihao.gong@jikimo.com 2024-01-02 17:31:48 +08:00
  • 73c3e06900 1、修改所以夹具物料信息转接板夹具为转接板(锁板)夹具；2、优化功能刀具安全库存触发生成功能刀具组装单时重复触发的问题；3、设置功能刀具安全库存模型相关字段只有在创建的时候可以修改，其他时候是只读；4、优化功能刀具组装单组装完成后功能刀具入库位置不是刀具房的问题； yuxianghui 2024-01-02 17:25:49 +08:00
  • 56d8190fc6 修改业务逻辑:当主制造订单排程后，子bom自动改状态为已排 mgw 2024-01-02 11:47:40 +08:00
  • 7fe7de46c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-02 10:01:24 +08:00
  • 2339f75517 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-12-29 15:28:40 +08:00
  • 8ec038847a 优化权限 mgw 2023-12-29 15:28:15 +08:00
  • e1118bd579 Accept Merge Request #744: (feature/功能刀具优化 -> develop) 禹翔辉 2023-12-29 14:20:35 +08:00
  • c9af7a8cc4 Merge remote-tracking branch 'origin/feature/夹具型号优化' into feature/功能刀具优化 yuxianghui 2023-12-29 14:18:39 +08:00
  • 4ab7e4db0f 1、优化字段显示问题 yuxianghui 2023-12-29 14:17:32 +08:00
  • 939a255c2e 修改设备注册接口 qihao.gong@jikimo.com 2023-12-29 14:17:27 +08:00
  • fbf86a69e3 1.采购订单Tree列表新增审核状态 feature/还原产品页面代码 jinling.yang 2023-12-29 11:24:48 +08:00
  • 1cf5cd41b4 1.刀具基本参数新增适配夹头尺寸字段，2.优化采购订单确认订单方法 jinling.yang 2023-12-29 09:31:41 +08:00
  • 860e16659c Accept Merge Request #743: (feature/前端样式修改 -> develop) 黄焱 2023-12-28 17:48:59 +08:00
  • e9987fdcfa // 加工能力\冷却方式 竖列展示改为横列展示 黄焱 2023-12-28 17:44:51 +08:00
  • 98847a2c42 处理设备控制bug qihao.gong@jikimo.com 2023-12-28 17:38:56 +08:00
  • f81bf760d4 Accept Merge Request #742: (feature/夹具型号优化 -> develop) 禹翔辉 2023-12-28 17:09:00 +08:00
  • b2bb2e33de 1、新增夹具物料基本参数模型，重构工厂的夹具型号模型，重新优化夹具物料form视图；2、优化刀具标准库模型，优化切削速度模型，优化每齿走刀量模型，新增切削宽度和深度模型，新增坡铣角度模型；3、优化功能刀具安全库存最低安全库存可以高于最高库存的bug； yuxianghui 2023-12-28 17:06:34 +08:00
  • 8be6373b77 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化刀具基本参数同步 jinling.yang 2023-12-28 16:39:09 +08:00
  • f3ec784383 还原产品页面代码 jinling.yang 2023-12-28 16:38:37 +08:00
  • a9c2d1aa5c 1.新增刀具物料参数的同步接口及方法 2.修改刀具物料参数的适配刀片型号及适配刀柄型号字段类型及新增刀柄长度，刀柄直径，法兰直径，动平衡等级，适配夹头型号,适用锁紧螺母型号,编码字段 jinling.yang 2023-12-28 16:27:40 +08:00
  • 8e61d5f87c 优化权限相关 mgw 2023-12-28 10:50:44 +08:00
  • 032b13b2ad Accept Merge Request #741: (feature/制造代码优化 -> develop) 马广威 2023-12-28 09:00:56 +08:00
  • e33ca7cd33 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-12-27 17:23:25 +08:00
  • 3a7a6e480a 修复image小组件图片路径拼接失败的问题 mgw 2023-12-27 17:23:05 +08:00
  • 51b67c0dcd Accept Merge Request #740: (feature/修复销售库存权限 -> develop) 杨金灵 2023-12-27 15:50:23 +08:00
  • 8124818bad 修复销售库存访问权限 jinling.yang 2023-12-27 15:48:48 +08:00
  • 3a62d4406f Accept Merge Request #739: (feature/修复销售和质量权限 -> develop) 杨金灵 2023-12-27 15:00:38 +08:00
  • 8b8b30602b Accept Merge Request #738: (feature/修改机床参数bug -> develop) 龚启豪 2023-12-27 14:51:18 +08:00
  • 7a5fcd79d8 修改功能刀具安全库存的创建权限 jinling.yang 2023-12-27 14:42:43 +08:00
  • 93fe4d8c62 区分tree和form继承视图 qihao.gong@jikimo.com 2023-12-27 14:41:53 +08:00
  • cdeec93e76 产品增加销售的权限组的访问权限，质量标签和质量理由增加质量的权限组的访问权限 jinling.yang 2023-12-27 10:18:09 +08:00
  • 1a2d9592d1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-26 14:22:48 +08:00
  • 71a64c36ca Merge branch 'feature/修复刀具管理模块' into develop jinling.yang 2023-12-26 14:22:32 +08:00
  • 5f026e3b1e Accept Merge Request #737: (feature/修复刀具管理模块 -> develop) 杨金灵 2023-12-26 14:22:04 +08:00
  • d50f8716b5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复刀具管理模块 jinling.yang 2023-12-26 14:17:38 +08:00
  • 6cd2637983 1.修复客户和用户的name_search方法2.销售的采购经理权限组代码还原查询销售订单3.新增销售的权限组访问标签权限4.刀具管理去掉引用样式css文件 jinling.yang 2023-12-26 14:17:25 +08:00
  • ab91ce01d4 Accept Merge Request #736: (feature/制造代码优化 -> develop) 马广威 2023-12-26 09:40:32 +08:00
  • 8f1897c4ff 修复配置文件问题 mgw 2023-12-26 09:39:52 +08:00
  • 1e2c80c38f Accept Merge Request #735: (feature/修改数据库 -> develop) 杨金灵 2023-12-25 17:32:45 +08:00
  • db8ad0f425 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改数据库 jinling.yang 2023-12-25 17:31:13 +08:00
  • eedce8338b 1.修改数据库2.数据库去掉demo数据指令3.工单的获取cnc车程序按钮代码还原 jinling.yang 2023-12-25 17:30:32 +08:00
  • b132cb8713 Accept Merge Request #734: (feature/制造代码优化 -> develop) 马广威 2023-12-25 16:08:04 +08:00
  • 66d6fe8f0a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-12-25 16:07:23 +08:00
  • 97e57f9b3c 修复权限，修改数据库名称 mgw 2023-12-25 16:05:23 +08:00
  • 57cfa56081 Accept Merge Request #733: (feature/优化采购编辑 -> develop) 杨金灵 2023-12-25 16:03:59 +08:00
  • 1d464dd00e 新建数据库 jinling.yang 2023-12-25 16:01:25 +08:00
  • fdc38afcbd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化采购编辑 jinling.yang 2023-12-25 16:00:33 +08:00
  • 2e9dc3d006 采购总监查看审核状态不为空的询价/采购单 jinling.yang 2023-12-25 16:00:20 +08:00
  • c54a8308c6 Accept Merge Request #732: (feature/自动根据功能刀具安全库存创建组装单 -> develop) 禹翔辉 2023-12-25 15:40:59 +08:00
  • 1934708d78 Merge remote-tracking branch 'origin/feature/功能刀具组装流程bug优化' into feature/自动根据功能刀具安全库存创建组装单 yuxianghui 2023-12-25 15:38:45 +08:00
  • e7bfff491b 1、新增库存位置：功能刀具组装位置，2、完善根据功能刀具安全库存自动生成组装单功能。3、功能刀具组装tree视图新增默认筛选未组装状态记录 yuxianghui 2023-12-25 15:37:14 +08:00
  • 97e36c249b 1.产品新增计划岗权限，页面部分字段新增只读控制2.采购优化确认订单按钮 jinling.yang 2023-12-25 15:15:35 +08:00
  • 6d93d5ef87 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-25 11:35:17 +08:00
  • e8a0b3da93 Merge branch 'feature/优化客户' into develop jinling.yang 2023-12-25 11:34:37 +08:00
  • e9acd98ccc Accept Merge Request #730: (feature/优化客户 -> develop) 杨金灵 2023-12-25 11:34:24 +08:00
  • 535d69f4d9 Accept Merge Request #731: (feature/制造代码优化 -> develop) 马广威 2023-12-25 11:34:14 +08:00
  • 603a59b6d7 优化计划处代码 mgw 2023-12-25 11:33:39 +08:00
  • ca2f30fdbd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-25 11:06:28 +08:00
  • 4c92c08f84 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化客户 jinling.yang 2023-12-25 11:06:11 +08:00
  • 2fd8483a52 优化客户,供应商.销售订单和采购订单权限需求 jinling.yang 2023-12-25 11:05:56 +08:00
  • 71bdd6334f Accept Merge Request #729: (feature/制造代码优化 -> develop) 马广威 2023-12-25 09:41:00 +08:00
  • 194f6f52dc 代码优化 mgw 2023-12-25 09:40:04 +08:00
  • 93ce482d40 优化采购和销售 jinling.yang 2023-12-22 17:43:25 +08:00
  • 96c5c3dcf5 1、新增按照功能刀具安全库存数量自动触发创建功能刀具组装单； yuxianghui 2023-12-22 17:37:10 +08:00
  • 6bcf7ec53a Accept Merge Request #728: (feature/制造代码优化 -> develop) 马广威 2023-12-22 15:07:17 +08:00
  • a7d760bc5e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-12-22 15:00:30 +08:00
  • e196b6b1e3 优化权限相关展示 mgw 2023-12-22 14:58:39 +08:00
  • 9cb9872a5e Accept Merge Request #727: (feature/前端样式修改 -> develop) 黄焱 2023-12-21 17:57:18 +08:00
  • 58d4b3813b 销售1.新增进度状态字段，选项为：待排程、待加工、待发货、待收货、已收货， 2.销售和报价页面的所有按钮根据审核状态和状态做隐藏显示控制 3.销售订单Form和Tree视图新增进度状态字段,且form表单根据状态字段的值为销售和取消时，表单不可编辑 4.产品页面的所有按钮根据销售和采购的权限组做显示和隐藏控制 jinling.yang 2023-12-21 17:45:29 +08:00
  • 34d0e989d6 Accept Merge Request #726: (feature/修改机床参数bug -> develop) 龚启豪 2023-12-21 17:38:15 +08:00
  • c52af21477 1 qihao.gong@jikimo.com 2023-12-21 17:36:13 +08:00
  • 149d6778f5 放开注释 qihao.gong@jikimo.com 2023-12-21 17:28:55 +08:00
  • 98c9f3098b 工单详情处增加实际开始时间、实际结束时间，是否合格、加工人、检测人、实际加工机台等字段信息 mgw 2023-12-21 10:53:13 +08:00
  • ff904ad68c 权限暂存 mgw 2023-12-20 17:54:14 +08:00
  • 932f82ac6c 需求-客户、供应商视图展示优化 库存-库存概览界面的显示需优化 工厂端所有新建编辑页面的保存和取消按钮样式及文字要优化 【刀具组装】功能刀具组装单详情界面有个字段标题显示不全 制造-刀具管理-机床换刀申请界面标题显示重叠了 黄焱 2023-12-20 17:51:46 +08:00
  • bbb5ddb177 1.修复销售总监看不到销售订单2.优化销售审核向导3.优化销售 jinling.yang 2023-12-20 17:45:29 +08:00
  • 7cbbf58309 Accept Merge Request #724: (feature/功能刀具组装流程bug优化 -> develop) 禹翔辉 2023-12-20 15:26:32 +08:00
  • 8edee62d3a Merge remote-tracking branch 'origin/feature/换刀申请优化' into feature/功能刀具组装流程bug优化 yuxianghui 2023-12-20 15:22:59 +08:00
  • ce67b7985b 1、优化功能刀具组装和功能刀具组装弹窗界面的刀具物料信息，添加刀具物料规格字段；2、优化功能刀具组装确认功能，创建刀具组装入库作业时新增name字段内容，新增作业自动验证；3、优化自动生成功能刀具序列号方法 yuxianghui 2023-12-20 15:21:06 +08:00
  • ef47597cf9 1.强制必填字段 （1）【客户名称】、【税ID】、【Email】、【销售员】、【标签】为强制必填 （2）【电话】、【手机】两个字段控制为二选一强制必填 2.客户校验规则： （1）【客户名称】+【税ID】两个字段分别与已经创建客户的档案信息进行校验，任意一项100%吻合则不允许创建客户 3.强制必填字段 （1）【名称】、【Email】、【销售员】为强制必填 （2）【电话】、【手机】两个字段控制为二选一强制必填 4.个人校验规则： （1）【名称】+【Email】两个字段分别与已经创建客户的档案信息进行校验，两项一起100%吻合则不允许创建个人 5.下拉仅显示销售人员的账户用户名(非相关用户及姓名不显示)，字段为强制必填 jinling.yang 2023-12-19 17:48:30 +08:00
  • 9e8d5aaf6a 修改机床同步注册接口 qihao.gong@jikimo.com 2023-12-19 17:33:24 +08:00
  • 363463e31d 1、新增安装时自动配置刀具房位置，重新配置了刀具组装入库的作业类型，增加名称为刀具组装入库的参考序列配置；2、功能刀具所以的装刀长改为总长度；3、机床换刀申请和刀具组装单弹窗界面做字段必填控制，对新刀隐藏切削相关字段；4、刀具组装单弹窗增加一些字段的数值自动填写和计算； yuxianghui 2023-12-19 17:31:37 +08:00
  • 8ff635e901 优化计划中的菜单项目 mgw 2023-12-19 16:32:09 +08:00
  • c65e13a83e 修改设备类别以及机床参数 qihao.gong@jikimo.com 2023-12-18 17:38:24 +08:00
  • 8721bc2de1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-18 09:36:32 +08:00
  • ec344cc918 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-18 09:36:18 +08:00
  • 905df2b79e Accept Merge Request #723: (feature/制造代码优化 -> develop) 马广威 2023-12-17 10:52:59 +08:00
  • e73fb5791a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-12-17 10:50:18 +08:00
  • 6738a855bb 优化权限相关 mgw 2023-12-17 10:48:51 +08:00
  • 3c82020e5e Merge branch 'feature/修复销售权限组' into develop jinling.yang 2023-12-15 17:56:04 +08:00
  • 422074fcec Accept Merge Request #722: (feature/修复销售权限组 -> develop) 杨金灵 2023-12-15 17:53:41 +08:00
  • 897f5b76f0 修复质量的权限 jinling.yang 2023-12-15 17:49:33 +08:00
  • ee565d3796 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售权限组 jinling.yang 2023-12-15 17:39:16 +08:00
  • 912b50246a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-15 17:39:01 +08:00
  • df2ba048f4 1.修复采购权限和销售权限2.销售新增审核向导 jinling.yang 2023-12-15 17:38:40 +08:00
  • ef2f7d3ecb 修改机床设备参数，处理同步bug，以及机床设备视图布局 qihao.gong@jikimo.com 2023-12-15 17:28:42 +08:00
  • 2391c08485 修改i机床接口同步以及参数 qihao.gong@jikimo.com 2023-12-14 17:33:28 +08:00