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

Commit Graph

  • c7df18ace6 设置表格横向滚动 黄焱 2024-05-24 14:35:22 +08:00
  • 053eba5887 Accept Merge Request #1046: (feature/组装单弹窗优化 -> develop) 马广威 2024-05-23 16:25:16 +08:00
  • e935b2fa11 1、优化功能刀具定时同步接口，增加刀柄长度数据同步 yuxianghui 2024-05-23 16:18:48 +08:00
  • d5bc610214 Accept Merge Request #1045: (feature/组装单弹窗优化 -> develop) 禹翔辉 2024-05-23 15:46:34 +08:00
  • 2ca67eb8ad 1、将刀具名称字段获取由onchange改为depends yuxianghui 2024-05-23 15:43:32 +08:00
  • b6a69debd8 Accept Merge Request #1044: (feature/组装单弹窗优化 -> develop) 禹翔辉 2024-05-23 15:24:38 +08:00
  • 147ac35239 Merge branch 'feature/组装单优化' into feature/组装单弹窗优化 yuxianghui 2024-05-23 15:22:35 +08:00
  • 3c3f375120 1、打开组装弹窗方法添加清除旧数据功能；2、组装弹窗界面，刷新按键名称改为获取测量值，添加是否获取测量值字段等，调整字段只读和界面布局； yuxianghui 2024-05-23 15:19:41 +08:00
  • c87f310bb3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-23 14:34:39 +08:00
  • f53eecbb57 Accept Merge Request #1043: (feature/组装单优化 -> develop) 禹翔辉 2024-05-23 14:33:50 +08:00
  • 1743fa45b5 Merge branch 'feature/优化返工和重新制造订单' into develop jinling.yang 2024-05-23 14:33:09 +08:00
  • 75f30922e6 1、组装单弹窗界面调整，优化按刷新后最大寿命值归0的问题； yuxianghui 2024-05-23 14:32:13 +08:00
  • 3a0db05c33 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单 jinling.yang 2024-05-23 11:46:26 +08:00
  • 5f42b5d056 优化制造订单报废流程，返工流程暂停（需求需重新设计） jinling.yang 2024-05-23 11:46:09 +08:00
  • c698b50853 Accept Merge Request #1041: (feature/组装单优化 -> develop) 禹翔辉 2024-05-23 11:18:40 +08:00
  • 251786f6be Merge branch 'feature/刀具预调仪接口优化' into feature/组装单优化 yuxianghui 2024-05-23 11:16:13 +08:00
  • 66b4df5193 1、优化刀具预调仪接口的数据处理方式、更改搜索组装单条件；2、优化功能刀具、组装单、组装单弹窗的字段和界面展示的字段内容；3、更改组装单编码生成规则 yuxianghui 2024-05-23 11:15:13 +08:00
  • 57b264b84d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单 jinling.yang 2024-05-22 17:36:17 +08:00
  • ff12a86406 优化cnc工单返工：在原有的cnc工单后新增返工标志的cnc工单，且工序累加，状态为就绪，解除装夹工单的状态为等待其他工单 jinling.yang 2024-05-22 17:35:57 +08:00
  • b0b3ce7d99 Accept Merge Request #1040: (feature/刀具预调仪接口优化 -> develop) 禹翔辉 2024-05-22 15:09:22 +08:00
  • 8d02a94f78 Merge branch 'feature/物料同步接口优化' into feature/刀具预调仪接口优化 yuxianghui 2024-05-22 15:05:55 +08:00
  • 4f6e4a8ed3 1、优化刀具预调仪接口及其写入到弹窗的流程，更改刀具总长度(高度)、直径和R角字段的精确度为小数点后三位； yuxianghui 2024-05-22 15:04:37 +08:00
  • b524e385a1 Accept Merge Request #1039: (feature/前端样式修改 -> develop) 黄焱 2024-05-22 09:39:24 +08:00
  • d22f08d187 1、添加刀具预调仪接口；2、刀具组装单添加开始预调字段，优化组装按键；3、优化组装单组装时的必填校验，添加刷新按钮用来获取刀具预调仪的参数信息； yuxianghui 2024-05-21 21:41:17 +08:00
  • 2ba53bbb02 // 功能刀具组装单 弹窗样式 黄焱 2024-05-21 17:38:54 +08:00
  • 38e0a62130 Accept Merge Request #1038: (feature/物料同步接口优化 -> develop) 禹翔辉 2024-05-21 09:27:33 +08:00
  • bf1b14290e Merge branch 'feature/解决刀具组装时搜不到功能刀具产品问题' into feature/物料同步接口优化 yuxianghui 2024-05-21 09:25:13 +08:00
  • 1b6ca90bd4 1、优化刀具、夹具同步接口；关闭刀具同步接口的实时调用； yuxianghui 2024-05-21 09:23:47 +08:00
  • 8ced717b1c Accept Merge Request #1037: (release/release1.0 -> master) 马广威 2024-05-18 22:44:11 +08:00
  • 187495eb67 Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0 release/release1.0 mgw 2024-05-18 22:39:05 +08:00
  • 5fccd41e07 Accept Merge Request #1035: (feature/制造代码优化 -> develop) 马广威 2024-05-18 21:57:50 +08:00
  • 0ae0ad2ba8 修复库存岗位验证入库无权限问题 mgw 2024-05-18 21:56:43 +08:00
  • afb5316d8a Accept Merge Request #1034: (feature/制造代码优化 -> develop) 马广威 2024-05-18 21:33:47 +08:00
  • 585e7236a1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-18 21:33:04 +08:00
  • 3afa76b79c 优化同步代码 mgw 2024-05-18 21:32:24 +08:00
  • 6d503968a5 Accept Merge Request #1033: (feature/制造代码优化 -> develop) 马广威 2024-05-18 20:03:02 +08:00
  • cc7963cb5a 修复value bug mgw 2024-05-18 20:02:32 +08:00
  • e2fdfbf1ee Accept Merge Request #1032: (feature/修复表面工艺对应库存 -> develop) 马广威 2024-05-18 19:54:48 +08:00
  • cdf164ec2c Accept Merge Request #1031: (feature/制造代码优化 -> develop) 马广威 2024-05-18 19:53:25 +08:00
  • f9cca591bb 修复表面工艺工单完成时对应库存(stock.move)的状态为完成并跳过标记完成方法的检查 jinling.yang 2024-05-18 19:52:58 +08:00
  • 6f3d423da1 cnc工单和解除装夹工单隐藏【工序状态】字段，装夹预调工单已完成后【工序状态】字段显示“装夹预调完成” mgw 2024-05-18 19:52:27 +08:00
  • 1bcd1f2e33 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-18 19:48:47 +08:00
  • 9284701ed4 Accept Merge Request #1030: (feature/制造代码优化 -> develop) 马广威 2024-05-18 18:42:57 +08:00
  • 2c5cc91ef7 优化刀具弹窗 mgw 2024-05-18 18:42:20 +08:00
  • c6039215a3 Merge branch 'feature/修复销售确认按钮' into develop jinling.yang 2024-05-18 17:32:03 +08:00
  • 21027a8cb6 Accept Merge Request #1029: (feature/修复销售确认按钮 -> develop) 杨金灵 2024-05-18 17:31:39 +08:00
  • 80cd385df4 修复工单完成时制造订单未完成 jinling.yang 2024-05-18 17:30:22 +08:00
  • d7bcb0e4f3 修复销售确认按钮 jinling.yang 2024-05-18 17:22:02 +08:00
  • f62994878c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-18 17:20:55 +08:00
  • 50b0c37e46 Accept Merge Request #1028: (feature/解决刀具组装时搜不到功能刀具产品问题 -> develop) 马广威 2024-05-18 17:11:30 +08:00
  • dc381faae6 Merge branch 'feature/刀具模块优化' into feature/解决刀具组装时搜不到功能刀具产品问题 yuxianghui 2024-05-18 17:07:17 +08:00
  • f05301320c 1、组装单添加按是否组装排序；2、修改功能刀具组装流程中搜索功能刀具产品的条件 yuxianghui 2024-05-18 17:05:39 +08:00
  • d87fcb35ba Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-18 16:48:24 +08:00
  • be69e76d2f Merge branch 'feature/修复采购总监权限' into develop jinling.yang 2024-05-18 16:47:43 +08:00
  • debd788864 修复快速订单 jinling.yang 2024-05-18 16:46:59 +08:00
  • 2546dd73b2 Accept Merge Request #1027: (feature/修复采购总监权限 -> develop) 杨金灵 2024-05-18 16:45:47 +08:00
  • 9f2415cfac 修复工件装夹岗无法创建采购订单 jinling.yang 2024-05-18 16:45:01 +08:00
  • 2e151a2292 中控调用日志排序 jinling.yang 2024-05-18 16:14:05 +08:00
  • 9b2ff6268c 修复采购总监权限 jinling.yang 2024-05-18 16:08:39 +08:00
  • d1c08023b9 Accept Merge Request #1026: (feature/修复表面工艺工单 -> develop) 杨金灵 2024-05-18 15:28:53 +08:00
  • 5f02de8b0c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单 jinling.yang 2024-05-18 15:27:17 +08:00
  • 0f5b94e8ca 1.修复销售订单确认按钮确认后不可见2.修复表面工艺工单完成3.下发编程单工件配送优化 jinling.yang 2024-05-18 15:26:32 +08:00
  • 795b4d43a8 Accept Merge Request #1025: (feature/制造代码优化 -> develop) 马广威 2024-05-18 15:15:46 +08:00
  • d9d1f86407 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-18 15:14:38 +08:00
  • 337fecb4cb 暂时去掉根据CNC工单是否有编程单来控制装夹预调工单状态的功能，待重议此需求逻辑 mgw 2024-05-18 15:01:09 +08:00
  • 4be83d8aab Accept Merge Request #1024: (feature/刀具模块优化 -> develop) 马广威 2024-05-18 11:57:27 +08:00
  • 049521064b Merge branch 'feature/oca审批修改' into feature/刀具模块优化 yuxianghui 2024-05-18 11:55:20 +08:00
  • 9e2091597b 1、注释action_apply_inventory()方法；2、功能刀具安全库存添加one2many类型的功能刀具废弃many2many类型的关联字段并优化代码，并在功能刀具模型添加功能按钮用来绑定功能刀具和对应的功能刀具安全库存；3、优化根据库存创建功能刀具组装单的方法断定条件；4、优化刀具注册接口的报错处理；5、优化组装流程 yuxianghui 2024-05-18 11:54:23 +08:00
  • 01f82fcb5d Accept Merge Request #1023: (feature/修复外协位置 -> develop) 杨金灵 2024-05-18 11:18:46 +08:00
  • 939aa974e6 修复外协位置 jinling.yang 2024-05-18 11:17:11 +08:00
  • 829c971848 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-18 10:29:43 +08:00
  • a4b2d5bb42 修复仓储岗位权限遗留问题 mgw 2024-05-18 10:29:02 +08:00
  • ebdc1ec2ff Merge branch 'feature/修改表面工艺外协位置' into develop jinling.yang 2024-05-18 10:27:50 +08:00
  • f0d66b7730 Accept Merge Request #1022: (feature/修改表面工艺外协位置 -> develop) 杨金灵 2024-05-18 10:27:18 +08:00
  • a935112134 外协代码还原 jinling.yang 2024-05-18 10:24:31 +08:00
  • 70bc2ed718 修改表面工艺外协位置 jinling.yang 2024-05-18 10:21:09 +08:00
  • c230e550a9 Merge branch 'feature/修复表面工艺工单完成问题' into develop jinling.yang 2024-05-17 17:26:20 +08:00
  • 297bf76809 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成问题 jinling.yang 2024-05-17 16:34:23 +08:00
  • 2dc9866735 1.修复表面工艺工单完成报错2.外协位置改为供应商位置3.采购总监添加创建制造订单权限 jinling.yang 2024-05-17 16:26:15 +08:00
  • 305e91e7f1 Accept Merge Request #1020: (feature/oca审批修改 -> develop) 禹翔辉 2024-05-17 15:00:58 +08:00
  • a5b9b63b41 Merge branch 'feature/主流程bug处理' into feature/oca审批修改 yuxianghui 2024-05-17 14:57:46 +08:00
  • 1a0e96bbdd 1、采购审批流程中的英文提示信息改为中文提示；当审批完成后隐藏取消审批按键；2、刀具注册接口添加调用接口提示； yuxianghui 2024-05-17 14:56:15 +08:00
  • 095c15cba4 Accept Merge Request #1019: (feature/制造代码优化 -> develop) 马广威 2024-05-17 11:48:21 +08:00
  • fe6bb46d54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-05-17 11:47:44 +08:00
  • 432a012596 显示优化，物流下单增补逻辑 mgw 2024-05-17 11:47:26 +08:00
  • 27b5e92563 Accept Merge Request #1018: (feature/修复销售确认按钮 -> develop) 杨金灵 2024-05-17 11:32:45 +08:00
  • e5164454f2 修复销售确认按钮 jinling.yang 2024-05-17 11:31:07 +08:00
  • b79cdea926 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-17 11:10:49 +08:00
  • 836a598cf8 Merge branch 'feature/表面工艺外协修复' into develop jinling.yang 2024-05-17 11:10:02 +08:00
  • 3a0a4b0f15 Accept Merge Request #1017: (feature/表面工艺外协修复 -> develop) 杨金灵 2024-05-17 11:07:46 +08:00
  • cda0b6d345 还原OCC代码 jinling.yang 2024-05-17 11:04:35 +08:00
  • 7e31869d1f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 jinling.yang 2024-05-17 11:00:58 +08:00
  • ea1ed43c92 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 jinling.yang 2024-05-17 11:00:00 +08:00
  • eb83114e54 1、优化组装流程；2、添加权限 yuxianghui 2024-05-16 17:34:38 +08:00
  • af45775040 Accept Merge Request #1016: (feature/主流程bug处理 -> develop) 禹翔辉 2024-05-16 14:16:06 +08:00
  • 03f5027f49 Merge branch 'feature/优化产品' into feature/主流程bug处理 yuxianghui 2024-05-16 14:13:40 +08:00
  • 20ecd9d949 1、将和刀具相关的模型的刀具直径字段类型从int改为float；2、标准刀库tree视图添加Rfid字段；优化从中控获取标准刀库信息接口； yuxianghui 2024-05-16 14:04:35 +08:00
  • ed2c119803 Accept Merge Request #1015: (feature/制造代码优化 -> develop) 马广威 2024-05-16 09:44:13 +08:00
  • 37cf4ca435 1、新增sf_oca模块 yuxianghui 2024-05-16 09:42:35 +08:00
  • 1c441d388f 1、序列号模型添加Rfid字段的重复校验；功能刀具模型优化搜索视图的字段；优功能刀具组装流程的值 yuxianghui 2024-05-16 09:41:57 +08:00