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

Commit Graph

  • ceffbd012e Accept Merge Request #877: (feature/修复产品页面合并问题 -> develop) 马广威 2024-02-29 15:44:50 +08:00
  • 12c3869794 修复产品页面合并问题 jinling.yang 2024-02-29 15:43:49 +08:00
  • 5a348ae685 Accept Merge Request #876: (feature/修复权限 -> develop) 杨金灵 2024-02-29 15:34:30 +08:00
  • c1da64fc36 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复权限 jinling.yang 2024-02-29 15:32:54 +08:00
  • c262110b9a 修复权限 jinling.yang 2024-02-29 15:30:10 +08:00
  • dac0c4e767 Accept Merge Request #875: (feature/刀具添加归档功能 -> develop) 禹翔辉 2024-02-29 14:54:41 +08:00
  • 25e65b39bc Merge branch 'feature/刀具物料序列号优化' into feature/刀具添加归档功能 yuxianghui 2024-02-29 14:52:47 +08:00
  • 3c569fd485 1、刀具组和刀具管理模块下的所以模型添加active字段，添加已归档搜索方式；2、解决俩个警告；3、产品模型的刀具物料、型号、规格字段添加当产品物料为刀具时必填及红星样式；4、关闭刀具物料查询模型和CAM用刀模型的创建按钮； yuxianghui 2024-02-29 14:48:21 +08:00
  • 7c3b6de41b Accept Merge Request #874: (feature/修复分配工厂创建订单和质检接口 -> develop) 马广威 2024-02-29 14:44:40 +08:00
  • abdc522f9f 修复分配工厂创建订单和质检接口 jinling.yang 2024-02-29 14:42:10 +08:00
  • ec5297937d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-29 11:23:29 +08:00
  • ff768a6e5d Merge branch 'feature/修复质检接口' into develop jinling.yang 2024-02-29 11:22:35 +08:00
  • e0ffe68446 Accept Merge Request #873: (feature/修复质检接口 -> develop) 杨金灵 2024-02-29 11:22:21 +08:00
  • 0bc055b1a7 优化加工订单接口日志 jinling.yang 2024-02-29 11:09:20 +08:00
  • 6b8789a54b 修复产品页面涉及到其他模型的访问权限 jinling.yang 2024-02-29 11:03:02 +08:00
  • d270eaefd0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复质检接口 jinling.yang 2024-02-29 10:35:38 +08:00
  • 5dd89d3afc 修复质检接口 jinling.yang 2024-02-29 10:34:18 +08:00
  • 556e6ba261 Accept Merge Request #872: (feature/修改机床参数bug -> develop) 马广威 2024-02-28 17:15:56 +08:00
  • 75354c67db 修改设备oee自动生成，设备刀库编码规则 qihao.gong@jikimo.com 2024-02-28 17:14:42 +08:00
  • cf7da65ff9 Accept Merge Request #871: (feature/刀具物料序列号优化 -> develop) 禹翔辉 2024-02-28 16:55:34 +08:00
  • 17b167f1de Merge branch 'feature/必填字段添加红星样式' into feature/刀具物料序列号优化 yuxianghui 2024-02-28 16:53:43 +08:00
  • 6937d59b9f 1、优化采购刀具物料时刀具物料的序列号生成规则 yuxianghui 2024-02-28 16:52:27 +08:00
  • e2e8b0a287 Accept Merge Request #870: (feature/修复质检接口 -> develop) 杨金灵 2024-02-28 16:47:00 +08:00
  • c89f3623f6 修复质检接口 jinling.yang 2024-02-28 16:45:50 +08:00
  • a5122e2e18 Accept Merge Request #869: (feature/优化cnc程序和检测文件 -> develop) 马广威 2024-02-28 16:08:57 +08:00
  • 7d96963b60 修复cnc程序排序 jinling.yang 2024-02-28 16:03:26 +08:00
  • b6acb48dbf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化cnc程序和检测文件 jinling.yang 2024-02-28 15:54:10 +08:00
  • 0538763059 1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段 jinling.yang 2024-02-28 15:53:46 +08:00
  • 6a07c09686 Accept Merge Request #868: (feature/前端样式修改 -> develop) 黄焱 2024-02-28 14:45:54 +08:00
  • 19be421875 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 黄焱 2024-02-28 14:44:16 +08:00
  • 1c6544ffbf 修改，增加强制必填字段方法 黄焱 2024-02-28 14:42:57 +08:00
  • 58d2367f02 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-02-28 09:44:07 +08:00
  • 569e28b229 优化质量模块翻译 mgw 2024-02-28 09:43:44 +08:00
  • ab6a3f8b6b Accept Merge Request #867: (feature/前端样式修改 -> develop) 黄焱 2024-02-27 17:58:21 +08:00
  • f2c8bd7333 修改*样式，增加扫码枪判断 黄焱 2024-02-27 17:57:00 +08:00
  • 9d2e8d020b Accept Merge Request #866: (feature/制造代码优化 -> develop) 马广威 2024-02-27 17:33:50 +08:00
  • 586216fa01 代码优化 mgw 2024-02-27 17:33:08 +08:00
  • 70038e05c8 处理排程处按钮的显隐规则 mgw 2024-02-27 17:23:15 +08:00
  • e301a4d211 Accept Merge Request #865: (feature/必填字段添加红星样式 -> develop) 禹翔辉 2024-02-27 17:22:31 +08:00
  • 659f869d63 取消刀具安全库存的tree视图必填样式 yuxianghui 2024-02-27 17:20:42 +08:00
  • 0952bc9b70 Merge branch 'feature/工单rfid解绑' into feature/必填字段添加红星样式 yuxianghui 2024-02-27 17:17:19 +08:00
  • 0f8bee120b 1、新增必填字段前添加 * 的样式；2、给刀具管理模块的必填字段添加红星样式； yuxianghui 2024-02-27 17:15:22 +08:00
  • e4e03e1765 Accept Merge Request #864: (feature/制造代码优化 -> develop) 马广威 2024-02-27 15:52:08 +08:00
  • 27c83f7d3c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 mgw 2024-02-27 15:49:34 +08:00
  • 391dedc7b1 产品加工进度反馈给销售订单 mgw 2024-02-27 15:47:16 +08:00
  • fdddf19d13 增加中控接口返回对工单、计划单属性的改变（状态，时间等） mgw 2024-02-27 11:42:59 +08:00
  • 46f74405a1 Accept Merge Request #863: (feature/去掉多余定义的bfm_url -> develop) 杨金灵 2024-02-27 11:24:43 +08:00
  • de6db3c313 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/去掉多余定义的bfm_url jinling.yang 2024-02-27 11:21:18 +08:00
  • 2ddff54311 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-27 11:21:05 +08:00
  • a423d0c3bf 去掉多余定义的bfm_url jinling.yang 2024-02-27 11:20:32 +08:00
  • d684dfe8d0 Accept Merge Request #862: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-27 10:52:51 +08:00
  • e22e4801c1 修改工单布局 qihao.gong@jikimo.com 2024-02-27 10:51:50 +08:00
  • 8b7de5ec25 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-27 10:50:17 +08:00
  • a1afcc517a Merge branch 'feature/优化工单搜索' into develop jinling.yang 2024-02-27 10:49:34 +08:00
  • 25eab5c203 Accept Merge Request #861: (feature/优化工单搜索 -> develop) 杨金灵 2024-02-27 10:49:20 +08:00
  • 545c1a0407 修复销售总监审核未通过审核按钮未隐藏 jinling.yang 2024-02-27 10:46:41 +08:00
  • 42acd22978 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-27 10:38:43 +08:00
  • 3ff8e6d0f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单搜索 jinling.yang 2024-02-27 10:38:32 +08:00
  • 424754db1a 1.工单查询页面新增工序类型和状态搜索面板 2.销售模块新增delivery依赖 jinling.yang 2024-02-27 10:37:59 +08:00
  • dfada55cf7 Accept Merge Request #860: (feature/工单rfid解绑 -> develop) 禹翔辉 2024-02-26 17:22:08 +08:00
  • 7f50a3f1d3 Merge branch 'feature/刀具物料搜索计算方法优化' into feature/工单rfid解绑 yuxianghui 2024-02-26 17:19:45 +08:00
  • ed1a528fa7 Accept Merge Request #859: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-26 17:12:03 +08:00
  • c9825805db 1、解除装夹工单时解除RFID码和工单的绑定关系 yuxianghui 2024-02-26 17:10:34 +08:00
  • e70a91d1ec 修改定时同步接口，机床参数 qihao.gong@jikimo.com 2024-02-26 17:07:16 +08:00
  • bf7926acf4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-26 16:39:43 +08:00
  • 1fcc0d2ae3 Merge branch 'feature/优化cnc程序' into develop jinling.yang 2024-02-26 16:39:30 +08:00
  • 74678a56f7 Accept Merge Request #858: (feature/优化cnc程序 -> develop) 杨金灵 2024-02-26 16:39:13 +08:00
  • 2a39320fc3 优化获取cnc程序的判断条件 jinling.yang 2024-02-26 16:37:54 +08:00
  • c528c62536 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化cnc程序 jinling.yang 2024-02-26 16:35:01 +08:00
  • 28a080d1cd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-26 16:34:43 +08:00
  • 267667b3f5 优化cnc程序， jinling.yang 2024-02-26 16:34:26 +08:00
  • 0b6f5db9ff Accept Merge Request #857: (feature/刀具物料搜索计算方法优化 -> develop) 禹翔辉 2024-02-26 12:09:33 +08:00
  • a103f84635 Merge branch 'feature/刀具物料搜索优化' into feature/刀具物料搜索计算方法优化 yuxianghui 2024-02-26 12:07:39 +08:00
  • da89b2f00d 删除刀具物料搜索的计算字段的store=True属性，优化计算方法； yuxianghui 2024-02-26 12:06:00 +08:00
  • 30e7c616a2 Accept Merge Request #856: (feature/刀具物料搜索优化 -> develop) 禹翔辉 2024-02-26 11:42:43 +08:00
  • 690c388143 解决刀具物料搜索的计算字段数据问题； yuxianghui 2024-02-26 11:39:25 +08:00
  • dbdc2e1238 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-23 19:49:55 +08:00
  • 6c98ea7781 Accept Merge Request #855: (feature/修改机床参数bug -> develop) 马广威 2024-02-23 18:38:45 +08:00
  • 85f4d01cee 修改库位变更接口 qihao.gong@jikimo.com 2024-02-23 18:33:35 +08:00
  • 33b456d991 Accept Merge Request #854: (feature/修改机床参数bug -> develop) 马广威 2024-02-23 18:20:34 +08:00
  • 8c8aa63b3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug qihao.gong@jikimo.com 2024-02-23 18:15:45 +08:00
  • 5e97f0ef2d 修改库位变更接口 qihao.gong@jikimo.com 2024-02-23 18:15:28 +08:00
  • a255155b4d Accept Merge Request #853: (feature/中控接口优化1 -> develop) 禹翔辉 2024-02-23 17:35:45 +08:00
  • 97165a0a82 Merge branch 'feature/刀具组接口18-19优化' into feature/中控接口优化1 yuxianghui 2024-02-23 17:33:32 +08:00
  • db48ef396e 1、优化中控接口14-16 yuxianghui 2024-02-23 17:29:04 +08:00
  • 1cd05f53b1 Accept Merge Request #852: (feature/ftp添加新的注释 -> develop) 马广威 2024-02-23 17:26:33 +08:00
  • e126b812b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-23 17:25:08 +08:00
  • 4fcbf57e97 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop jinling.yang 2024-02-23 17:24:58 +08:00
  • 6b2608e419 ftp添加新的注释 jinling.yang 2024-02-23 17:24:46 +08:00
  • 9c1365f45e Accept Merge Request #851: (feature/修改机床参数bug -> develop) 马广威 2024-02-23 17:21:32 +08:00
  • acf99d3e05 修改库存信息接口 qihao.gong@jikimo.com 2024-02-23 17:20:25 +08:00
  • 73ee29246f Merge branch 'feature/ftp添加输出' into develop jinling.yang 2024-02-23 16:51:08 +08:00
  • 73e4106dc9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/ftp添加输出 jinling.yang 2024-02-23 16:50:25 +08:00
  • 96cdc2aba8 Accept Merge Request #850: (feature/ftp添加输出 -> develop) 马广威 2024-02-23 16:48:02 +08:00
  • 342ff9e025 Accept Merge Request #849: (feature/修改机床参数bug -> develop) 马广威 2024-02-23 16:47:40 +08:00
  • c2ad923581 ftp添加输出 jinling.yang 2024-02-23 16:46:52 +08:00
  • 6a7cff656b 修改库位信息接口 qihao.gong@jikimo.com 2024-02-23 16:46:30 +08:00
  • 7a00108852 Accept Merge Request #848: (feature/修改机床参数bug -> develop) 龚启豪 2024-02-23 16:42:53 +08:00
  • e1d6726d8b 修改库区信息方法 qihao.gong@jikimo.com 2024-02-23 16:41:09 +08:00
  • dcd0f5f892 Accept Merge Request #847: (feature/修复质检接口 -> develop) 杨金灵 2024-02-23 16:33:21 +08:00