jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
544 Commits 134 Branches 0 Tags
8f795096c3c277059b7ab4ea63768e734096b22a
Commit Graph

544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qihao.gong@jikimo.com
ca8b4c6086 测试dev 2023-04-27 14:46:57 +08:00
马广威
7a0d4a0dfd Accept Merge Request #166: (feature/优化代码结构 -> develop) 
Merge Request: 优化平板扫码绑定托盘的渲染方式以及按钮位置

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/166?initial=true
 2023-04-26 17:38:46 +08:00
mgw
69aa731990 优化平板扫码绑定托盘的渲染形式以及按钮位置 2023-04-26 17:35:03 +08:00
龚启豪
453dd71bf4 Accept Merge Request #165: (feature/devops流程部署测试 -> develop) 
Merge Request: 测试devops流程部署

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/165
 2023-04-26 10:41:13 +08:00
qihao.gong@jikimo.com
f85c9166f1 devops流程部署测试 2023-04-26 10:33:03 +08:00
龚启豪
9ab0d590f3 Accept Merge Request #164: (feature/测试dev流程 -> develop) 
Merge Request: 测试dev

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/164?initial=true
 2023-04-26 10:12:25 +08:00
qihao.gong@jikimo.com
ad8651aa11 测试dev 2023-04-26 10:10:06 +08:00
mgw
4c75417f2a 优化代码结构 2023-04-25 22:22:26 +08:00
龚启豪
e0fb2a44f8 Accept Merge Request #163: (feature/解决coding代码警告问题 -> develop) 
Merge Request: 新增cpca

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/163?initial=true
 2023-04-25 16:23:11 +08:00
qihao.gong@jikimo.com
1be003e000 新增cpca模块 2023-04-25 16:22:09 +08:00
龚启豪
9a53f49d62 Accept Merge Request #162: (feature/解决coding代码警告问题 -> develop) 
Merge Request: 解决coding扫描代码报错

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/162?initial=true
 2023-04-25 15:07:58 +08:00
qihao.gong@jikimo.com
438628ce46 解决coding扫描代码报错问题 2023-04-25 14:42:34 +08:00
jinling.yang
b942696c69 1.销售模块的销售页面的订单行展示模型 
2.表面工艺及类别菜单的排序
 2023-04-24 17:09:16 +08:00
马广威
070f13a1c4 Accept Merge Request #161: (feature/增加平板扫码功能 -> develop) 
Merge Request: 增加平板扫码功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/161?initial=true
 2023-04-24 16:04:40 +08:00
mgw
21f7f55ae8 增加平板扫码功能 2023-04-24 16:00:08 +08:00
马广威
9300073be4 Accept Merge Request #160: (feature/增加一键合并下发功能，修正合并下发逻辑 -> develop) 
Merge Request: 一键下发代码请求合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/160
 2023-04-24 14:34:08 +08:00
马广威
307fc6c928 Merge branch develop into feature/增加一键合并下发功能，修正合并下发逻辑 2023-04-24 14:33:44 +08:00
mgw
54b534d792 优化代码 2023-04-24 14:27:33 +08:00
qihao.gong@jikimo.com
55129666c3 测试 2023-04-24 11:02:49 +08:00
qihao.gong@jikimo.com
38b383ec29 解决bug 2023-04-24 10:57:44 +08:00
qihao.gong@jikimo.com
b999e9f065 解决报错 2023-04-24 10:42:29 +08:00
qihao.gong@jikimo.com
8fd18e0f55 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-04-23 10:15:46 +08:00
qihao.gong@jikimo.com
d74a5ef835 去除多余企业版模块 2023-04-23 10:15:20 +08:00
mgw
e05db5f583 增加jd_eclp模块异常捕获功能 2023-04-21 18:02:25 +08:00
jinling.yang
843e44b441 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-04-21 17:43:29 +08:00
qihao.gong@jikimo.com
9b05b87cb4 更换数据库 2023-04-21 15:53:46 +08:00
jinling.yang
dcb63ecd6c Merge branch 'feature/表面工艺外协' into develop 2023-04-21 15:46:16 +08:00
杨金灵
d0e93f2ec4 Accept Merge Request #159: (feature/表面工艺外协 -> develop) 
Merge Request: 表面工艺外协

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/159?initial=true
 2023-04-21 15:46:04 +08:00
