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

Commit Graph

  • 85ac3d7a3e 报价Tree视图筛选框去掉默认的我的报价的条件 jinling.yang 2023-12-13 17:30:40 +08:00
  • b96723d9a5 修复销售权限组 jinling.yang 2023-12-12 17:40:22 +08:00
  • 19b9db66d3 Accept Merge Request #721: (feature/换刀申请优化 -> develop) 禹翔辉 2023-12-11 17:10:28 +08:00
  • 8371875d62 放开机床换刀申请模块记录没有功能刀具信息时换刀申请按键的权限 yuxianghui 2023-12-11 15:41:31 +08:00
  • a3f6fdda2a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-11 14:54:23 +08:00
  • 4a10335379 Accept Merge Request #720: (feature/权限去掉继承 -> develop) 杨金灵 2023-12-11 14:51:36 +08:00
  • 1132acfa40 Accept Merge Request #719: (feature/刀具管理模块安装时更新数据 -> develop) 禹翔辉 2023-12-11 14:48:37 +08:00
  • 7138dab1b5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承 jinling.yang 2023-12-11 14:48:08 +08:00
  • 6bf3df0ef4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承 jinling.yang 2023-12-11 14:47:34 +08:00
  • 55594c119f 产品添加质量权限组访问权限 jinling.yang 2023-12-11 14:47:06 +08:00
  • 0a3bd37224 Accept Merge Request #718: (feature/制造代码优化 -> develop) 马广威 2023-12-11 14:46:23 +08:00
  • 60abdfb372 Merge remote-tracking branch 'origin/feature/CAM工单程序用刀计划重构' into feature/刀具管理模块安装时更新数据 yuxianghui 2023-12-11 14:46:16 +08:00
  • facdf5712a 修改京东物流寻单据部分逻辑 mgw 2023-12-11 14:45:55 +08:00
  • 94df139110 1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录 yuxianghui 2023-12-11 14:41:31 +08:00
  • e4f6bc4632 权限去掉继承 jinling.yang 2023-12-11 14:36:34 +08:00
  • 6f0dbe3625 Accept Merge Request #717: (feature/制造代码优化 -> develop) 马广威 2023-12-11 14:09:56 +08:00
  • c00cd5a00a 修改cs环境数据库为t环境数据库 mgw 2023-12-11 14:09:02 +08:00
  • b487b6fc40 Accept Merge Request #716: (feature/CAM工单程序用刀计划重构 -> develop) 禹翔辉 2023-12-08 17:34:02 +08:00
  • 8489a67e64 Merge remote-tracking branch 'origin/feature/机床换刀申请优化' into feature/CAM工单程序用刀计划重构 yuxianghui 2023-12-08 17:31:54 +08:00
  • f8426ae4c3 1、重构CAM工单程序用刀计划模型；2、机床换刀申请模型的申请换刀、转移按键增加显示条件，关闭换刀申请弹窗和功能刀具组装弹窗的功能刀具类型字段创建记录的功能； yuxianghui 2023-12-08 17:29:32 +08:00
  • c4021d02ce Accept Merge Request #715: (feature/制造代码优化 -> develop) 马广威 2023-12-08 17:26:19 +08:00
  • bd01ad7bbf 修改权限依赖 mgw 2023-12-08 17:25:40 +08:00
  • 9650f45ba2 Accept Merge Request #714: (feature/修改机床参数bug -> develop) 龚启豪 2023-12-08 15:21:32 +08:00
  • cfed77d1a5 库存根据权限增加审核按钮 以及审核状态 qihao.gong@jikimo.com 2023-12-08 15:18:41 +08:00
  • 94c795a68f Accept Merge Request #713: (feature/机床换刀申请优化 -> develop) 禹翔辉 2023-12-08 09:05:39 +08:00
  • 2fba2ad488 Merge remote-tracking branch 'origin/feature/功能刀具库存优化' into feature/机床换刀申请优化 yuxianghui 2023-12-08 09:02:51 +08:00
  • 31260e8921 新增权限审核按钮 qihao.gong@jikimo.com 2023-12-07 17:31:28 +08:00
  • 4d04b37582 1、机台换刀申请tree视图隐藏机床字段，机台号字段内容自动同步位机床名称；功能刀具出入库记录模型机台号字段内容自动同步位机床名称；2、解决功能刀具有的出入库记录机床字段没有内容的问题；3、新增继承机床刀位模型，将新建机床刀位时创建机台换刀申请记录从原机床刀位模型移动到继承后的机床刀位模型中； yuxianghui 2023-12-07 17:31:18 +08:00
  • eec27b26f7 Accept Merge Request #711: (feature/制造代码优化 -> develop) 马广威 2023-12-07 11:28:22 +08:00
  • e300ca1822 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-07 10:58:25 +08:00
  • c8a3bee099 Merge branch 'feature/新增采购权限组' into develop jinling.yang 2023-12-07 10:58:04 +08:00
  • 35c051e730 Accept Merge Request #712: (feature/新增采购权限组 -> develop) 杨金灵 2023-12-07 10:57:45 +08:00
  • 950ec3a1e1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-07 10:52:09 +08:00
  • 1c1a038156 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组 jinling.yang 2023-12-07 10:51:32 +08:00
  • 640bf79dc8 新增质量团队和控制点的审核按钮 jinling.yang 2023-12-07 10:50:36 +08:00
  • 1ccc32cbcb 优化物流、计划权限及库存的一些问题 mgw 2023-12-07 10:11:59 +08:00
  • f8d8d885bb Accept Merge Request #710: (feature/功能刀具库存优化 -> develop) 禹翔辉 2023-12-07 09:13:11 +08:00
  • 7c8c869172 Merge remote-tracking branch 'origin/feature/功能刀具列表自动计算库存' into feature/功能刀具库存优化 yuxianghui 2023-12-07 09:07:53 +08:00
  • 8d5a4ed4c8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组 jinling.yang 2023-12-06 17:27:29 +08:00
  • 981872b0b1 1、根据机台换刀申请的状态，如果为报警状态就自动创建功能刀具预警记录；2、自动检索功能刀具列表的序列号所在位置，计算功能刀具的当前位置及数量；3、功能刀具安全库存模型，根据当前记录的功能刀具对象自动计算出该规则的功能刀具的当前库存，根据当前库存和最低库存量自动计算是否需要补货，如需补货，补货的数量是多少；4、关闭功能刀具预警模型界面的创建、修改、删除功能，新增搜索面板中按机床、刀位分组搜索；5、功能刀具组装模型和组装单模型新增图片字段； yuxianghui 2023-12-06 17:25:47 +08:00
  • d8a74c17f0 Accept Merge Request #709: (feature/前端样式修改 -> develop) 黄焱 2023-12-06 15:46:02 +08:00
  • fe6d207099 甘特图增加滚轮事件，点击事件 黄焱 2023-12-06 15:39:07 +08:00
  • 206043a1a0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2023-12-06 15:37:38 +08:00
  • 6a2a465569 注释掉自动报价的文件 jinling.yang 2023-12-06 15:07:06 +08:00
  • 1767ada489 释放注释的代码 jinling.yang 2023-12-06 15:03:07 +08:00
  • d7f85967c9 优化质量的访问权限 jinling.yang 2023-12-06 15:01:42 +08:00
  • 1a95f5e4ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-06 14:57:10 +08:00
  • abd7364658 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组 jinling.yang 2023-12-06 14:56:31 +08:00
  • 26ec1c9f6e 修改质量模块的权限组名称 jinling.yang 2023-12-06 14:53:38 +08:00
  • 490aa3fe04 Accept Merge Request #707: (feature/修改机床参数bug -> develop) 龚启豪 2023-12-06 14:52:35 +08:00
  • 924a28e957 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-12-06 11:39:24 +08:00
  • e58ceb3ac8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增采购权限组 jinling.yang 2023-12-06 11:38:49 +08:00
  • 61c3b16a69 Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 龚启豪 2023-12-06 11:35:01 +08:00
  • 70109c0965 修改制造模块权限 qihao.gong@jikimo.com 2023-12-06 11:31:59 +08:00
  • 74b4fd1367 Accept Merge Request #705: (feature/制造代码优化 -> develop) 马广威 2023-12-06 10:30:55 +08:00
  • c206dc3097 Accept Merge Request #706: (feature/功能刀具组装流程优化 -> develop) 禹翔辉 2023-12-06 09:14:29 +08:00
  • 4c1c8e7683 Merge remote-tracking branch 'origin/feature/功能刀具安全库存优化' into feature/功能刀具组装流程优化 yuxianghui 2023-12-06 09:03:55 +08:00
  • 0d8d54c05b 1、机床换刀申请新增确认换刀时，依次检索线边刀库、刀具房是否有满足条件的功能刀具，如果有就返回刀具信息，没有就发起组装申请；2、刀具安全库存模型详情页新增可修改的最低库存量、最高库存量、批次补货量字段； yuxianghui 2023-12-05 17:37:47 +08:00
  • 71147eb7f9 新增质量权限组 jinling.yang 2023-12-05 17:28:32 +08:00
  • c753df768d 库存模块权限开发 qihao.gong@jikimo.com 2023-12-05 17:24:19 +08:00
  • 45df8f5bc2 新增采购权限 jinling.yang 2023-12-04 17:34:23 +08:00
  • 29a55f3ff8 1、新增设备创建刀位时自动创建对应刀位的机床换刀申请记录；2、机床换刀申请模型的设备、刀位字段修改为只读，搜索视图新增按设备搜索； yuxianghui 2023-12-04 17:30:19 +08:00
  • 94c0b00c2d 机床注册按钮根据权限组区分 qihao.gong@jikimo.com 2023-12-04 17:28:54 +08:00
  • 32473d302f 生产驾驶舱列表点击【工单】按钮有时候进入的是机台详情界面 工厂端订单详情title显示不美观-建议优化 工厂端材料型号详情界面弹框顶部和底部显示透明了 黄焱 2023-11-30 17:03:47 +08:00
  • 2cf4958f46 完成计划权限，优化警告错误 mgw 2023-11-29 20:58:12 +08:00
  • 893aa2111c 处理coding报错 qihao.gong@jikimo.com 2023-11-29 17:34:15 +08:00
  • 6cf26e8029 新增采购权限组 jinling.yang 2023-11-29 17:25:40 +08:00
  • e796bbe990 Accept Merge Request #704: (feature/功能刀具安全库存优化 -> develop) 禹翔辉 2023-11-29 10:23:11 +08:00
  • c2d2d16948 Merge remote-tracking branch 'origin/feature/功能刀具组装功能优化' into feature/功能刀具安全库存优化 yuxianghui 2023-11-29 10:21:07 +08:00
  • c3ba11bed4 1、修改功能刀具安全库存模型的刀尖特征、柄部类型字段的字段类型为many2one yuxianghui 2023-11-29 10:17:43 +08:00
  • 37815d603a Accept Merge Request #703: (feature/制造代码优化 -> develop) 马广威 2023-11-29 09:43:09 +08:00
  • ca0b59e95b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-29 09:40:03 +08:00
  • 7c478ec4fd 优化货位代码 mgw 2023-11-29 09:39:11 +08:00
  • 5b1d347fd4 增加设备模块权限角色，优化coding代码扫描警告 qihao.gong@jikimo.com 2023-11-28 17:23:49 +08:00
  • e738d40b75 Accept Merge Request #702: (feature/制造代码优化 -> develop) 马广威 2023-11-28 17:23:20 +08:00
  • 685eced709 货位代码优化 mgw 2023-11-28 17:21:29 +08:00
  • ffc40c70d2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-28 17:15:07 +08:00
  • cc3ee289d3 Merge branch 'feature/修改刀具标准库部分字段类型' into develop jinling.yang 2023-11-28 17:14:51 +08:00
  • 487b452519 Accept Merge Request #701: (feature/修改刀具标准库部分字段类型 -> develop) 杨金灵 2023-11-28 17:14:34 +08:00
  • 4a62af7545 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改刀具标准库部分字段类型 jinling.yang 2023-11-28 17:09:10 +08:00
  • 07be7c3074 1.同步刀具标准库接口修改刀片形状，柄部类型，刀尖特征，压紧方式 jinling.yang 2023-11-28 17:08:56 +08:00
  • ddad1e9114 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-28 16:42:54 +08:00
  • 2c1a101c24 库存货架货位修改基本完成，推送测试 mgw 2023-11-28 16:42:19 +08:00
  • ab1af72727 Accept Merge Request #700: (feature/功能刀具组装功能优化 -> develop) 禹翔辉 2023-11-28 16:37:29 +08:00
  • bc186a9723 Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装功能优化 yuxianghui 2023-11-28 16:34:31 +08:00
  • de04d452b3 1优化功能刀具组装单的刀具物料过滤条件，取消功能刀具列表的自动计算库存的方法 yuxianghui 2023-11-28 16:28:48 +08:00
  • 66b808dfc9 Accept Merge Request #699: (feature/功能刀具组装优化 -> develop) 禹翔辉 2023-11-28 15:02:36 +08:00
  • ad36b37f27 Merge remote-tracking branch 'origin/feature/功能刀具安全库存重构' into feature/功能刀具组装优化 yuxianghui 2023-11-28 14:57:40 +08:00
  • e403f2f8e6 1、按面向对象的思想优化功能刀具组装功能的整个流程；2、新增刀具组装完成时的刀具物料出库到刀具组装位置； yuxianghui 2023-11-28 14:52:43 +08:00
  • 24b850a508 Accept Merge Request #698: (feature/制造代码优化 -> develop) 马广威 2023-11-28 09:00:03 +08:00
  • 4d8b463cb3 优化警告问题 mgw 2023-11-28 08:59:01 +08:00
  • 9fef877d12 优化警告问题 mgw 2023-11-27 22:40:56 +08:00
  • c323d9995e Accept Merge Request #697: (feature/制造代码优化 -> develop) 马广威 2023-11-27 21:33:35 +08:00
  • 4f83c5f29a 优化警告问题 mgw 2023-11-27 21:30:45 +08:00
  • ed5f47cc31 1.修改刀具标准库刀片形状，柄部类型，压紧方式，刀尖特征，字段类型及对应控件显示 2.修改产品页面：刀片形状，柄部类型，压紧方式，刀尖特征，字段类型及对应控件显示 jinling.yang 2023-11-27 17:34:23 +08:00
  • 66bb55a823 Accept Merge Request #696: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-27 17:30:01 +08:00
  • 5926d71d27 1、新增功能刀具列表模型自动计算功能刀具在刀具房数量功能；2、优化功能刀具安全库存模型相同功能刀具的检索条件；3、修改功能刀具组装单组装的初始位置为Production，修改功能刀具序列号的生成规则 yuxianghui 2023-11-27 17:27:55 +08:00
  • c78ea6fbe5 修改coding代码扫描警告 qihao.gong@jikimo.com 2023-11-27 17:08:11 +08:00
  • 96df8f971c 物流相关可见性控制 mgw 2023-11-27 15:40:16 +08:00
  • 35511effae Accept Merge Request #695: (feature/制造代码优化 -> develop) 马广威 2023-11-27 12:18:47 +08:00