jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,584 Commits 134 Branches 0 Tags
1afc48a20e1be67a04418948bfa6782c9f9108da
Commit Graph

74 Commits

Author SHA1 Message Date
mgw
1afc48a20e 去掉销售订单加工状态 2024-05-11 23:36:18 +08:00
yuxianghui
9d96e0681c 1、注释MES装刀指令接口，删除所以该接口的调用；注释质量检测失败时对零件特采接口的调用；2、序列号模型from界面临时添加按钮，解决工厂录入的有些刀柄序列号存在位数少于10的问题（通过SQL在左侧补零）（已隐藏）； 2024-04-25 14:02:51 +08:00
yuxianghui
180db6b91e 1、调整功能刀具清单模型的菜单代码位置，解决依赖冲突问题；2、产品采购时，添加一个订单同时采购多个相同产品的校验；3、优化刀柄采购入库时，自动生成的序列号规则； 2024-04-12 16:15:02 +08:00
jinling.yang
3f86dd48ec Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化Rfid绑定工单 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/models/product_template.py
#	sf_manufacturing/views/mrp_workorder_view.xml
 2024-04-08 16:47:16 +08:00
yuxianghui
02e5972272 1、新增装夹预调工单扫拖盘Rfid绑定托盘；2、删除工单的Rfid字段的customRFID样式；3、修改序列号模型的Rfid字段的隐藏条件；4、优化刀柄、托盘物料采购时绑定Rfid的判断条件 2024-04-03 16:52:16 +08:00
yuxianghui
2580e0c795 1、优化产品采购刀具物料生成的序列号出现不连续的问题；2、采购刀柄物料时，在入库验证环节增加Rfid是否全部录入检验。 2024-04-02 15:36:28 +08:00
jinling.yang
f4f1c9f839 1.新增表面工艺外协路线初始化数据 2024-04-01 17:34:56 +08:00
yuxianghui
e89b8ac65c Merge branch 'feature/功能刀具安全库存注册' into feature/刀柄入库录入Rfid 2024-04-01 16:56:56 +08:00
mgw
82947a909e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-04-01 14:55:31 +08:00
mgw
18dcb79116 修复自定义角色打印无权限的问题 2024-04-01 14:55:10 +08:00
yuxianghui
48809cd654 1、序列号模型对象添加rfid字段且rfid仅在产品为刀柄时展示，序列号模型添加规格字段，且添加自动根据对应产品类型不同计算出其值，产品为夹具时看板展示其规格的值；2、在采购入库流程，录入序列号的过程界面添加录入rfid字段，当产品是刀柄时需录入刀柄的rfid，并在验证通过后刀柄的序列号中带有rfid码； 2024-03-29 17:37:02 +08:00
jinling.yang
303fcfaabd 查询源位置的条件=改为ilike 2024-03-27 17:28:48 +08:00
mgw
5b535fae18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-03-20 17:33:58 +08:00
mgw
ba79b358a9 调整打印机模型结构 2024-03-20 17:32:17 +08:00
mgw
c788392b36 打印配置初步优化并测试成功，自测流程成功 2024-03-20 16:58:57 +08:00
yuxianghui
952e663b31 1、解决刀具物料采购时，自动生成序列号重复问题；2、优化刀具物料生成序列号时，自动更新刀具物料查询记录的方法 2024-03-19 17:20:19 +08:00
yuxianghui
6937d59b9f 1、优化采购刀具物料时刀具物料的序列号生成规则 2024-02-28 16:52:27 +08:00
yuxianghui
cf3ec1b6ae 1、序列号模型添加二维码字段，添加自动根据序列号名称生成二维码的功能，新增打印二维码功能； 2024-02-20 15:59:58 +08:00
jinling.yang
37161e2e20 1.修改工单的托盘序列号，托盘名称，托盘品牌，托盘类型，托盘型号字段类型，且页面对应字段改为只读 
2.装夹预调工单新增扫条形码，扫码时对该工单进行自动开始并将条码里对应的托盘产品信息回填到托盘序列号，托盘名称，托盘品牌，托盘类型，托盘型号字段上，点击完成时对前置三元定位检测参数进行验证
3.研究打印序列号（多个）
 2024-01-25 17:51:57 +08:00
