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

Commit Graph

  • 22e24c5ed3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/增加批量调拨功能 mgw 2024-06-06 15:44:38 +08:00
  • 4459ed2e81 库存处增加批量调拨功能 mgw 2024-06-06 15:44:20 +08:00
  • 52bf899a1f Accept Merge Request #1067: (feature/刀具接口调整 -> develop) 禹翔辉 2024-06-06 14:41:30 +08:00
  • 002727070d 1、产品的成品、制造订单、工单添加零件图号字段； yuxianghui 2024-06-06 14:38:10 +08:00
  • 63ea5d67e8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化报废和返工 jinling.yang 2024-06-06 09:44:53 +08:00
  • 81327f04de Accept Merge Request #1065: (hotfix/优化多次编程单下发 -> develop) 杨金灵 2024-06-06 09:40:06 +08:00
  • 5e1f6a09d1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化报废和返工 jinling.yang 2024-06-06 09:37:42 +08:00
  • e8c86c6306 Accept Merge Request #1066: (hotfix/刀具预调仪 -> develop) 杨金灵 2024-06-06 09:37:10 +08:00
  • 8937bfb5dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化报废和返工 jinling.yang 2024-06-06 09:36:51 +08:00
  • fd6b579e2a Merge branch refs/heads/develop into refs/heads/hotfix/刀具预调仪 杨金灵 2024-06-06 09:30:50 +08:00
  • 0b2b162d85 Merge branch refs/heads/develop into refs/heads/hotfix/优化多次编程单下发 杨金灵 2024-06-06 09:29:39 +08:00
  • 206fc7bb21 Merge branch 'hotfix/新增刀具按批次管理' into hotfix/新增刀具按批次管理_1.1 yuxianghui 2024-06-06 09:17:32 +08:00
  • 07b1c3cceb Accept Merge Request #1063: (release/release_1.4 -> master) 马广威 2024-06-05 21:43:21 +08:00
  • f9c697d2a7 Merge branch 'hotfix/优化多次编程单下发' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4 release/release_1.4 jinling.yang 2024-06-05 18:04:10 +08:00
  • 2eaec4fa58 修复编程单下发时，删除容器内tmp目录下模型编码已有的文件 jinling.yang 2024-06-05 18:03:08 +08:00
  • e306d02ff2 Accept Merge Request #1062: (feature/前端样式修改 -> develop) 黄焱 2024-06-05 17:42:54 +08:00
  • 09c56b2c07 设置表单页面label文本不换行 黄焱 2024-06-05 17:35:07 +08:00
  • 8a1a06c3ad Merge branch 'hotfix/刀具预调仪' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4 jinling.yang 2024-06-05 17:28:33 +08:00
  • f4926820fe 1、清除刀具物料的自动调用同步方法； yuxianghui 2024-06-05 17:18:18 +08:00
  • 2055d70e27 Merge branch 'hotfix/优化多次编程单下发' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4 jinling.yang 2024-06-05 17:15:00 +08:00
  • 5361fa7678 修复create_cam_work_plan方法 jinling.yang 2024-06-05 17:14:20 +08:00
  • edf8e1004e 修改条件 jinling.yang 2024-06-05 17:00:17 +08:00
  • 2dc12d6a8c 修复create_cam_work_plan方法 jinling.yang 2024-06-05 16:59:32 +08:00
  • 17e2a3ffc3 cnc程序的程序单更新 jinling.yang 2024-06-05 16:26:34 +08:00
  • 94b718533f 注释OCC代码 jinling.yang 2024-06-05 16:21:22 +08:00
  • 7a539d7916 Merge branch 'hotfix/刀具预调仪' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1.4 jinling.yang 2024-06-05 16:11:24 +08:00
  • e258e43b51 优化多次编程单下发 jinling.yang 2024-06-05 16:09:56 +08:00
  • 1af160542c Accept Merge Request #1061: (feature/优化制造订单报废流程 -> develop) 杨金灵 2024-06-05 15:53:56 +08:00
  • 71246af16a 还原注释代码 jinling.yang 2024-06-05 15:52:50 +08:00
  • d2f4e5495e 1、功能刀具拆解单优化，添加对功能刀具的当前位置校验，只有在刀具房的刀具才能进行拆解；2、中控机床刀库接口优化，清除刀位已经移除的功能刀具信息； yuxianghui 2024-06-05 15:20:00 +08:00
  • ba2b833aa8 1 yuxianghui 2024-06-05 11:00:21 +08:00
  • cf0afd6c64 1、添加刀具预调仪功能 yuxianghui 2024-06-05 10:54:58 +08:00
  • b6acbb8357 1、功能刀具拆解单新增拆解单号，优化拆解单 yuxianghui 2024-06-05 10:23:13 +08:00
  • e290760895 Accept Merge Request #1060: (hotfix/修复工件上下产线 -> develop) 杨金灵 2024-06-05 10:13:02 +08:00
  • fdfd01605d Merge branch refs/heads/develop into refs/heads/hotfix/修复工件上下产线 杨金灵 2024-06-05 09:30:30 +08:00
  • 19799aefe4 Accept Merge Request #1059: (release/release_1.3 -> master) 马广威 2024-06-04 22:28:57 +08:00
  • d47dcc7611 1、取消创建产品时，自动生成内部参考的值；2、优化功能刀具拆解单，修改由拆解单生成的移动历史单据编码生成规则；3、优化货位看板以及货位看板的货位变更功能； yuxianghui 2024-06-04 17:25:45 +08:00
  • f33d7b79fc 优化工件上下产线 jinling.yang 2024-06-04 16:13:42 +08:00
  • 8bd5841d7a 去掉重写state方法 jinling.yang 2024-06-04 15:59:35 +08:00
  • 3882d3a3cb 1、功能刀具拆解单拆解流程优化；2、优化货位看板显示； yuxianghui 2024-06-04 11:26:00 +08:00
  • e9ab57854e 修改生成外协出入库单时，查询条件排序修改为根据create_date或id排序 jinling.yang 2024-06-04 10:48:50 +08:00
  • 6fc94042ee 中控调取cnc工单时，工单不完成，加工完成时间为当前时间 jinling.yang 2024-06-04 10:42:34 +08:00
  • b70ec36365 修改生成外协出入库单时，查询条件排序修改为根据id排序 jinling.yang 2024-06-04 10:33:40 +08:00
  • 67c4f64d08 1、优化刀具组装单、刀具组装单弹窗、刀具拆解单，添加除刀柄外刀具物料按批次号进行管理；优化界面布局，优化组装流程； yuxianghui 2024-06-03 17:34:47 +08:00
  • 3738b8d72b 中控请求接口超时改为10秒 jinling.yang 2024-06-03 17:21:42 +08:00
  • 5fb9326d8b 中控请求接口超时改为30秒 jinling.yang 2024-06-03 17:09:35 +08:00
  • 2ab9f37062 1.修复工件配送2.优化运送空料架.3.cloud下发编程单至sf时，将程序单pdf同步至制造订单的装夹预调工单的加工图纸上4.修复工件上下产线接口 jinling.yang 2024-06-03 16:59:14 +08:00
  • 711e0d1437 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程 jinling.yang 2024-06-03 16:09:08 +08:00
  • 49d55822cc Accept Merge Request #1058: (feature/优化工件上下产线及配送 -> develop) 杨金灵 2024-06-03 15:53:19 +08:00
  • ea6de0c248 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程 jinling.yang 2024-06-03 15:43:57 +08:00
  • 2db81ac2cc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件上下产线及配送 jinling.yang 2024-06-03 15:36:37 +08:00
  • a673630fd3 1.优化工件配送超时提示2.优化工件上下线接口3.优化编程单下发至cnc工单时，将程序单pdf文件也传给装夹预调工单的加工图纸字段上 jinling.yang 2024-06-03 15:36:19 +08:00
  • a7102c81d4 1、新增货位批次数量模型，用来存储货位产品的批次及其数量；完成该模型根据货位产品的出入库记录自动新增或减少货位产品批次的数量。 yuxianghui 2024-06-03 14:14:04 +08:00
  • d213a2cf54 接口调整 yuxianghui 2024-05-31 11:14:02 +08:00
  • 6c5b888bba Accept Merge Request #1057: (hotfix/新增中控接口-功能刀具查询 -> develop) 禹翔辉 2024-05-31 09:52:45 +08:00
  • d527bc6899 Accept Merge Request #1056: (release/release_1.2 -> master) 马广威 2024-05-30 21:34:14 +08:00
  • 7d6fb4f0e3 1、优化货位 yuxianghui 2024-05-30 17:26:28 +08:00
  • aa6b476e35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-30 16:53:13 +08:00
  • 263253e79e Merge branch 'feature/修复报价选择已有产品确认问题' into develop jinling.yang 2024-05-30 16:52:42 +08:00
  • edda681940 Accept Merge Request #1054: (feature/修复报价选择已有产品确认问题 -> develop) 杨金灵 2024-05-30 16:52:27 +08:00
  • 7043d2b8b7 添加日志 jinling.yang 2024-05-30 16:52:06 +08:00
  • 6d66872dee Accept Merge Request #1055: (feature/修复会计凭证借贷无法输入的问题 -> develop) 马广威 2024-05-30 16:48:56 +08:00
  • 3ab378f3bd 修复会计凭证借贷无法输入的问题 mgw 2024-05-30 16:48:02 +08:00
  • 26c979ef1d 修复报价选择已有产品确认问题 jinling.yang 2024-05-30 16:45:32 +08:00
  • 6405944cf1 1、优化功能刀具清单查询接口，新增功能刀具查询接口。 release/release_1.2 yuxianghui 2024-05-30 15:22:30 +08:00
  • 1d4aaa40cd 1、优化刀具采购入库，入库时自动生成批次号；2、优化货位看板 yuxianghui 2024-05-30 14:46:15 +08:00
  • 9aa4858774 Merge branch 'feature/空料架名称去重校验' into develop jinling.yang 2024-05-30 11:05:09 +08:00
  • d883a7ff22 新增名称校验 jinling.yang 2024-05-30 11:01:29 +08:00
  • 683e9631fa 刀具物料产品优化需求 yuxianghui 2024-05-30 09:36:17 +08:00
  • 17678c53c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/空料架名称去重校验 jinling.yang 2024-05-29 17:56:55 +08:00
  • fb3cc095b2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-29 17:56:36 +08:00
  • c437c185a4 空料架名称去重校验 jinling.yang 2024-05-29 17:56:22 +08:00
  • b3eb3ee8fa Merge branch 'feature/优化配送空料架' into develop jinling.yang 2024-05-29 15:53:59 +08:00
  • b9ec821293 Accept Merge Request #1052: (feature/优化配送空料架 -> develop) 杨金灵 2024-05-29 15:53:30 +08:00
  • f8a9fcc0ce 工件配送去掉重复的起点接驳站 jinling.yang 2024-05-29 15:26:47 +08:00
  • d12714dd65 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化配送空料架 jinling.yang 2024-05-29 15:23:32 +08:00
  • a1bea537bb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-29 15:23:12 +08:00
  • 5350675355 释放occ注释代码 jinling.yang 2024-05-29 15:22:57 +08:00
  • 65d2593db9 配送空料架开放新建 jinling.yang 2024-05-29 15:03:08 +08:00
  • a529c5513e Accept Merge Request #1051: (hotfix/制造订单的工单顺序错误bug -> develop) 禹翔辉 2024-05-29 14:37:58 +08:00
  • f5f881f256 Merge branch refs/heads/develop into refs/heads/hotfix/制造订单的工单顺序错误bug 禹翔辉 2024-05-29 14:22:15 +08:00
  • caf7aaa560 Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf jinling.yang 2024-05-29 12:50:44 +08:00
  • d2babec1aa Merge tag '修复编程单下发接口' into develop jinling.yang 2024-05-29 12:50:05 +08:00
  • ab2978b4ab Merge branch 'hotfix/修复编程单下发接口' jinling.yang 2024-05-29 12:50:04 +08:00
  • 0b9c856d56 Accept Merge Request #1050: (release/release_1_1 -> master) 马广威 2024-05-29 12:47:10 +08:00
  • 66dc7b540c Merge branch 'hotfix/修复编程单下发接口' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release_1_1 jinling.yang 2024-05-29 12:44:06 +08:00
  • decfd27401 1.修复cnc工单没有程序文件路径 2.修复编程单已下发，在工件配送时，提示未下发nc程序 jinling.yang 2024-05-29 12:41:55 +08:00
  • f71d62dad1 优化工单工序 yuxianghui 2024-05-29 11:26:17 +08:00
  • a1d8b88db2 修复工单排序 jinling.yang 2024-05-29 10:25:23 +08:00
  • b7a11f0abe 修复 【制造订单的工单顺序错误，需排查处理bug】 问题 yuxianghui 2024-05-29 09:34:41 +08:00
  • 7ab954ebbc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程 jinling.yang 2024-05-29 09:30:41 +08:00
  • f7723f1b9c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-05-29 09:30:20 +08:00
  • fe88a416a7 制造订单合并一张编程单下发时，工件配送记录的未下发nc程序为未下发及cnc程序没有对应ftp文件路径问题 jinling.yang 2024-05-28 17:57:27 +08:00
  • ef80848e9b Accept Merge Request #1048: (feature/优化工单工序 -> develop) 禹翔辉 2024-05-28 16:39:52 +08:00
  • 138dd40a9e Merge branch 'feature/组装单弹窗优化' into feature/优化工单工序 yuxianghui 2024-05-28 16:37:51 +08:00
  • dc210f7263 1 yuxianghui 2024-05-28 16:36:49 +08:00
  • 9055e7ed8b 1、优化生成工单工序的方法 yuxianghui 2024-05-28 16:35:06 +08:00
  • 6890ddf615 Accept Merge Request #1047: (feature/前端样式修改 -> develop) 黄焱 2024-05-27 17:53:23 +08:00
  • 6dc29fb50a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-05-27 17:48:06 +08:00
  • 412bf4b9be 优化返工和报废 jinling.yang 2024-05-24 17:00:44 +08:00