jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,187 Commits 134 Branches 31 Tags
9292fa29e672fcb3a214df09909b9896c480d3e0
Commit Graph

396 Commits

Author SHA1 Message Date
jinling.yang
f7723f1b9c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-05-29 09:30:20 +08:00
jinling.yang
fe88a416a7 制造订单合并一张编程单下发时，工件配送记录的未下发nc程序为未下发及cnc程序没有对应ftp文件路径问题 2024-05-28 17:57:27 +08:00
yuxianghui
9055e7ed8b 1、优化生成工单工序的方法 2024-05-28 16:35:06 +08:00
jinling.yang
412bf4b9be 优化返工和报废 2024-05-24 17:00:44 +08:00
jinling.yang
5f42b5d056 优化制造订单报废流程，返工流程暂停（需求需重新设计） 2024-05-23 11:46:09 +08:00
jinling.yang
ff12a86406 优化cnc工单返工：在原有的cnc工单后新增返工标志的cnc工单，且工序累加，状态为就绪，解除装夹工单的状态为等待其他工单 2024-05-22 17:35:57 +08:00
jinling.yang
f9cca591bb 修复表面工艺工单完成时对应库存(stock.move)的状态为完成并跳过标记完成方法的检查 2024-05-18 19:52:58 +08:00
jinling.yang
0f5b94e8ca 1.修复销售订单确认按钮确认后不可见2.修复表面工艺工单完成3.下发编程单工件配送优化 2024-05-18 15:26:32 +08:00
jinling.yang
ea1ed43c92 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 2024-05-17 11:00:00 +08:00
jinling.yang
934b59d213 坯料新增路线 2024-05-14 10:51:38 +08:00
jinling.yang
e916e4e155 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺外协 2024-05-12 21:33:57 +08:00
jinling.yang
9dccee84c4 1.优化同一个产品多个制造订单的编程单合并到一张编程单和一个模型库至cloud 2024-05-12 21:33:43 +08:00
mgw
391a172016 修复制造订单加工无状态问题 2024-05-11 22:42:58 +08:00
jinling.yang
ec01b89242 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单和编程 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-05-11 00:20:08 +08:00
jinling.yang
2bffc5964a 1.1修复排程工件配送没有目的生产线2.注释获取cnc程序最新代码（第二期）3.优化部分页面 2024-05-11 00:17:43 +08:00
mgw
d9543d42fd 在工单完成处控制状态，来避免非正常操作导致的制造订单状态异常问题 2024-05-10 16:01:33 +08:00
jinling.yang
3d56e54fb2 优化制造订单的获取cnc程序 2024-05-09 18:29:30 +08:00
jinling.yang
388b0b4e4c 优化制造 2024-05-09 10:37:41 +08:00
jinling.yang
d964a9feb1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化模型上色路径 2024-05-08 11:20:07 +08:00
jinling.yang
fda43deeea 1.优化根据同一个产品，生成的制造订单绑定同一个编程单需求 2024-05-07 17:33:23 +08:00
mgw
0bcd077914 优化制造订单状态问题 2024-04-24 22:53:48 +08:00
mgw
59c8631c15 库位变更接口优化 2024-04-24 08:58:15 +08:00
mgw
f236b149d8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/views/mrp_workorder_view.xml
 2024-04-23 10:56:57 +08:00
mgw
9cfc084c5c 装夹预调工单，要带图纸和模型文件及坯料长宽高参数的优化需求2：状态变化逻辑 2024-04-23 10:54:04 +08:00
mgw
49e4f92a91 装夹预调工单，要带图纸和模型文件及坯料长宽高参数的优化需求 2024-04-22 20:03:16 +08:00
jinling.yang
eb6607be00 修复获取cnc程序方法关于快速订单部分 2024-04-22 14:27:59 +08:00
jinling.yang
a30c620823 优化快读订单 2024-04-19 16:50:38 +08:00
yuxianghui
50f5815070 Merge branch 'feature/内部调拨作业详情添加Rfid字段' into feature/库存模块优化 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/mrp_workorder.py
 2024-04-19 10:54:36 +08:00
jinling.yang
040b3b16f0 修复产品条码 2024-04-19 08:33:04 +08:00
yuxianghui
f26b4510cf 1、采购入库作业详情的目标位置字段关闭创建功能，关闭货位的创建功能；2、优化入库到货位流程（进行中）； 2024-04-18 19:10:41 +08:00
jinling.yang
59670fb3d7 优化获取CNC程序：添加编程方式（人工/自动），如是快速订单，编程方式为人工 2024-04-18 18:40:05 +08:00
yuxianghui
8dfef16b51 1、产品模型、制造订单模型、工单模型，添加人工编程字段；2、放开工单扫描绑定Rfid的检验功能；3、bfm下单创建产品添加人工报价字段内容；4、优化CNC程序用刀检验库区是否有刀的流程； 2024-04-18 15:38:16 +08:00
mgw
8a800e909f 修改工单显隐控制逻辑 2024-03-11 10:56:03 +08:00
mgw
fcbe33714e 修改工单状态 2024-03-05 11:37:21 +08:00
mgw
fdddf19d13 增加中控接口返回对工单、计划单属性的改变（状态，时间等） 2024-02-27 11:42:59 +08:00
jinling.yang
da97fce6d5 新增agv相关接口 2024-02-22 17:16:16 +08:00
jinling.yang
cf2aaa38fe 1.修复材料型号同步报验证问题2.优化工单的工件派送3.计划里新增生产线的优化 2024-01-26 17:46:53 +08:00
jinling.yang
82f54b5d83 制造订单页面新增生产线和计划开始加工时间字段 2024-01-24 14:24:27 +08:00
jinling.yang
8f379a2635 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-01-23 17:42:38 +08:00
qihao.gong@jikimo.com
7b2b15d601 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_warehouse/views/view.xml
 2024-01-22 14:37:25 +08:00
qihao.gong@jikimo.com
2b7243f69c 合并cnc加工和后置检测工单，新增工单开始结束接口 2024-01-17 17:26:24 +08:00
mgw
f19af2a33f 增加排程动作对销售订单状态的修改 2024-01-12 16:40:29 +08:00
马广威
e11976bb61 Accept Merge Request #761: (feature/制造代码优化 -> develop) 
Merge Request: 修复批量排程缺少工具包的问题，修改标签翻译

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/761?initial=true
 2024-01-09 14:52:18 +08:00
qihao.gong@jikimo.com
cac7815369 处理引入缺失报错 2024-01-09 14:47:06 +08:00
qihao.gong@jikimo.com
1a896a730e 拉取最新代码 2024-01-09 14:17:38 +08:00
qihao.gong@jikimo.com
1fab9ad253 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2024-01-09 10:36:13 +08:00
qihao.gong@jikimo.com
86366cc6cb 修改工单完成后，自动完成制造订单，完工产品就绪状态 2024-01-09 10:31:43 +08:00
mgw
931b78ee03 修复批量排程缺少工具包的问题 2024-01-08 23:24:42 +08:00
mgw
e8995acc87 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-01-08 19:03:34 +08:00
mgw
fbaa81fe7a 修改制造订单的状态字段以及与排程单的交互逻辑，优化一些翻译 2024-01-08 19:02:59 +08:00