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

Commit Graph

  • a82a54c464 1、功能刀具清单做编辑控制；2、刀具拆解——报废优化；3、功能刀具出入库添加刀具跳转； yuxianghui 2024-06-24 15:40:51 +08:00
  • d4253b21fe Accept Merge Request #1088: (feature/工单功能优化 -> develop) 马广威 2024-06-24 15:05:53 +08:00
  • 8356e898aa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单功能优化 mgw 2024-06-24 15:04:09 +08:00
  • f67d08fc88 工件装夹预调工单页面优化需求-1 mgw 2024-06-24 15:00:54 +08:00
  • 0a40409c6c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-24 14:56:31 +08:00
  • 927f74213e Merge branch 'feature/优化工单(cnc和cmc)涉及多个加工面' into develop jinling.yang 2024-06-24 14:56:14 +08:00
  • 8b8570a901 Accept Merge Request #1087: (feature/优化工单(cnc和cmc)涉及多个加工面 -> develop) 杨金灵 2024-06-24 14:55:49 +08:00
  • ec30a07394 修复创建移动历史记录 jinling.yang 2024-06-24 14:54:33 +08:00
  • 9110c81c73 还原OCC代码 jinling.yang 2024-06-24 14:46:47 +08:00
  • 5f4ecf8ff9 修复生成制造订单 jinling.yang 2024-06-24 14:46:02 +08:00
  • e453508f17 修改功能刀具清单查询列表:部分字段不可更改 jinling.yang 2024-06-24 14:18:42 +08:00
  • 733b554942 no message jinling.yang 2024-06-24 14:16:53 +08:00
  • eff2032762 修改fetchCNC方法· jinling.yang 2024-06-24 14:16:42 +08:00
  • 16a00bdb10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单(cnc和cmc)涉及多个加工面 jinling.yang 2024-06-24 10:53:53 +08:00
  • de6014d1dd 修复工件上下产线接口：当RFID不为空时，更改制造订单上下产线状态 jinling.yang 2024-06-21 17:39:15 +08:00
  • 66b66a935f 优化工单页面和下发编程单接口 jinling.yang 2024-06-21 17:15:05 +08:00
  • 612906e01d 修改根据多面生成工单逻辑 jinling.yang 2024-06-21 16:00:04 +08:00
  • 21f94e5523 Accept Merge Request #1086: (feature/单据跳转 -> develop) 禹翔辉 2024-06-20 17:34:24 +08:00
  • f8c1d75b63 1、刀具过滤优化 yuxianghui 2024-06-20 17:30:23 +08:00
  • fcba3b18b7 Merge branch 'feature/工件装夹预调工单页面优化' into feature/单据跳转 yuxianghui 2024-06-20 09:46:15 +08:00
  • c6a509c6f4 Accept Merge Request #1085: (release/release1.7 -> develop) 禹翔辉 2024-06-20 09:31:50 +08:00
  • ecf265fee7 Accept Merge Request #1084: (release/release1.7 -> master) 马广威 2024-06-19 20:24:20 +08:00
  • 60560fe195 1、优化工单解绑Rfid release/release1.7 yuxianghui 2024-06-19 17:40:49 +08:00
  • 67b48814f6 优化制造订单和生成工单逻辑 jinling.yang 2024-06-19 17:35:13 +08:00
  • 21f2a704db 1、对刀仪接口获取的功能刀具半径值乘二后再赋值 yuxianghui 2024-06-19 17:03:44 +08:00
  • 1f32aafc9b 1、完成 工件装夹预调工单页面优化需求-3 yuxianghui 2024-06-19 16:38:30 +08:00
  • b390712308 优化编程单下发接口 jinling.yang 2024-06-19 15:39:28 +08:00
  • c035ab8156 注释OCC代码 jinling.yang 2024-06-19 15:32:03 +08:00
  • c0b673bfd0 添加注释 yuxianghui 2024-06-19 11:23:25 +08:00
  • 6dae144d76 1、功能刀具拆解单优化；2、完成 需求坯料序列号生成规则优化2； yuxianghui 2024-06-19 11:19:47 +08:00
  • 25dddb5b3b 优化制造订单：生成制造订单的同时不生成工单 jinling.yang 2024-06-18 17:35:41 +08:00
  • 4497fb04c1 1、优化 托盘绑定工单逻辑优化 ；2 完成 整体式刀具批次/序列号生成的优化需求； 3、完成 坯料序列号生成规则优化需求1。 yuxianghui 2024-06-18 17:19:41 +08:00
  • bc4dc82beb Accept Merge Request #1083: (feature/优化预调装夹工单 -> develop) 杨金灵 2024-06-18 17:19:16 +08:00
  • 47305a2e61 添加'是否重新下发NC程序'字段 jinling.yang 2024-06-18 17:17:09 +08:00
  • 9e58835082 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-18 11:41:24 +08:00
  • 63fa0e0c37 Merge branch 'feature/优化装夹预调工单' into develop jinling.yang 2024-06-18 11:41:12 +08:00
  • c6c9974326 Accept Merge Request #1082: (feature/优化装夹预调工单 -> develop) 杨金灵 2024-06-18 11:40:49 +08:00
  • d63c3b76bf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化装夹预调工单 jinling.yang 2024-06-18 11:36:01 +08:00
  • 3793d0a174 优化装夹预调工单 jinling.yang 2024-06-18 11:35:50 +08:00
  • 903fdee420 Accept Merge Request #1081: (release/release1.6 -> master) 马广威 2024-06-17 21:34:41 +08:00
  • ee17889fe8 Accept Merge Request #1080: (feature/预调仪接口 -> develop) release/release1.6 禹翔辉 2024-06-17 17:27:27 +08:00
  • 5bec3d6061 1 yuxianghui 2024-06-17 17:24:23 +08:00
  • 0fc5b12894 Accept Merge Request #1079: (feature/修复快速订单 -> develop) 杨金灵 2024-06-17 16:39:55 +08:00
  • 3258b6cc75 修复快速订单 jinling.yang 2024-06-17 16:38:14 +08:00
  • 017404fe45 Merge branch 'feature/优化工单结束接口' into develop jinling.yang 2024-06-17 16:17:54 +08:00
  • cde6c76f83 Accept Merge Request #1078: (feature/优化工单结束接口 -> develop) 杨金灵 2024-06-17 16:16:39 +08:00
  • 7dea8c7c1e 去掉返工和报废的代码 jinling.yang 2024-06-17 16:16:22 +08:00
  • 8ade3b43c4 中控新增是否完成字段,该接口根据该字段对cnc加工工单进行完成操作 jinling.yang 2024-06-17 16:06:49 +08:00
  • c2b7abaae1 Accept Merge Request #1077: (hotfix/功能刀具出入库处理 -> develop) 禹翔辉 2024-06-17 14:40:14 +08:00
  • c1f33c5e14 Merge branch refs/heads/develop into refs/heads/hotfix/功能刀具出入库处理 禹翔辉 2024-06-17 14:36:00 +08:00
  • 01f55350e2 Accept Merge Request #1076: (feature/去掉返工报废的代码 -> develop) 杨金灵 2024-06-17 11:56:45 +08:00
  • 9202409a89 去掉返工报废的代码 jinling.yang 2024-06-17 11:53:38 +08:00
  • 2e779c4a68 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-17 11:50:25 +08:00
  • 5751837ddd Accept Merge Request #1075: (feature/刀具同步接口优化 -> develop) 禹翔辉 2024-06-17 11:46:22 +08:00
  • e2f86097a0 Merge branch 'feature/模型优化' into feature/刀具同步接口优化 yuxianghui 2024-06-17 11:42:25 +08:00
  • 77ad0dd635 优化动态刀具按批次管理的数据同步接口 yuxianghui 2024-06-17 11:40:12 +08:00
  • 21691d8816 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/打印配置优化 feature/打印配置优化 mgw 2024-06-17 11:23:49 +08:00
  • 19dd425422 打印配置优化 mgw 2024-06-17 11:23:33 +08:00
  • 73e03bd815 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-17 11:00:33 +08:00
  • 51cd156e75 Merge branch 'feature/去掉客户部分字段必填校验和返工报废代码' into develop jinling.yang 2024-06-17 11:00:02 +08:00
  • b447db1b13 Accept Merge Request #1074: (feature/去掉客户部分字段必填校验和返工报废代码 -> develop) 杨金灵 2024-06-17 10:50:27 +08:00
  • e3911c8f5a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-17 09:52:43 +08:00
  • 2892cdd99f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/去掉客户部分字段必填校验和返工报废代码 jinling.yang 2024-06-17 09:52:30 +08:00
  • 2862c5a888 去掉客户部分字段必填校验和返工报废代码 jinling.yang 2024-06-17 09:52:18 +08:00
  • ad8927fb83 Accept Merge Request #1073: (feature/模型优化 -> develop) 禹翔辉 2024-06-17 09:44:52 +08:00
  • e1f4e1e701 Merge branch 'feature/刀具接口调整' into feature/模型优化 yuxianghui 2024-06-17 09:43:00 +08:00
  • 1e90b9a18a 1、功能刀具位置计算方法添加触发条件 yuxianghui 2024-06-14 17:01:02 +08:00
  • 24edef023f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-14 16:53:26 +08:00
  • 4894576d25 Accept Merge Request #1072: (release/release_1.5 -> develop) 马广威 2024-06-14 16:21:38 +08:00
  • 904c63bfcb 1、优化功能刀具安全库存数量计算方法；2、货位看板模型添加功能刀具Rfid、名称字段 yuxianghui 2024-06-14 15:38:52 +08:00
  • a86ceb951b 1、优化功能刀具安全库存数量计算方法；2、货位看板模型添加功能刀具Rfid、名称字段 yuxianghui 2024-06-14 15:00:30 +08:00
  • dd9015dff9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-14 09:31:18 +08:00
  • 642877ff45 去除整体式刀产品的【粗/中/精】字段的必填 yuxianghui 2024-06-13 17:28:44 +08:00
  • c1935e62b9 1、重构工单工序的生成规则 yuxianghui 2024-06-13 17:24:46 +08:00
  • aa0b6a9b21 1、新增功能刀具移动到线边刀库的出入库记录 yuxianghui 2024-06-13 16:01:27 +08:00
  • 38e99a0f26 去掉货架货位打印不必要的逻辑 mgw 2024-06-13 15:29:15 +08:00
  • 9c6ca3758b 1 yuxianghui 2024-06-13 14:59:49 +08:00
  • 42644d449f 1、新增功能刀具移动历史，新增功能刀具入库到线边刀库 yuxianghui 2024-06-13 14:45:29 +08:00
  • 519c534a89 Accept Merge Request #1071: (release/release_1.5 -> master) 马广威 2024-06-13 10:49:36 +08:00
  • 741c5cf3d6 Accept Merge Request #1070: (feature/增加批量调拨功能 -> develop) 马广威 2024-06-12 16:54:00 +08:00
  • 0ad7e72b15 1、解决 刀具组装选择的批次号队友物料只剩下1个时-组装完该单据详情不显示批次信息 的bug；2、调整拆解单界面布局 release/release_1.5 yuxianghui 2024-06-12 16:28:42 +08:00
  • fa7e023dd1 修改线边库位名称 mgw 2024-06-12 16:19:33 +08:00
  • 07c7ed6dba 1、优化组装时重复选取货位时，批次号消失的问题 yuxianghui 2024-06-12 14:20:15 +08:00
  • 0f32b0acb1 1、新增功能刀具出入库 yuxianghui 2024-06-12 14:08:21 +08:00
  • 42cded8c64 1、优化功能刀具序列号 yuxianghui 2024-06-12 10:24:16 +08:00
  • 469839f38e 1、处理二维码问题 yuxianghui 2024-06-12 10:02:15 +08:00
  • 6a7fa89b67 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-06-11 17:31:59 +08:00
  • c13078291f Merge branch 'feature/工件配送添加sns' into develop jinling.yang 2024-06-11 17:25:23 +08:00
  • a3580411d6 Accept Merge Request #1069: (feature/工件配送添加sns -> develop) 杨金灵 2024-06-11 17:23:45 +08:00
  • 7d7f0348d2 1、优化产品按批量采购入库时，没有生成二维码问题； yuxianghui 2024-06-11 17:00:25 +08:00
  • d7779cdb58 修改生成制造订单时未生成编程单 jinling.yang 2024-06-11 16:57:56 +08:00
  • adafce85bd 1.工单,工件配送新增sns及给部分字段添加tracking(跟踪)及优化页面 2.优化agv：部分字段不可编辑 jinling.yang 2024-06-11 16:56:20 +08:00
  • bae947bdca 1、添加采购入库时对需要录入的Rfid进行重复校验； yuxianghui 2024-06-11 15:18:13 +08:00
  • 14d823ab6e 1、增加是否使用刀具预调仪的配置； yuxianghui 2024-06-11 11:58:58 +08:00
  • ae953c7ad6 1、更新功能刀具编码生成规则； yuxianghui 2024-06-11 10:15:54 +08:00
  • 7be5b53767 工件配送添加sns jinling.yang 2024-06-07 17:29:49 +08:00
  • 2cc91eea75 1、对模型的添加筛选和分组，优化界面 yuxianghui 2024-06-07 17:27:25 +08:00
  • 85aa13ec0a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化报废和返工 feature/优化报废和返工 jinling.yang 2024-06-07 14:54:46 +08:00
  • 2065625cd6 1、组装单添加校验 yuxianghui 2024-06-07 09:42:09 +08:00
  • 8c285c0eb5 Accept Merge Request #1068: (feature/增加批量调拨功能 -> develop) 马广威 2024-06-06 15:45:51 +08:00