jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,555 Commits 134 Branches 31 Tags
d9543d42fd32a11b84c79fdaedc1bdbd1f33f548
Commit Graph

657 Commits

Author SHA1 Message Date
mgw
d9543d42fd 在工单完成处控制状态，来避免非正常操作导致的制造订单状态异常问题 2024-05-10 16:01:33 +08:00
mgw
e2d3b36683 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-05-09 14:51:42 +08:00
mgw
138e22255e 为工单预计时间增加初始值 2024-05-09 14:51:21 +08:00
jinling.yang
1a63f82f4b 优化agv调用中控接驳站接口 2024-05-09 11:04:59 +08:00
jinling.yang
54a08802d9 修复装夹工单状态 2024-05-09 10:45:14 +08:00
mgw
8c279828be 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-09 09:25:19 +08:00
yuxianghui
92ea9b2a4f Merge branch 'feature/坯料采购-外协与自加工流程BUG' into feature/解决工单Rfid相关bug 2024-05-08 16:53:00 +08:00
yuxianghui
5eacc01755 1、解决 装夹预调工单扫描Rfid码时提示语的制造订单号显示重复了 的缺陷， 添加工单扫描的Rfid不是托盘是其他物料的提示；2、解决刀具管理模块的菜单依赖问题；3、管理员添加货位的操作权限 2024-05-08 16:50:13 +08:00
jinling.yang
4bea41b8fd 修复快速订单没有权限问题 2024-05-08 15:07:31 +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
30053c5493 修复工件配送rfidcode没有值 2024-05-08 09:27:24 +08:00
jinling.yang
fda43deeea 1.优化根据同一个产品，生成的制造订单绑定同一个编程单需求 2024-05-07 17:33:23 +08:00
jinling.yang
b8196cc4a9 1.修复销售岗位创建快速订单没有生成销售订单问题2.工件配送Tree视图默认上产线 2024-05-07 14:44:58 +08:00
jinling.yang
ed41667477 1.采购去掉审核2.装夹预调工单验证优化 2024-05-06 16:29:54 +08:00
jinling.yang
848fe9f2f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送 2024-05-06 11:48:53 +08:00
jinling.yang
2cd666c4ae 优化agv及新增中控日志调用 2024-05-06 11:48:34 +08:00
mgw
9d157d6083 处理工单可能为记录集的问题 2024-05-06 11:29:17 +08:00
yuxianghui
402a4e1740 1、产品添加人工编程的筛选项；制造订单from视图添加人工编程字段； 2024-04-30 17:09:46 +08:00
jinling.yang
68d8c36755 优化工件配送 2024-04-30 17:05:09 +08:00
jinling.yang
b45ffcc0d2 1.优化工件配送向导2.增加rfid码字段 2024-04-29 17:34:00 +08:00
yuxianghui
a1f0a580a6 解决 工具装夹岗在工件装夹单详情扫描rfid码报错 bug 2024-04-29 17:25:29 +08:00
jinling.yang
58344b09d2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2024-04-29 15:33:41 +08:00
jinling.yang
b1d42b9421 优化工件配送和空料架 2024-04-29 15:31:46 +08:00
马广威
9e10382dd7 Accept Merge Request #985: (feature/制造代码优化 -> develop) 
Merge Request: 恢复工单按钮展示及实际开始时间

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/985
 2024-04-29 12:20:11 +08:00
mgw
3a22c817df 修复工单实际开始时间 2024-04-29 12:15:54 +08:00
mgw
782e266988 恢复工单按钮展示 2024-04-29 11:36:29 +08:00
yuxianghui
8c78a24f7e Merge branch 'feature/接口优化' into feature/功能刀具组装添加校验 2024-04-29 10:36:35 +08:00
jinling.yang
45220d75af 新增运送空料架 2024-04-28 17:34:41 +08:00
yuxianghui
9d9b454ba5 1、刀具物料刀柄、夹具物料托盘搜索模型的序列号对象字段的list列表添加Rfid字段；2、制造单搜索看板添加记数功能；3、刀具组装岗添加货位的读写权限；4、功能刀具组装单弹窗添加手动输入五种物料的货位编码时，对该货位进行多项校验； 2024-04-28 17:20:11 +08:00
jinling.yang
bc2c0f7fb0 修复站点状态未变，及页面筛选框优化 2024-04-28 15:17:41 +08:00
jinling.yang
24722f474c 修复配送时agv站点验证 2024-04-28 11:43:11 +08:00
jinling.yang
5eb946d936 优化agv需求 2024-04-28 11:34:17 +08:00
jinling.yang
b7f7f0cdff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送时间 2024-04-26 18:04:49 +08:00
jinling.yang
42178e3e1e 上下产线接口新增IsComplete判断 2024-04-26 18:04:30 +08:00
mgw
f452f0018f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-04-26 15:54:20 +08:00
mgw
cd3feb787f 增加日志打印 2024-04-26 15:53:26 +08:00
jinling.yang
8f9781dd13 修复工件配送时间 2024-04-26 14:44:26 +08:00
jinling.yang
41e551fe48 优化工件配送 2024-04-26 13:57:47 +08:00
jinling.yang
9eb891dd0b 优化agv及工件配送 2024-04-26 09:56:42 +08:00
jinling.yang
8bbb18b6f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工件配送 2024-04-25 15:43:30 +08:00
jinling.yang
11864feaa4 优化工件配送 2024-04-25 15:43:02 +08:00
yuxianghui
53ed0d76a6 Merge branch 'feature/中控对接接口优化' into feature/中控接口注释及工厂数据处理 
# Conflicts:
#	sf_manufacturing/views/mrp_production_addional_change.xml
 2024-04-25 14:10:22 +08:00
yuxianghui
9d96e0681c 1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）； 2024-04-25 14:02:51 +08:00
mgw
780944047f 中控接口增加权限认证 2024-04-25 12:26:31 +08:00
mgw
be18124186 优化制造订单号界面展示效果 2024-04-25 09:36:05 +08:00
mgw
f4433ac3cc 增加工单处的尺寸赋值 2024-04-25 09:03:17 +08:00
mgw
0bcd077914 优化制造订单状态问题 2024-04-24 22:53:48 +08:00
yuxianghui
6f2043e7e7 1、工单tree视图、from视图添加人工编程字段，及人工编程筛选项；2、序列号模型添加根据Rfid搜索的选项；3、修改零件特采接口，优化MES装刀申请接口、优化机床刀库接口； 2024-04-24 18:33:15 +08:00
mgw
f570eb9b50 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-04-24 14:24:59 +08:00
mgw
3e7bef095c 整理代码 2024-04-24 14:23:37 +08:00