jinling.yang
8e3a316200 采购入库时，新增打印序列号方法 2024-01-24 17:30:59 +08:00
jinling.yang
f8c6c766cb 优化刀具模版和刀具标准库 2024-01-08 15:44:16 +08:00
mgw
ccdbfda019 优化代码，修复检测人功能 2024-01-02 17:55:02 +08:00
jinling.yang
58d4b3813b 销售1.新增进度状态字段，选项为：待排程、待加工、待发货、待收货、已收货， 
2.销售和报价页面的所有按钮根据审核状态和状态做隐藏显示控制
3.销售订单Form和Tree视图新增进度状态字段,且form表单根据状态字段的值为销售和取消时，表单不可编辑
4.产品页面的所有按钮根据销售和采购的权限组做显示和隐藏控制
 2023-12-21 17:45:29 +08:00
mgw
5fd0beab95 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-23 22:23:21 +08:00
mgw
fee3572f38 错误问题处理 2023-11-23 22:14:12 +08:00
龚启豪
9bb3b88fd6 Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 2023-11-23 16:37:53 +08:00
mgw
6fed64ba2a 计划模块增加权限控制 2023-11-22 17:55:30 +08:00
qihao.gong@jikimo.com
e6bb5db0e1 开发sf制造模块权限角色 2023-11-21 17:42:36 +08:00
jinling.yang
6738f38131 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增销售权限 
# Conflicts:
#	sf_bf_connect/models/process_status.py
 2023-11-21 16:11:24 +08:00
jinling.yang
6ec6094c5e 1.新增销售和计划权限组2.优化代码格式 2023-11-21 16:10:05 +08:00
mgw
7391b1324d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-20 17:41:51 +08:00
mgw
d53e664881 修复导入错误，优化不使用的模块 2023-11-20 17:38:03 +08:00
qihao.gong@jikimo.com
580f95f338 importrequests修改 2023-11-20 15:48:43 +08:00
qihao.gong@jikimo.com
326181fa81 Merge branch 'feature/修改机床参数bug' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-20 15:44:43 +08:00
qihao.gong@jikimo.com
6fc735063a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-11-20 15:41:50 +08:00
jinling.yang
6912160232 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品验证 
# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_wxwork_approval/models/model.py
 2023-11-20 15:11:43 +08:00
jinling.yang
7ceaadb9c4 修复引入库 2023-11-20 15:04:39 +08:00
龚启豪
fdf1b786fe Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 2023-11-20 15:03:36 +08:00
qihao.gong@jikimo.com
1da7a0195d 根据odoo规则修改py文件中得import顺序 2023-11-20 14:59:06 +08:00
mgw
a606cbfc6d 优化wrong-import-order问题 2023-11-20 12:42:48 +08:00
jinling.yang
f36c2ac096 产品优化 2023-11-16 17:35:04 +08:00
jinling.yang
eb0d83aa3a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面优化 
# Conflicts:
#	sf_manufacturing/models/stock.py
 2023-09-14 09:46:28 +08:00
jinling.yang
ad0603f921 报价和销售订单页面优化 2023-09-14 09:29:03 +08:00
mgw
43d9c54626 优化代码结构 2023-09-14 09:17:38 +08:00
jinling.yang
c1be9a90fe 采购刀具产品反注册接口新增图片字段，3d模型代码放开 2023-09-08 17:14:57 +08:00
jinling.yang
aa17de3384 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 
# Conflicts:
#	sf_dlm/views/product_template_view.xml
 2023-09-08 17:05:44 +08:00
jinling.yang
3225916629 1.优化产品页面： 
①“产品类别”字段放在开票策略后面；“内部编码”和“条码”字段放在产品标签后面；当“产品类别”为“成品”时“上传模型文件“和“模型“字段放在"销售价格"前面；
②当“产品类别”为“刀具”时，且“刀具物料”字段为“整体式刀具”,"刀柄"或"夹头"时，页面根据选择的刀具物料而新增所对应需要的字段及页面布局展示
2.采购产品时，产品的“产品类别”为”刀具“且“刀具物料”为“整体式刀具”,"刀柄"或"夹头"时，在收货单进行验证操作时，优化实时注册到Cloud的动态资源里的工厂刀具物料的接口
3.优化“产品模板"模型的部分字段
 2023-09-07 17:46:22 +08:00
马广威
dbeb975cf6 Accept Merge Request #362: (feature/生产排程 -> develop) 
Merge Request: 创建制造订单时同步创建排程单

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/362?initial=true
 2023-09-05 10:41:22 +08:00
mgw
e5213d06ae 创建制造订单时同步创建排程单 2023-09-05 10:40:25 +08:00
jinling.yang
d07098bae1 产品库存应用没有在cloud生成动态的夹具和刀具物料Bug修复 2023-08-31 17:32:42 +08:00