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

2417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
59c8631c15 库位变更接口优化 2024-04-24 08:58:15 +08:00
mgw
ca01b055b8 修复：计划排程时计划开始时间选择明天-执行排程后时间变成今天了 问题 2024-04-23 16:03:03 +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
杨金灵
da48e0aea2 Accept Merge Request #962: (feature/工单页面修复 -> develop) 
Merge Request: 工单页面修复

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/962?initial=true
 2024-04-23 09:58:01 +08:00
jinling.yang
4e94b8b4c8 工单页面修复 2024-04-23 09:54:44 +08:00
杨金灵
6af611b7c9 Accept Merge Request #961: (feature/优化工件配送及AGV -> develop) 
Merge Request: 优化agv相关页面及对应接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/961?initial=true
 2024-04-23 09:28:29 +08:00
jinling.yang
9a157125ba 优化agv相关页面及对应接口 2024-04-22 22:30:05 +08:00
mgw
49e4f92a91 装夹预调工单，要带图纸和模型文件及坯料长宽高参数的优化需求 2024-04-22 20:03:16 +08:00
杨金灵
b526565ac4 Accept Merge Request #960: (feature/修复快递订单模型路径字段问题 -> develop) 
Merge Request: 修复快递订单模型路径字段问题

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/960?initial=true
 2024-04-22 15:49:46 +08:00
jinling.yang
690a66b6a1 修复快递订单模型路径字段问题 2024-04-22 15:46:43 +08:00
jinling.yang
c0db402f5e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-22 15:45:29 +08:00
jinling.yang
d634cf20ba Merge branch 'feature/修复快速订单' into develop 2024-04-22 15:10:39 +08:00
杨金灵
220af93ed6 Accept Merge Request #959: (feature/修复快速订单 -> develop) 
Merge Request: 修复快速订单

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/959
 2024-04-22 15:07:17 +08:00
jinling.yang
eb6607be00 修复获取cnc程序方法关于快速订单部分 2024-04-22 14:27:59 +08:00
jinling.yang
4b2e58a66d 修复快速订单订单号和人工报价及注释掉识别长宽高代码 2024-04-22 14:14:59 +08:00
jinling.yang
9c5b3d7c4e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-22 14:04:50 +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
90c87f7ddb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-22 09:28:51 +08:00
jinling.yang
f0bfd18549 Merge branch 'feature/优化agv和ftp' into develop 2024-04-22 09:26:52 +08:00
杨金灵
c86fd099eb Accept Merge Request #957: (feature/优化agv和ftp -> develop) 
Merge Request: 优化agv和ftp

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/957
 2024-04-22 09:26:33 +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
黄焱
263b8ddec7 Accept Merge Request #956: (feature/前端样式修改 -> develop) 
Merge Request: 修复列表总计合计与单项合计错开了一列

Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/956?initial=true
 2024-04-19 15:45:17 +08:00
mgw
89eccb40ac 处理按钮显示 2024-04-19 15:42:35 +08:00
黄焱
761d0b0417 修复列表总计合计与单项合计错开了一列 2024-04-19 15:41:05 +08:00
禹翔辉
f22ee428b6 Accept Merge Request #955: (feature/库存模块优化 -> develop) 
Merge Request: 1、优化货位看板的更换货位功能、添加按编码搜索功能；

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/955
 2024-04-19 15:02:40 +08:00
yuxianghui
1a860a5eb9 1、设备机床新增机床基坐标page页及其基本信息字段，新增主动获取和被动获取基坐标数据中控接口（接口待对接）； 2024-04-19 14:59:19 +08:00
yuxianghui
96a4ee4e26 1 2024-04-19 13:42:12 +08:00
yuxianghui
80f0284c3c 1、优化货位看板的更换货位功能、添加按编码搜索功能； 2024-04-19 13:39:17 +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
禹翔辉
25ee2136c3 Accept Merge Request #954: (feature/库存模块优化 -> develop) 
Merge Request: 库存模块优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/954?initial=true
 2024-04-19 11:00:36 +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
yuxianghui
b43c3496a1 1、货位看板模型添加货位变更弹窗模块及其功能按钮，实现产品在同库区的内部货位移动； 2024-04-19 10:49:48 +08:00
杨金灵
f1972ca572 Accept Merge Request #953: (feature/优化获取CNC程序 -> develop) 
Merge Request: 优化获取cnc程序和FTP

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/953?initial=true
 2024-04-19 09:10:46 +08:00
jinling.yang
5f2600c96f 释放注释代码 2024-04-19 08:34:41 +08:00
jinling.yang
040b3b16f0 修复产品条码 2024-04-19 08:33:04 +08:00
yuxianghui
67f3c312de 1、添加采购入库作业详情选取目标货位重复校验 2024-04-18 20:46:09 +08:00
yuxianghui
f26b4510cf 1、采购入库作业详情的目标位置字段关闭创建功能，关闭货位的创建功能；2、优化入库到货位流程（进行中）； 2024-04-18 19:10:41 +08:00
jinling.yang
053fa3feb3 优化ftp路径 2024-04-18 19:09:48 +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
jinling.yang
3d1dd533b5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-04-17 17:11:39 +08:00
jinling.yang
83d1d397f5 Merge branch 'feature/优化货架货位-新增打印条码' into develop 2024-04-17 17:09:37 +08:00
杨金灵
0a9cfd916a Accept Merge Request #949: (feature/优化货架货位-新增打印条码 -> develop) 
Merge Request: 优化货架货位-新增打印条码

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/949
 2024-04-17 17:06:53 +08:00
jinling.yang
2e5dd55a7b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化货架货位-新增打印条码 2024-04-17 17:05:36 +08:00
马广威
4fb57373d5 Accept Merge Request #951: (feature/制造代码优化 -> develop) 
Merge Request: 三次元检测z计算修改

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/951?initial=true
 2024-04-17 17:03:38 +08:00
禹翔辉
8a85581347 Accept Merge Request #950: (feature/内部调拨作业详情添加Rfid字段 -> develop) 
Merge Request: 1、优化品牌同步接口，2、内部调拨作业详情添加Rfid字段；

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/950
 2024-04-17 17:03:04 +08:00