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

Commit Graph

  • 54912f15b9 优化物流下单等代码 mgw 2023-11-27 12:17:57 +08:00
  • e8a13f1721 Accept Merge Request #694: (feature/制造代码优化 -> develop) 马广威 2023-11-24 21:46:16 +08:00
  • 1532293918 Accept Merge Request #693: (feature/功能刀具安全库存重构 -> develop) 禹翔辉 2023-11-24 17:18:59 +08:00
  • 030ef14633 Merge remote-tracking branch 'origin/feature/功能刀具出入库优化' into feature/功能刀具安全库存重构 yuxianghui 2023-11-24 17:15:26 +08:00
  • bf8b45609c 1、功能刀具列表模型新增查询功能刀具安全库存功能；2、重构功能刀具安全库存模型；3、功能刀具组装单弹窗界面的刀具物料新增位置为刀具房的过滤筛选； yuxianghui 2023-11-24 17:12:44 +08:00
  • 964618d365 Accept Merge Request #692: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-24 10:31:39 +08:00
  • 06eeb1ed1f Accept Merge Request #691: (feature/优化代码格式 -> develop) 杨金灵 2023-11-24 10:30:42 +08:00
  • deb732dc5e 代码规范 qihao.gong@jikimo.com 2023-11-24 10:30:33 +08:00
  • 5737d7b0bc 优化代码格式 jinling.yang 2023-11-24 10:27:21 +08:00
  • 5fd0beab95 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-23 22:23:21 +08:00
  • 858c163cbe 库存调整货架货位为标签 mgw 2023-11-23 22:14:56 +08:00
  • fee3572f38 错误问题处理 mgw 2023-11-23 22:14:12 +08:00
  • f2862af565 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-23 17:44:16 +08:00
  • c1c3639611 Merge branch 'feature/销售权限' into develop jinling.yang 2023-11-23 17:43:55 +08:00
  • 41017412cd Accept Merge Request #690: (feature/销售权限 -> develop) 杨金灵 2023-11-23 17:43:39 +08:00
  • e552502fd1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-23 17:39:58 +08:00
  • 61da25a031 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限 jinling.yang 2023-11-23 17:39:35 +08:00
  • aafafd682d Accept Merge Request #689: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-23 17:38:51 +08:00
  • 98ed831a85 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-23 17:38:49 +08:00
  • e9be2e9c43 优化代码格式 jinling.yang 2023-11-23 17:38:30 +08:00
  • b73a449b01 修改代码不规范问题 qihao.gong@jikimo.com 2023-11-23 17:37:06 +08:00
  • 45d04e1a05 1.销售新增审核状态，选项为已审核和待审核，销售模型新增权限规则：销售总监查看所有的订单，销售经理只能查看自己的订单 2.报价单Form视图新增审核按钮，该按钮只有销售总监可以看到，且确认按钮只有在销售经理审核完才可显示，报价Tree视图新增审核状态 jinling.yang 2023-11-23 17:28:58 +08:00
  • fc17063507 Accept Merge Request #688: (feature/功能刀具出入库优化 -> develop) 禹翔辉 2023-11-23 17:23:11 +08:00
  • b3fbbeb85c Merge remote-tracking branch 'origin/feature/功能刀具组装流程及界面优化' into feature/功能刀具出入库优化 yuxianghui 2023-11-23 17:18:43 +08:00
  • 97d760cd56 1、基于原生的移动历史重构功能刀具出入库记录模型；2、功能刀具列表模型新增查询当前功能刀具出入库记录按钮；3、删除旧的功能刀具出入库记录模型和出入库记录人模型；4、机台换刀申请模型的功能刀具名称字段改为绑定功能刀具组装单；5、优化功能刀具组装单确认组装功能的创建移动历史记录功能。 yuxianghui 2023-11-23 17:15:34 +08:00
  • 9d911a5c2b Accept Merge Request #687: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-23 16:53:24 +08:00
  • 9bb3b88fd6 Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 龚启豪 2023-11-23 16:37:53 +08:00
  • baaeac10eb 修改设备生成名称规则，修改制造模块权限组定义 qihao.gong@jikimo.com 2023-11-23 16:33:09 +08:00
  • 2510f5fbf3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-23 10:22:58 +08:00
  • f77691251e 计划模块增加跟踪消息组件，form视图增加归档取消归档按钮，增加归档未归档的筛选项目 mgw 2023-11-23 10:21:42 +08:00
  • 5292826c72 新增销售权限 jinling.yang 2023-11-22 17:58:41 +08:00
  • 6fed64ba2a 计划模块增加权限控制 mgw 2023-11-22 17:55:30 +08:00
  • 8e5f5cf0d1 Accept Merge Request #686: (feature/功能刀具组装流程及界面优化 -> develop) 禹翔辉 2023-11-22 17:39:17 +08:00
  • b4b5207aea 开发测试制造模块权限，修改设备机床类别的布局以及编码规则 qihao.gong@jikimo.com 2023-11-22 17:36:50 +08:00
  • ca61537e21 Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装流程及界面优化 yuxianghui 2023-11-22 17:31:35 +08:00
  • 83da8f58e2 1、功能刀具列表模型新增大量字段，新增计算库存数量方法，新增查看当前功能刀具的预警记录按键；2、重构功能刀具预警模型（已完成）；3、功能刀具组装模型name字段展示内容改为功能刀具名称； yuxianghui 2023-11-22 17:19:25 +08:00
  • a36c30b5c1 Accept Merge Request #685: (feature/制造代码优化 -> develop) 马广威 2023-11-22 14:24:35 +08:00
  • ae6ec7183e 修改sf_machine_connect模块以适配新的设备构成 mgw 2023-11-22 14:22:41 +08:00
  • cc58425f50 规范问题优化 mgw 2023-11-22 10:29:04 +08:00
  • dda3aad95d Accept Merge Request #684: (feature/制造代码优化 -> develop) 马广威 2023-11-22 09:58:21 +08:00
  • d6dcb6bf55 优化现有代码问题 mgw 2023-11-22 09:54:31 +08:00
  • 4b672f3c23 Accept Merge Request #683: (feature/制造代码优化 -> develop) 马广威 2023-11-21 17:50:39 +08:00
  • 423d5cec8e 优化sf_machine_connect的manifest文件 mgw 2023-11-21 17:49:58 +08:00
  • e6bb5db0e1 开发sf制造模块权限角色 qihao.gong@jikimo.com 2023-11-21 17:42:36 +08:00
  • f0e66c6d90 新增销售权限 jinling.yang 2023-11-21 17:30:07 +08:00
  • 8a1dfe14e6 1、功能刀具列表模型新增部分字段；2、机台换刀申请新增根据报警值和有效值计算当前状态，重构根据状态自动换刀申请的功能，重构撤销换刀申请功能；3、功能刀具组装单模型新增大量字段，优化tree视图和form视图的布局；4、组装单弹窗模型新增大量字段，优化确认组装按键功能， yuxianghui 2023-11-21 17:26:18 +08:00
  • 5113de7e97 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-21 16:31:41 +08:00
  • e06002e05a Merge branch 'feature/新增销售权限' into develop jinling.yang 2023-11-21 16:31:27 +08:00
  • 8b7b52ee2c Accept Merge Request #682: (feature/新增销售权限 -> develop) 杨金灵 2023-11-21 16:31:19 +08:00
  • 6738f38131 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增销售权限 jinling.yang 2023-11-21 16:11:24 +08:00
  • ab115ab71c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-21 16:10:27 +08:00
  • 6ec6094c5e 1.新增销售和计划权限组2.优化代码格式 jinling.yang 2023-11-21 16:10:05 +08:00
  • 321c40d31d Accept Merge Request #681: (feature/制造代码优化 -> develop) 马广威 2023-11-21 14:18:44 +08:00
  • 890b73e108 优化js代码过长的问题，优化未用到的变量 mgw 2023-11-21 14:18:01 +08:00
  • 247b3e4444 Accept Merge Request #676: (feature/制造代码优化 -> develop) 马广威 2023-11-20 17:42:54 +08:00
  • 7391b1324d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-20 17:41:51 +08:00
  • d53e664881 修复导入错误，优化不使用的模块 mgw 2023-11-20 17:38:03 +08:00
  • b49b5890a0 1、机台换刀申请及其弹窗新增生产线字段，2、机台换刀申请tree视图搜索面板改为按生产线和状态搜索，3、优化功能刀具组装单，新增大量字段，优化tree试图布局，优化form视图布局，tree视图搜索面板新增按状态搜索，4、重构了机台换刀申请模型申请换刀功能；5、重构刀具转移模型， yuxianghui 2023-11-20 17:36:13 +08:00
  • 690543e2d4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-20 17:08:13 +08:00
  • f296e1ba1a Merge branch 'feature/产品验证' into develop jinling.yang 2023-11-20 17:05:43 +08:00
  • 31f07c5156 Accept Merge Request #675: (feature/产品验证 -> develop) 杨金灵 2023-11-20 17:05:06 +08:00
  • 63d6ce6da8 Accept Merge Request #674: (feature/修改机床参数bug -> develop) 龚启豪 2023-11-20 16:50:06 +08:00
  • 580f95f338 importrequests修改 qihao.gong@jikimo.com 2023-11-20 15:48:43 +08:00
  • 326181fa81 Merge branch 'feature/修改机床参数bug' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-11-20 15:44:43 +08:00
  • 6fc735063a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2023-11-20 15:41:50 +08:00
  • 499261f62e 放开依赖 qihao.gong@jikimo.com 2023-11-20 15:39:07 +08:00
  • 6912160232 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品验证 jinling.yang 2023-11-20 15:11:43 +08:00
  • 04e63dcc59 修复代码规范 jinling.yang 2023-11-20 15:10:01 +08:00
  • 7ceaadb9c4 修复引入库 jinling.yang 2023-11-20 15:04:39 +08:00
  • fdf1b786fe Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 龚启豪 2023-11-20 15:03:36 +08:00
  • 1da7a0195d 根据odoo规则修改py文件中得import顺序 qihao.gong@jikimo.com 2023-11-20 14:59:06 +08:00
  • b093b11ec2 Accept Merge Request #671: (feature/制造代码优化 -> develop) 马广威 2023-11-20 13:30:58 +08:00
  • 718b1f9edf 优化代码结构 mgw 2023-11-20 13:23:37 +08:00
  • 5bdd3982ae Accept Merge Request #669: (feature/制造代码优化 -> develop) 马广威 2023-11-20 12:44:35 +08:00
  • a606cbfc6d 优化wrong-import-order问题 mgw 2023-11-20 12:42:48 +08:00
  • 1a5fcf09e1 Accept Merge Request #666: (feature/制造代码优化 -> develop) 马广威 2023-11-20 10:49:58 +08:00
  • d2899fe38e 测试优化代码后的代码扫描效果，优化部分代码审查问题 mgw 2023-11-20 10:48:43 +08:00
  • 24e75f8895 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-17 17:51:57 +08:00
  • 5bc5766507 优化代码格式至PEP8格式 mgw 2023-11-17 17:49:08 +08:00
  • 49f021ed7a 产品新增适配刀片形状，适合加工方式，刀尖特征，走刀方向，柄部类型，冷却液，压紧方式验证 jinling.yang 2023-11-17 17:45:41 +08:00
  • 94031e68ad Accept Merge Request #659: (feature/前端样式修改 -> develop) 黄焱 2023-11-17 17:45:05 +08:00
  • 182348f427 修改规格字段位置 黄焱 2023-11-17 17:42:41 +08:00
  • c885f3ce8c 1、设备机床的刀位对象新增name字段，并自动添加值；2、根据需求重构了机床换刀申请模型，重构机床换刀弹窗对象； yuxianghui 2023-11-17 17:30:37 +08:00
  • e5b0960e3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-17 10:43:16 +08:00
  • dd5d4e7748 Merge branch 'feature/自动报价代码还原' into develop jinling.yang 2023-11-17 10:43:00 +08:00
  • 369980d655 Accept Merge Request #530: (feature/自动报价代码还原 -> develop) 杨金灵 2023-11-17 10:37:52 +08:00
  • 2096d05cdb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自动报价代码还原 jinling.yang 2023-11-17 10:35:42 +08:00
  • fbab054324 代码还原 jinling.yang 2023-11-17 10:35:10 +08:00
  • e3ff9e9fde Accept Merge Request #529: (feature/制造代码优化 -> develop) 马广威 2023-11-17 10:03:04 +08:00
  • c3ee544ca6 测试coding代码审查 mgw 2023-11-17 09:55:41 +08:00
  • 08581c8bc4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2023-11-17 09:15:29 +08:00
  • 49cbf2fde2 Merge branch 'feature/产品优化' into develop jinling.yang 2023-11-17 09:13:54 +08:00
  • 2f2522c99e Accept Merge Request #527: (feature/产品优化 -> develop) 杨金灵 2023-11-17 09:13:36 +08:00
  • fefa14a47b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品优化 jinling.yang 2023-11-17 09:12:41 +08:00
  • 329d7b6464 1、机床换刀申请界面新增搜索面板和设备字段根据设备的设备类型等于机床的过滤条件；2、隐藏功能刀具出入库记录菜单；3、功能刀具列表form视图新增预警跳转按键（跳转功能未完成）； yuxianghui 2023-11-16 17:36:09 +08:00
  • f36c2ac096 产品优化 jinling.yang 2023-11-16 17:35:04 +08:00
  • 9c6367c053 Accept Merge Request #526: (feature/制造代码优化 -> develop) 马广威 2023-11-16 17:03:24 +08:00
  • 076866e9b7 产品模板修改>>>增加“规格”字段specification_id mgw 2023-11-16 17:01:14 +08:00
  • 3a64a2106a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2023-11-16 15:14:04 +08:00
  • ead39c9649 Accept Merge Request #525: (feature/前端样式修改 -> develop) 黄焱 2023-11-16 15:12:44 +08:00