jinling.yang
2acdbca2b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协 
# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py
 2023-04-21 15:40:03 +08:00
jinling.yang
32d53df8ec 表面工艺外协需求，不包含页面展示外协出入库单 2023-04-21 15:32:55 +08:00
qihao.gong@jikimo.com
3cfc2b5957 更新全局扫码模块 2023-04-21 15:32:29 +08:00
龚启豪
9d6d75880f Accept Merge Request #158: (feature/整理企业版皮肤代码 -> develop) 
Merge Request: 合并企业版代码

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/158
 2023-04-21 11:27:18 +08:00
qihao.gong@jikimo.com
b12470b813 合并企业版模块 2023-04-21 11:24:52 +08:00
jinling.yang
82dcfb5018 优化及调试表面工艺外协出入库单，‘胚料’修改为‘坯料’ 2023-04-20 19:39:12 +08:00
jinling.yang
4e2947c107 sf的销售订单生成制造订单的方法,该方法内，需让制造订单和工单的数据入数据库，以便生成表面外协工艺相关的外协出入库单及关联的库存（stock.move）记录的代码可转移至生成工单的该行代码production.workorder_ids = workorders_values前后左右 2023-04-19 18:05:41 +08:00
jinling.yang
5a639d6f55 重写sf的销售订单生成制造订单的方法,该方法内，需让制造订单和工单的数据入数据库，以便生成表面外协工艺相关的外协出入库单及关联的库存（stock.move）记录 2023-04-18 17:28:18 +08:00
jinling.yang
a5c707bf43 判断外协工序是否连续有多个外协工序为同一个供应商（产品为表面工艺服务的供应商）, 2023-04-14 17:54:20 +08:00
qihao.gong@jikimo.com
d28525526a 合并企业版代码(未测试，先提交到测试分支) 2023-04-14 17:42:23 +08:00
mgw
c2a22b5ac7 平板扫码绑定托盘基本完成，但还存在小问题 2023-04-12 17:43:39 +08:00
jinling.yang
d80b4b6169 新增库存模块的位置，外协出库，外协入库模板 2023-04-12 17:33:15 +08:00
mgw
6ea811afed 可以通过改造原生js实现扫码跳转form 2023-04-04 15:12:33 +08:00
mgw
baee5a975f 返回给js的action已配置成功 2023-04-04 11:16:01 +08:00
jinling.yang
6ff307f364 1.优化sf的产品页面展示：新增服务产品的工艺参数字段，当产品类别为服务时，该字段出现出现，材料和型号隐藏；加工参数里的表面工艺参数字段的值显示为表面工艺+可选参数 
2.修复sf的表面工艺工单及完成后的询价单
 2023-04-03 17:42:31 +08:00
mgw
d236db5dfd 优化刀位等字段展示形式 2023-04-02 22:34:29 +08:00
jinling.yang
a008dbb76a 1.sf的工作中心新增表面工艺字段，工序类型新增表面工艺类型，且当工序类型为表面工艺时，则显示表面工艺，其他则不显示 
2.sf的工作中心新增工艺外协字段，该字段若被勾选则为表面工艺的外协加工中心
3.sf的销售订单上点击生成制造订单时在已有的成品工序后累加表面工艺工序，表面工艺的工序生成规则需根据表面工艺所对应的类别的排序来依次生成，并且工序里的工作中心的匹配规则需根据表面工艺的可选参数里的获取方式字段的值来匹配
 2023-03-30 17:52:05 +08:00
jinling.yang
20d9e469f5 表面工艺类别拖动排序 2023-03-29 17:48:03 +08:00
jinling.yang
93c9287717 修改表面工艺外协字段类型 2023-03-28 21:26:02 +08:00
jinling.yang
bf010e2cca 去掉警告及开发表面工艺相关需求 2023-03-27 21:04:33 +08:00
mgw
a742018956 配置所有可采集数据 2023-03-24 21:40:10 +08:00
jinling.yang
446bd04a9d 新增同步mrs的表面工艺类别接口 2023-03-23 18:18:57 +08:00