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

Commit Graph

  • 55bac0020f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-24 16:34:21 +08:00
  • a5d8e88f1d 注释OCC代码 jinling.yang 2024-07-24 16:33:47 +08:00
  • d3124bb9fe Accept Merge Request #1170: (feature/修复工单cnc校验bug_2 -> develop) 禹翔辉 2024-07-24 16:24:13 +08:00
  • 64fd6ef5dc Merge branch 'feature/修复工单cnc校验bug_1' into feature/修复工单cnc校验bug_2 yuxianghui 2024-07-24 16:21:40 +08:00
  • 001b2ead57 1、更具制造订单功能刀具状态变更第一个装夹预调工单的工单状态 yuxianghui 2024-07-24 16:20:48 +08:00
  • d0be097a9b 设备加工参数等页面修改 mgw 2024-07-24 16:19:29 +08:00
  • 0be8d0fbb2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-24 15:09:57 +08:00
  • 71faa8a835 Merge branch 'feature/修复工件配送按钮显示' into develop jinling.yang 2024-07-24 15:09:49 +08:00
  • 12afc1ef83 Accept Merge Request #1169: (feature/修复工件配送按钮显示 -> develop) 杨金灵 2024-07-24 15:08:49 +08:00
  • 34624e6592 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送按钮显示 jinling.yang 2024-07-24 15:07:05 +08:00
  • a16effd8db Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-24 15:06:58 +08:00
  • f59299d4d5 修复工件配送按钮显示 jinling.yang 2024-07-24 15:06:50 +08:00
  • c7cef27ad6 Accept Merge Request #1168: (feature/修复工单cnc校验bug_1 -> develop) 禹翔辉 2024-07-24 12:38:21 +08:00
  • b88b0fc38a Merge branch 'feature/修复工单cnc校验bug' into feature/修复工单cnc校验bug_1 yuxianghui 2024-07-24 12:35:31 +08:00
  • 4297d41dda 添加工单开始校验 yuxianghui 2024-07-24 12:32:33 +08:00
  • 3f85d058cc Accept Merge Request #1167: (feature/优化制造功能 -> develop) 马广威 2024-07-24 12:18:54 +08:00
  • 680bed9944 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-07-24 12:18:04 +08:00
  • d3e307d195 修复“同一个产品多个制造订单时-只有一张制造订单有组件” mgw 2024-07-24 12:17:32 +08:00
  • 86a011343d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-24 11:53:08 +08:00
  • fe4bd3834e Merge branch 'feature/修复cnc工单按钮显示问题' into develop jinling.yang 2024-07-24 11:52:42 +08:00
  • d3992c2a2e Accept Merge Request #1166: (feature/修复cnc工单按钮显示问题 -> develop) 杨金灵 2024-07-24 11:52:12 +08:00
  • e62ed636e7 还原注释代码 jinling.yang 2024-07-24 11:42:34 +08:00
  • f0fdeff699 修复cnc工单按钮显示问题 jinling.yang 2024-07-24 11:40:16 +08:00
  • dec85dc92f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-07-24 09:26:35 +08:00
  • f4f9591f35 设备机床信息tab调整，修复打印返回action问题 mgw 2024-07-24 09:26:19 +08:00
  • efb7334486 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-23 17:20:59 +08:00
  • b9c1224442 Merge branch 'feature/修复返工向导' into develop jinling.yang 2024-07-23 17:20:49 +08:00
  • ca1a3ff120 Accept Merge Request #1165: (feature/修复返工向导 -> develop) 杨金灵 2024-07-23 17:20:22 +08:00
  • da8e543819 修复返工向导 jinling.yang 2024-07-23 17:18:31 +08:00
  • eb236fea11 Accept Merge Request #1164: (feature/修复工单cnc校验bug -> develop) 禹翔辉 2024-07-23 16:00:39 +08:00
  • 1d271d9167 1、修复feature/修复工单cnc校验bug yuxianghui 2024-07-23 15:46:15 +08:00
  • c5cf614645 Accept Merge Request #1163: (feature/修复工单cnc校验bug -> develop) 禹翔辉 2024-07-23 11:54:58 +08:00
  • 167c280fa4 修复工单cnc校验bug yuxianghui 2024-07-23 11:53:47 +08:00
  • 69157a7b1f Accept Merge Request #1162: (feature/修复功能刀具 -> develop) 杨金灵 2024-07-23 11:48:47 +08:00
  • 2939e6bf82 修复功能刀具 jinling.yang 2024-07-23 11:47:48 +08:00
  • 96bbf3a677 Accept Merge Request #1161: (feature/修复返工(CNC加工) -> develop) 杨金灵 2024-07-23 10:48:29 +08:00
  • e3580d9ac8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工(CNC加工) jinling.yang 2024-07-23 10:33:37 +08:00
  • ded1789813 修复返工(CNC加工) jinling.yang 2024-07-23 10:33:22 +08:00
  • 759f947fa7 Accept Merge Request #1160: (feature/NC程序和功能刀具校验_1 -> develop) 禹翔辉 2024-07-23 09:13:22 +08:00
  • 302aed16ec Merge branch 'feature/NC程序和功能刀具校验' into feature/NC程序和功能刀具校验_1 yuxianghui 2024-07-23 09:08:33 +08:00
  • 7d1db793b1 Merge branch 'feature/NC程序和功能刀具校验' into feature/NC程序和功能刀具校验_1 yuxianghui 2024-07-23 09:06:57 +08:00
  • 83396f5434 修复返工(CNC加工) jinling.yang 2024-07-22 17:32:31 +08:00
  • fe9baf08f0 Merge branch refs/heads/develop into refs/heads/feature/NC程序和功能刀具校验 禹翔辉 2024-07-22 17:11:41 +08:00
  • b47cd0cdfe Accept Merge Request #1159: (feature/修复返工多面 -> develop) 杨金灵 2024-07-22 15:10:13 +08:00
  • 251e289fd1 修复返工多面 jinling.yang 2024-07-22 15:08:14 +08:00
  • 1d4ecb9895 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-22 14:47:12 +08:00
  • f3a7dcc6a4 Merge branch 'feature/无效刀返工' into feature/NC程序和功能刀具校验 yuxianghui 2024-07-22 11:36:29 +08:00
  • ebd56eb5e0 Merge branch 'feature/修复返工bug' into develop jinling.yang 2024-07-22 11:01:57 +08:00
  • 4f99a162b5 Accept Merge Request #1157: (feature/修复返工bug -> develop) 杨金灵 2024-07-22 11:01:41 +08:00
  • 28843b0733 修复返工bug jinling.yang 2024-07-22 10:57:43 +08:00
  • 8a0c968b10 修复返工bug jinling.yang 2024-07-19 17:25:51 +08:00
  • ef1c7b6b25 多余字符串信息 liaodanlong 2024-07-19 17:23:01 +08:00
  • 03fe730c50 产品添加税信息 liaodanlong 2024-07-19 16:46:53 +08:00
  • a0d3b40548 添加工厂订单和产品创建时的错误日志 liaodanlong 2024-07-19 16:46:31 +08:00
  • dfba055019 添加bfm同步时产品创建填充税值 liaodanlong 2024-07-19 16:45:46 +08:00
  • 9d3c4f8163 修复返工按钮 jinling.yang 2024-07-19 09:17:35 +08:00
  • 08831812ae Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工bug jinling.yang 2024-07-18 16:56:54 +08:00
  • 8b75658787 添加注释代码 jinling.yang 2024-07-18 16:55:59 +08:00
  • 25ac346cb7 1、cnc编程单tree视图展示刀具状态字段；2、优化制造订单的功能刀具状态字段自动更新方法，同时当工单刀具状态变化时变更缺刀备注信息，添加状态为无效刀的备注字段；3、优化当功能刀具从【刀具房】到【制造前】时进行校验，校验是否为制造订单所缺的刀，如果是则修改cnc编程单刀具状态为正常；4、优化cnc用刀校验：添加对无效刀的处理(无效刀时触发返工流程，并生成检测结果数据)，优化生成的待处理数据的数据结构； yuxianghui 2024-07-18 16:33:41 +08:00
  • 2d15782228 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-18 16:30:51 +08:00
  • 856237c4cb Merge branch 'feature/优化最新版报废' into develop jinling.yang 2024-07-18 16:30:41 +08:00
  • a47c751b04 Accept Merge Request #1155: (feature/优化最新版报废 -> develop) 杨金灵 2024-07-18 16:29:58 +08:00
  • 9bec39f4e6 还原注释代码 jinling.yang 2024-07-18 16:25:19 +08:00
  • 33bf88968c 修复返工bug jinling.yang 2024-07-18 16:17:19 +08:00
  • 7163e025d2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废 jinling.yang 2024-07-17 19:32:21 +08:00
  • 11ec448e81 Accept Merge Request #1154: (feature/修复更新程序后制造订单状态 -> develop) 杨金灵 2024-07-17 19:30:45 +08:00
  • 6c2fb043c4 修复更新程序后制造订单状态 jinling.yang 2024-07-17 19:29:21 +08:00
  • 1dcecea3d5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-17 19:07:35 +08:00
  • 88f3ac3d4e Merge branch 'feature/修复多面返工工单状态变更错误' into develop jinling.yang 2024-07-17 19:06:58 +08:00
  • 983618d798 Accept Merge Request #1153: (feature/修复多面返工工单状态变更错误 -> develop) 杨金灵 2024-07-17 19:06:42 +08:00
  • 7a9c0ff163 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-17 19:03:14 +08:00
  • 77f7602b23 修复多面返工工单状态变更错误 jinling.yang 2024-07-17 19:03:07 +08:00
  • 70b8521b90 Merge branch 'feature/销售订单、工单优化' into feature/无效刀返工 yuxianghui 2024-07-17 16:57:11 +08:00
  • 1b89642dae Merge branch 'feature/修复检测报告添加权限' into develop jinling.yang 2024-07-17 15:39:00 +08:00
  • 1968ee17cb Accept Merge Request #1152: (feature/修复检测报告添加权限 -> develop) 杨金灵 2024-07-17 15:37:57 +08:00
  • 5e83fb382f 还原rfid代码 jinling.yang 2024-07-17 15:37:20 +08:00
  • 974671ee07 修复解除装夹 jinling.yang 2024-07-17 15:33:49 +08:00
  • d8b4797ffe 检测报告添加机床操作岗权限 jinling.yang 2024-07-17 15:31:47 +08:00
  • b07e7707c7 添加计划调度岗，机床操作岗 jinling.yang 2024-07-17 15:30:38 +08:00
  • 8726f8cac3 添加报废向导；添加重新生成制造订单 jinling.yang 2024-07-17 15:20:31 +08:00
  • cb7960387b Accept Merge Request #1151: (feature/修复返工向导 -> develop) 杨金灵 2024-07-17 10:17:42 +08:00
  • 6eaf92b841 修复调用更新程序 jinling.yang 2024-07-17 10:15:05 +08:00
  • ec0b5e88b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-07-17 09:47:30 +08:00
  • f1b8ee41bc Merge branch 'feature/优化最新版返工' into develop jinling.yang 2024-07-17 09:47:18 +08:00
  • 97c0b95e2d Accept Merge Request #1150: (feature/优化最新版返工 -> develop) 杨金灵 2024-07-17 09:47:03 +08:00
  • 7ac342bfd4 返工向导隐藏工序 jinling.yang 2024-07-17 09:46:23 +08:00
  • 6c820ead44 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版返工 jinling.yang 2024-07-16 17:25:24 +08:00
  • c536dde2cc 去掉注释代码 jinling.yang 2024-07-16 17:24:15 +08:00
  • 801ff9e076 Accept Merge Request #1149: (feature/优化制造功能 -> develop) 马广威 2024-07-16 16:32:11 +08:00
  • d0e049e881 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 mgw 2024-07-16 16:31:33 +08:00
  • 81158e2fb4 修复制造订单状态 mgw 2024-07-16 16:31:18 +08:00
  • 3404cccdc8 1、货架、货位添加循环货位标签；2、功能刀具拆解选取法人货位添加只能选择循环货位的过滤条件 yuxianghui 2024-07-16 15:33:27 +08:00
  • 45bb78d7e9 Accept Merge Request #1148: (feature/表面工艺优化 -> develop) 禹翔辉 2024-07-16 14:11:57 +08:00
  • 83334e2915 1、表面工艺及同步接口添加‘加工天数’、‘路途天数’字段；2、表面工艺可选参数及同步接口添加‘工艺描述’、‘加工天数’、‘路途天数’字段 yuxianghui 2024-07-16 14:10:14 +08:00
  • d4c30f645b Accept Merge Request #1147: (feature/销售订单接口优化 -> develop) 禹翔辉 2024-07-16 10:46:37 +08:00
  • bd642812a9 创建销售订单接口添加销售明细信息‘备注’字段 yuxianghui 2024-07-16 10:45:00 +08:00
  • 3eca74518a Merge branch 'feature/CNC功能刀具用刀校验' into feature/销售订单、工单优化 yuxianghui 2024-07-16 10:41:56 +08:00
  • 37977be862 1、工单解绑时添加二次校验是否解绑成功；2、销售订单创建接口添加详情信息‘备注’字段； yuxianghui 2024-07-16 10:40:18 +08:00
  • a0bd214118 修复返工操作时工单状态及制造订单更新程序 jinling.yang 2024-07-15 17:34:18 +08:00
  • 7885794322 1.优化制造订单的检测结果:新增处理结果字段 2.优化制造订单的返工向导：加工面字段类型改为多对多，且该字段需根据处理结果为待处理的检测结果的加工面进行过滤 3.优化工单工件下产线接口：工单状态为待检测 4,.优化工单状态方法(_compute_state) jinling.yang 2024-07-12 17:32:53 +08:00