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

Commit Graph

  • ee78dda3a9 Accept Merge Request #790: (feature/功能刀具添加fid -> develop) 禹翔辉 2024-01-29 17:28:05 +08:00
  • e13bd0dc61 修改功能刀具预警的rfid关联字段 yuxianghui 2024-01-29 17:25:34 +08:00
  • 9f57ad6aaf 将fid改为rfid yuxianghui 2024-01-29 17:23:17 +08:00
  • 8c4996b7c2 功能刀具模块的功能刀具添加fid字段，隐藏序列号字段 yuxianghui 2024-01-29 17:05:56 +08:00
  • cf2aaa38fe 1.修复材料型号同步报验证问题2.优化工单的工件派送3.计划里新增生产线的优化 jinling.yang 2024-01-26 17:46:53 +08:00
  • ac900dd3f0 Accept Merge Request #789: (feature/制造代码优化 -> develop) 马广威 2024-01-26 15:09:07 +08:00
  • 0e762f9cbc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-26 15:08:29 +08:00
  • 4ee4b28389 修复数据同步问题 mgw 2024-01-26 14:18:10 +08:00
  • d36acedaa3 Accept Merge Request #788: (feature/修改机床参数bug -> develop) 龚启豪 2024-01-26 11:31:19 +08:00
  • 1311d5be1e Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 龚启豪 2024-01-26 11:28:51 +08:00
  • 207cd83d3c 取消OCC注释 qihao.gong@jikimo.com 2024-01-26 11:27:12 +08:00
  • 37161e2e20 1.修改工单的托盘序列号，托盘名称，托盘品牌，托盘类型，托盘型号字段类型，且页面对应字段改为只读 2.装夹预调工单新增扫条形码，扫码时对该工单进行自动开始并将条码里对应的托盘产品信息回填到托盘序列号，托盘名称，托盘品牌，托盘类型，托盘型号字段上，点击完成时对前置三元定位检测参数进行验证 3.研究打印序列号（多个） jinling.yang 2024-01-25 17:51:57 +08:00
  • 6461e3a423 修改货架货位看板颜色 qihao.gong@jikimo.com 2024-01-25 17:36:34 +08:00
  • 76393d438b Accept Merge Request #787: (feature/前端样式修改 -> develop) 黄焱 2024-01-25 10:09:48 +08:00
  • 50ced99785 修改货架货位空闲颜色 黄焱 2024-01-25 10:03:53 +08:00
  • 8e3a316200 采购入库时，新增打印序列号方法 jinling.yang 2024-01-24 17:30:59 +08:00
  • fc7c66c615 AGV增加运行日志 设备oee增加运行日志 qihao.gong@jikimo.com 2024-01-24 17:29:42 +08:00
  • 2daeb01c4d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务 jinling.yang 2024-01-24 16:04:53 +08:00
  • 1818e97289 Accept Merge Request #786: (feature/修复平台派过来的销售订单缺少【取消】按钮 -> develop) 杨金灵 2024-01-24 16:04:13 +08:00
  • e661297b5d 修复采购总监审核菜单单-审核通过后没有反应-订单状态没有变 jinling.yang 2024-01-24 15:59:58 +08:00
  • 926caeca97 工件配送文字修改 jinling.yang 2024-01-24 14:54:07 +08:00
  • 403ba64e50 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务 jinling.yang 2024-01-24 14:39:47 +08:00
  • cdc3c52784 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-24 14:24:42 +08:00
  • 7000b66683 Accept Merge Request #785: (feature/制造代码优化 -> develop) 马广威 2024-01-24 14:24:35 +08:00
  • 82f54b5d83 制造订单页面新增生产线和计划开始加工时间字段 jinling.yang 2024-01-24 14:24:27 +08:00
  • 1af08763ea 调整视图显隐控制逻辑 mgw 2024-01-24 14:24:01 +08:00
  • 8f379a2635 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务 jinling.yang 2024-01-23 17:42:38 +08:00
  • 96b0773c00 Accept Merge Request #784: (feature/制造代码优化 -> develop) 马广威 2024-01-23 17:32:53 +08:00
  • 79f8cd21a9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-23 17:31:04 +08:00
  • 5c129331e0 增加功能：当为非“自提”单时，必须进行物流下单才能进行出库操作。增加对字段的显隐控制 mgw 2024-01-23 16:13:53 +08:00
  • cddb025e98 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-23 15:33:37 +08:00
  • 1e2272c13a 新增工件配送对象 jinling.yang 2024-01-23 15:33:17 +08:00
  • d955832bd8 Accept Merge Request #783: (feature/新增工件配送模型 -> develop) 禹翔辉 2024-01-23 15:32:18 +08:00
  • 4a52327acd Merge remote-tracking branch 'origin/feature/关闭接口的调用' into feature/新增工件配送模型 yuxianghui 2024-01-23 15:30:10 +08:00
  • 136d0f5156 新增工件配送模型及其tree视图，search视图，添加自动计算配送时长功能； yuxianghui 2024-01-23 15:29:07 +08:00
  • 0254387c03 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-23 10:36:21 +08:00
  • 90f8c4143e 物流相关增量开发，修改一些原生按钮，修改一些翻译 mgw 2024-01-23 10:34:49 +08:00
  • 0ef13504e7 修改货架货位关联移动历史调拨单关联 qihao.gong@jikimo.com 2024-01-22 17:33:40 +08:00
  • 40bf41c93d Accept Merge Request #782: (feature/关闭接口的调用 -> develop) 禹翔辉 2024-01-22 17:16:26 +08:00
  • 3f8aded61c Merge branch 'feature/CAM用刀优化及添加接口' into feature/关闭接口的调用 yuxianghui 2024-01-22 17:14:19 +08:00
  • f5c555ec86 注释新增接口的调用 yuxianghui 2024-01-22 17:11:45 +08:00
  • 3e7f145255 Accept Merge Request #781: (feature/CAM用刀优化及添加接口 -> develop) 禹翔辉 2024-01-22 15:55:40 +08:00
  • 2a5a9de3e3 1、添加机床刀位字段 yuxianghui 2024-01-22 15:54:30 +08:00
  • d2bca2ff51 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-22 15:45:19 +08:00
  • f9d6a13d33 Merge branch 'feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口' into develop jinling.yang 2024-01-22 15:45:00 +08:00
  • adcd2c39fc Accept Merge Request #779: (feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 -> develop) 杨金灵 2024-01-22 15:41:49 +08:00
  • b37d547359 http验证代码还原 jinling.yang 2024-01-22 15:41:20 +08:00
  • 72f5496905 Accept Merge Request #780: (feature/制造代码优化 -> develop) 马广威 2024-01-22 15:40:23 +08:00
  • daa7c467f9 注释代码还原 jinling.yang 2024-01-22 15:37:06 +08:00
  • 12c6959ba4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 jinling.yang 2024-01-22 15:35:13 +08:00
  • 81fe1cf486 Accept Merge Request #778: (feature/修改机床参数bug -> develop) 龚启豪 2024-01-22 14:49:20 +08:00
  • b5a8379d52 Accept Merge Request #777: (feature/CAM用刀优化及添加接口 -> develop) 禹翔辉 2024-01-22 14:48:57 +08:00
  • 92fc988951 修改视图bug qihao.gong@jikimo.com 2024-01-22 14:43:58 +08:00
  • d03813db40 Merge remote-tracking branch 'origin/feature/接口及CAM用刀' into feature/CAM用刀优化及添加接口 yuxianghui 2024-01-22 14:42:45 +08:00
  • 1b3b80f735 Accept Merge Request #776: (feature/修改机床参数bug -> develop) 龚启豪 2024-01-22 14:39:06 +08:00
  • 4efb6dc6d0 Merge branch 'feature/修改机床参数bug' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-22 14:37:59 +08:00
  • f58420ac46 Merge remote-tracking branch 'origin/feature/新增中控对接接口' into feature/接口及CAM用刀 yuxianghui 2024-01-22 14:37:57 +08:00
  • 7b2b15d601 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-22 14:37:25 +08:00
  • b9ba29d276 取消OCC注释 qihao.gong@jikimo.com 2024-01-22 14:36:36 +08:00
  • e0baa2574a Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 龚启豪 2024-01-22 14:33:26 +08:00
  • fced85f530 1、删除无语字段 yuxianghui 2024-01-22 14:32:33 +08:00
  • e80056938f 修改库存配置的审核按钮 qihao.gong@jikimo.com 2024-01-22 14:30:53 +08:00
  • b5c7be8de0 1、新增机床刀具组接口，在刀具组新建和更新时调用接口；2、新增零件特采接口，在质量检测审核之后调用接口； yuxianghui 2024-01-19 17:26:45 +08:00
  • b0104e7b93 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口 jinling.yang 2024-01-19 17:18:59 +08:00
  • bd9b52e6ce Accept Merge Request #775: (feature/修复平台派单采购单无买家问题 -> develop) 杨金灵 2024-01-19 17:17:15 +08:00
  • af348c4d8f 1.修复平台派单采购单无买家问题2.还原获取CNC程序代码 jinling.yang 2024-01-19 17:11:20 +08:00
  • 9e65f947f9 Merge branch 'feature/修复缺陷' into develop jinling.yang 2024-01-19 16:03:44 +08:00
  • 3226942ed3 1.修复产品类别和计量单位去掉审核状态字段2.优化bfm派单至sf的销售订单流程3.工序增加编码字段 jinling.yang 2024-01-19 15:45:15 +08:00
  • 2dfd3c9128 增加刀具管理权限控制，刀具组权限控制，隐藏工单上原生按钮，修复只读权限后修改记录无权限问题等 mgw 2024-01-19 11:49:57 +08:00
  • eb117aef86 1.修复采购总监审核采购单审核不通过后-还显示【审核】按钮2.新增采购总监审核采购单审核不通过后-还显示【审核】按钮3.产品详情界面的删除按钮要隐藏 jinling.yang 2024-01-18 17:39:22 +08:00
  • 3575f0c5c9 1、工单的cnc加工模型添加功能刀具类型字段；2、添加根据刀具类型和刀具名称检索现有功能刀具是否满足需求，如果不满足则创建CAM工单程序用刀计划记录的功能记录；3、添加MES装刀指令接口，根据cnc加工所需的刀具类型和刀具名称检索现有机床内功能刀具是否满足需求，如果不满足则发送MES装刀指令；4、添加刀具组接口，新增功能刀具时传送功能刀具名称、编码、刀具组。 yuxianghui 2024-01-18 17:33:54 +08:00
  • aa810bbda2 零件质检接口 修改coding缺陷 qihao.gong@jikimo.com 2024-01-18 17:26:31 +08:00
  • 2c12f5b9b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-18 14:26:51 +08:00
  • 72b89288f2 Accept Merge Request #773: (feature/制造代码优化 -> develop) 马广威 2024-01-18 09:19:34 +08:00
  • cffda26ed0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-01-18 09:14:25 +08:00
  • eefabbd5b3 添加列表框，但暂时不启用 mgw 2024-01-18 09:13:41 +08:00
  • 6bb46186b1 取消部分审核按钮 mgw 2024-01-17 17:56:15 +08:00
  • 4ab1409b13 修改制造模块，使得原生操作按钮只对制造用户可见 mgw 2024-01-17 17:44:10 +08:00
  • bba2c1d839 优化自动化传递工单号获取工单信息接口 jinling.yang 2024-01-17 17:33:13 +08:00
  • d9115333bf 1、优化CAM工单程序用刀计划模型，新增大量字段，优化tree视图及form视图字段及其布局；2、添加CAM换刀申请功能和撤销功能及其按钮；3、添加根据刀具类型和刀具名称检索现有功能刀具是否满足需求，如果不满足则创建CAM工单程序用刀计划记录的功能接口(进行中)。 yuxianghui 2024-01-17 17:30:16 +08:00
  • 2b7243f69c 合并cnc加工和后置检测工单，新增工单开始结束接口 qihao.gong@jikimo.com 2024-01-17 17:26:24 +08:00
  • a3c8082906 库存处隐藏退回按钮 mgw 2024-01-17 14:45:34 +08:00
  • 9bab450af1 对除库存用户外，隐藏操作按钮 mgw 2024-01-17 09:56:40 +08:00
  • 7520d71adb 1、优化机床模型的标准刀库对象，删除了制造模块中机床刀位模型大部分字段，在刀具管理模块中通过继承机床刀位模型新增字段，同时前端机床from视图中的刀位的tree视图新增大量字段；2、刀具管理模块新增controllers模块文件，新增机床当前刀库实时信息接口。 yuxianghui 2024-01-16 17:30:59 +08:00
  • 4f0c7ad274 1.新增机台日计划接口 2.新工件预调(前置三元检测)接口 3.,新NC程序下载接口接口 jinling.yang 2024-01-16 17:25:25 +08:00
  • d6e36eea99 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-01-16 14:39:01 +08:00
  • 0ea69f41e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-01-16 14:30:26 +08:00
  • de142bd371 Merge branch 'feature/新增与中控系统对接的接口' into develop jinling.yang 2024-01-16 14:23:10 +08:00
  • cb14bb4ea8 Accept Merge Request #771: (feature/新增与中控系统对接的接口 -> develop) 杨金灵 2024-01-16 14:22:41 +08:00
  • 22176eda69 接口优化 jinling.yang 2024-01-16 11:00:01 +08:00
  • bb75b73247 新增设备OEE菜单 以及对象 qihao.gong@jikimo.com 2024-01-15 17:45:43 +08:00
  • 1b490951b1 1.新增自动化传递工单号获取工单信息接口 jinling.yang 2024-01-15 17:31:15 +08:00
  • f19af2a33f 增加排程动作对销售订单状态的修改 mgw 2024-01-12 16:40:29 +08:00
  • d0e92a649a Accept Merge Request #770: (feature/修复产品bug -> develop) 杨金灵 2024-01-12 16:23:05 +08:00
  • 687af76372 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复产品bug jinling.yang 2024-01-12 16:19:16 +08:00
  • 3acb32a5c2 修复产品模版采购选未过滤供应商及产品Tree视图列表可删除问题 jinling.yang 2024-01-12 16:18:57 +08:00
  • 8d7dcda582 Accept Merge Request #769: (feature/前端样式修改 -> develop) 黄焱 2024-01-11 15:51:04 +08:00
  • fc2c1e06d9 设置modal弹窗样式 黄焱 2024-01-11 15:47:39 +08:00
  • 6c57df8270 Accept Merge Request #768: (feature/夹具型号同步优化 -> develop) 禹翔辉 2024-01-11 14:14:34 +08:00
  • d042de9e84 Merge remote-tracking branch 'origin/feature/功能刀具新增字段' into feature/夹具型号同步优化 yuxianghui 2024-01-11 14:11:57 +08:00