mgw
|
9d157d6083
|
处理工单可能为记录集的问题
|
2024-05-06 11:29:17 +08:00 |
|
mgw
|
3a22c817df
|
修复工单实际开始时间
|
2024-04-29 12:15:54 +08:00 |
|
mgw
|
782e266988
|
恢复工单按钮展示
|
2024-04-29 11:36:29 +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 |
|
jinling.yang
|
231536089d
|
工件装夹岗扫描托盘RFID，识别校验并带出【同运工件】名称，并自动校验【目的生产线】一致
【同运工件】校验目的生产线不一致，则弹窗提示：工件生产线不一致，请重新确认；
|
2024-04-24 14:20:26 +08:00 |
|
mgw
|
31e3f53873
|
制造订单状态优化
|
2024-04-24 13:48:56 +08:00 |
|
mgw
|
a83b8bcd14
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化
|
2024-04-24 08:58:54 +08:00 |
|
mgw
|
59c8631c15
|
库位变更接口优化
|
2024-04-24 08:58:15 +08:00 |
|
jinling.yang
|
90d1f96857
|
优化工件配送添加编码字段
|
2024-04-23 17:20:32 +08:00 |
|
yuxianghui
|
c56886aebe
|
1、接口优化
|
2024-04-23 15:33:59 +08:00 |
|
yuxianghui
|
1fa5ebd80a
|
1
|
2024-04-23 14:19:55 +08:00 |
|
yuxianghui
|
f1dad7701f
|
Merge branch 'feature/库存模块优化' into feature/新增功能刀具拆解单模型
|
2024-04-23 14:18:34 +08:00 |
|
jinling.yang
|
307e052740
|
优化agv及站点位置和对应接口
|
2024-04-23 14:05:10 +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 |
|
jinling.yang
|
4e94b8b4c8
|
工单页面修复
|
2024-04-23 09:54:44 +08:00 |
|
jinling.yang
|
9a157125ba
|
优化agv相关页面及对应接口
|
2024-04-22 22:30:05 +08:00 |
|
mgw
|
49e4f92a91
|
装夹预调工单，要带图纸和模型文件及坯料长宽高参数的优化需求
|
2024-04-22 20:03:16 +08:00 |
|
yuxianghui
|
080a3d7175
|
1、优化扫码的托盘已绑定工单的提示信息；2、优化采购订单未审核时，金额数据不能改变的bug；3、功能刀具拆解单新增根据不同情况扫库位码录入五种物料的目的库位的信息；4、功能刀具拆解单新增拆解后的Rfid字段，新增拆解单状态字段，新增刀具物料库位信息搜索过滤；5、功能刀具拆解单新增确认拆解按钮，完成点击确认拆解后的刀具物料是否报废、磨削或者更换的不同条件进行拆解后物料的不同去向的功能及生成移动历史，解除功能刀具Rfid的绑定并更改状态等。6、优化功能刀具管理下的菜单目录布局；7、
|
2024-04-22 17:59:48 +08:00 |
|
jinling.yang
|
eb6607be00
|
修复获取cnc程序方法关于快速订单部分
|
2024-04-22 14:27:59 +08:00 |
|
马广威
|
9cb1b8c5aa
|
Accept Merge Request #958: (feature/制造代码优化 -> develop)
Merge Request: 增加工单模型展示，工单物料增加长宽高值
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/958?initial=true
|
2024-04-22 10:58:54 +08:00 |
|
mgw
|
e108e2d5d6
|
增加工单模型展示，工单物料增加长宽高值
|
2024-04-22 10:58:04 +08:00 |
|
jinling.yang
|
5cb1e3c838
|
修复快速订单
|
2024-04-19 17:24:51 +08:00 |
|
jinling.yang
|
45b300f8a1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp
|
2024-04-19 16:50:59 +08:00 |
|
jinling.yang
|
a30c620823
|
优化快读订单
|
2024-04-19 16:50:38 +08:00 |
|
mgw
|
89eccb40ac
|
处理按钮显示
|
2024-04-19 15:42:35 +08:00 |
|
yuxianghui
|
1a860a5eb9
|
1、设备机床新增机床基坐标page页及其基本信息字段，新增主动获取和被动获取基坐标数据中控接口（接口待对接）；
|
2024-04-19 14:59:19 +08:00 |
|
jinling.yang
|
bcba08042b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化agv和ftp
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
# sf_mrs_connect/models/ftp_operate.py
# sf_sale/models/quick_easy_order_old.py
|
2024-04-19 11:28:50 +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 |
|