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

Commit Graph

  • 331f230974 stock.production.lot对象修改为stock.lot，http新增验证返回 jinling.yang 2022-12-12 10:04:16 +08:00
  • 5e2d75b23e 修改胚料部分 jinling.yang 2022-12-09 17:23:07 +08:00
  • a18d55850a 优化文件内容 jinling.yang 2022-12-01 17:18:49 +08:00
  • 096cd44b9c Merge branch 'feature/从ftp获取cnc程序文件' into develop jinling.yang 2022-11-30 17:27:47 +08:00
  • 1bf8e8a268 文件写入cnc关联的attach里面 jinling.yang 2022-11-30 17:19:46 +08:00
  • d1d748cf11 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-11-30 14:43:37 +08:00
  • 4fa8bb964d 合并 gqh 2022-11-30 14:42:52 +08:00
  • b2d1e9ce8c ①增加扫码绑定函数；②工单处扫码绑定托盘代码移植到mrp.workorder下；③修改报错格式为Usererror;④、返回偏差计算值 mgw 2022-11-30 14:38:58 +08:00
  • 8fce929022 从ftp获取cnc程序文件 jinling.yang 2022-11-30 11:25:37 +08:00
  • d6321bcb26 cnc对象修改 jinling.yang 2022-11-28 12:21:39 +08:00
  • b9212eec90 工单新增引用 jinling.yang 2022-11-25 10:59:53 +08:00
  • 6365eed869 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2022-11-25 10:57:03 +08:00
  • b498637154 修改cnc编程单 jinling.yang 2022-11-25 10:56:37 +08:00
  • 51ff0dc6ac 行业编码注册获取到sf gqh 2022-11-23 14:11:59 +08:00
  • dde822359a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-11-23 11:01:05 +08:00
  • 1582896ac4 机床唯一编码生成 gqh 2022-11-23 11:00:07 +08:00
  • 11a360222e cnc获取 jinling.yang 2022-11-22 21:18:15 +08:00
  • cc739a218e 新增引用 jinling.yang 2022-11-22 14:17:27 +08:00
  • bfee3e7775 新增引用 jinling.yang 2022-11-22 13:52:37 +08:00
  • 6b9fe9167e 代码终版 jinling.yang 2022-11-22 13:18:18 +08:00
  • 12615b3dba 销售和产品代码整合 jinling.yang 2022-11-22 11:08:07 +08:00
  • 3cbd1140bb mrs为名的更改为sf jinling.yang 2022-11-22 10:20:18 +08:00
  • bf5f8fd326 托盘更改模块名 jinling.yang 2022-11-22 10:00:51 +08:00
  • e12d3acf4d 修改模块分类名称 jinling.yang 2022-11-22 09:56:29 +08:00
  • c3fdaf8d76 更改制造模块名 jinling.yang 2022-11-22 09:41:52 +08:00
  • 830f3bb35e 212 jinling.yang 2022-11-21 20:04:56 +08:00
  • c4876e9631 Merge branch 'feature/修改产品等信息' into develop jinling.yang 2022-11-20 20:11:21 +08:00
  • aeb9b0f796 新增获得mrs下发编程单 jinling.yang 2022-11-20 19:44:31 +08:00
  • cbf8366cc3 工单开始需要完成上一步 gqh 2022-11-20 19:05:00 +08:00
  • a0b7b13c5e 优化获得cnc程序代码 jinling.yang 2022-11-19 22:52:47 +08:00
  • dadd2e03da 获得cnc代码 jinling.yang 2022-11-18 18:08:53 +08:00
  • 057ec915d9 更新制造订单生成工单时的工序字段 gqh 2022-11-17 17:27:05 +08:00
  • 191bd65d69 接收从智能工厂传过来的订单等数据并创建编程单 jinling.yang 2022-11-16 17:39:42 +08:00
  • 4f0df9f2bd 制造订单工序自动生成规则 gqh 2022-11-16 17:35:42 +08:00
  • 4ce0a7670c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2022-11-16 09:43:10 +08:00
  • 98c3f868e9 123 jinling.yang 2022-11-16 09:42:33 +08:00
  • ec9f82f09c 工作中心概述看板视图 gqh 2022-11-16 09:41:34 +08:00
  • ba92f616a0 工单优化更新 gqh 2022-11-15 16:16:21 +08:00
  • e23548a0d3 cnc程序上传 gqh 2022-11-11 10:31:37 +08:00
  • 8bc7cd0391 去掉不需要的文件 jinling.yang 2022-11-09 10:38:35 +08:00
  • aadbd80422 修改工单重复，业务平台分配工厂自动生成产品部分新增字段 jinling.yang 2022-11-08 18:36:36 +08:00
  • 8bb2af1f2a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-11-08 17:29:13 +08:00
  • 822cca9755 合并代码 gqh 2022-11-08 17:28:28 +08:00
  • e0a520cb77 Accept Merge Request #38: (feature/1103_sf_machine_connect -> develop) Merge Request: 更新mrs_base_view视图，添加page 马广威 2022-11-08 15:04:25 +08:00
  • 65b46249e8 Merge branch develop into feature/1103_sf_machine_connect 马广威 2022-11-08 15:03:55 +08:00
  • edd6c30176 合并代码 gqh 2022-11-08 11:44:37 +08:00
  • dc24df19c2 修改 gqh 2022-11-08 10:39:45 +08:00
  • 88bb5cccb2 Merge branch 'feature/工单流程' into develop gqh 2022-11-08 10:36:04 +08:00
  • dcbf38c039 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程 gqh 2022-11-08 10:30:00 +08:00
  • eab76f8b32 上传NC文件 gqh 2022-11-08 10:27:09 +08:00
  • 1ebfbc07b9 修改工序类型 jinling.yang 2022-11-08 10:16:43 +08:00
  • f92c5d5648 Merge branch 'feature/1108' into develop jinling.yang 2022-11-08 10:02:59 +08:00
  • c0d8fe0f6f 新增模块引用 jinling.yang 2022-11-08 10:02:41 +08:00
  • c1d6a24cd9 去掉非相关代码 jinling.yang 2022-11-08 10:01:53 +08:00
  • 1cafd2c309 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程 gqh 2022-11-07 16:43:45 +08:00
  • 7118596e1c 工单流程代码合并 gqh 2022-11-07 16:42:49 +08:00
  • cbf1cd8b0b 工序增加工序类型字段 jinling.yang 2022-11-07 15:39:26 +08:00
  • 8776fc7d6c 合并代码 gqh 2022-11-07 11:21:31 +08:00
  • 84cf25f39d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-11-07 11:00:14 +08:00
  • a49a24e9e6 合并代码 gqh 2022-11-07 10:59:22 +08:00
  • a33b16cf78 Merge branch 'feature/110301' into develop jinling.yang 2022-11-07 10:31:58 +08:00
  • 65a7d74430 修改匹配加工中心 jinling.yang 2022-11-04 16:08:43 +08:00
  • 14d0d32ab6 匹配加工中心 jinling.yang 2022-11-03 17:58:33 +08:00
  • 99d56cb53e 将采集到的数据添加到机床对象的page中 mgw 2022-11-03 17:37:19 +08:00
  • 671901cb8d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-11-03 15:11:09 +08:00
  • 9e3f17da91 Merge branch 'feature/绑定托盘功能' into develop gqh 2022-11-03 15:10:07 +08:00
  • 3dfbd7a1e4 新增工单字段 gqh 2022-11-03 15:09:36 +08:00
  • 8e337dda97 Merge branch 'feature/1025' into develop jinling.yang 2022-11-03 15:01:36 +08:00
  • f2988ddffb 根据工序模板生成工单，及相关页面新增加工面板及重复字段 jinling.yang 2022-11-03 15:01:15 +08:00
  • ae85009a18 修复模板类型工序 jinling.yang 2022-11-01 17:30:25 +08:00
  • 7067b29735 新增根据模型类型计算出产品的胚料尺寸 jinling.yang 2022-10-31 17:34:44 +08:00
  • d375787160 托盘根据工单绑定制造订单，修改托盘状态 添加解除装夹功能 三元定位增加xy 8个点的字段 gqh 2022-10-31 17:32:44 +08:00
  • 002653957e 改造制造订单里的生成工单 jinling.yang 2022-10-27 17:27:40 +08:00
  • ccb26bc4ec 托盘打印出条形码功能 gqh 2022-10-27 17:24:08 +08:00
  • 71a925334e 生成产品的BOM上的加工工序 jinling.yang 2022-10-26 17:27:32 +08:00
  • c3a7a6c4d6 工序增加唯一编码,是否重复，排序；用xml代码生成CNC加工的标准工序； 产品增加模型类型对象和加工的面，包括胚料增加的尺寸 jinling.yang 2022-10-25 17:30:13 +08:00
  • 0fb751ebbe 托盘绑定工单，托盘生成二维码 gqh 2022-10-25 17:19:42 +08:00
  • 9ee33ae0b9 Merge branch 'feature/制造订单单一制造' into develop gqh 2022-10-24 16:21:00 +08:00
  • 60bd5002bc 解决单一制造出库单bug gqh 2022-10-19 17:19:43 +08:00
  • 33adc646e2 智能工厂-制造模块基础设置新增托盘 jinling.yang 2022-10-19 15:46:07 +08:00
  • 97527da4d3 分配工厂条码字段注释去掉 jinling.yang 2022-10-19 11:51:46 +08:00
  • b24e0e1001 Merge branch 'feature/101401' into develop jinling.yang 2022-10-19 11:17:07 +08:00
  • c2bf0b09a9 修改胚料匹配规则 jinling.yang 2022-10-19 11:16:35 +08:00
  • 5b75e5423a 生成bom jinling.yang 2022-10-18 18:36:41 +08:00
  • c06fec0e74 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2022-10-14 16:41:22 +08:00
  • b4aa6b61ed 智能工厂去掉工厂token等信息 jinling.yang 2022-10-14 16:36:45 +08:00
  • 5e5d62eabd 制造订单 单个制造 gqh 2022-10-14 14:44:05 +08:00
  • 8611e138b3 新增工厂临时token密钥字段 jinling.yang 2022-10-13 17:25:25 +08:00
  • 5a0a727e8c 去掉redis等不相关需要的引用 jinling.yang 2022-10-13 17:00:19 +08:00
  • 7e98d35f14 更新sf gqh 2022-10-13 16:43:36 +08:00
  • fcea2e25ab 修复智能工厂接收业务平台订单接口bug jinling.yang 2022-10-13 16:38:18 +08:00
  • cba3ccb396 智能工厂创建产品 jinling.yang 2022-10-12 21:48:56 +08:00
  • 153abaab2d Merge commit 'd24ade9e55501e74591717f8938ac35f5089eca2' into develop jinling.yang 2022-10-11 22:02:32 +08:00
  • d24ade9e55 智能工厂API接口创建销售订单 jinling.yang 2022-10-11 21:54:44 +08:00
  • f671896219 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop gqh 2022-10-11 16:02:07 +08:00
  • aebd4d3f32 修复sf同步问题 gqh 2022-10-11 16:01:36 +08:00
  • f632dca7d9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2022-10-10 23:13:56 +08:00
  • e86a82c4b9 智能工厂接口新增相关字段 jinling.yang 2022-10-10 23:13:35 +08:00
  • 6d2292e1d0 合并业务平台 gqh 2022-10-10 17:01:22 +08:00
  • 839de4c95f 更新sf gqh 2022-10-10 10:52:24 +08:00