jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
354 Commits 134 Branches 31 Tags
f2218f7afb93b46bb1a045fb1d63657b318240f4
Commit Graph

354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
f2218f7afb 出入库单新增验证及单个外协表面工艺Bug修复 2023-05-17 14:18:23 +08:00
杨金灵
d04e98a5fd Accept Merge Request #178: (feature/表面工艺外协优化项 -> develop) 
Merge Request: 出入库单状态修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/178?initial=true
 2023-05-16 17:35:16 +08:00
jinling.yang
4e81243adc 出入库单状态修复 2023-05-16 17:32:23 +08:00
杨金灵
774d688929 Accept Merge Request #176: (feature/销售订单行新增模型展示 -> develop) 
Merge Request: 销售订单行新增模型展示

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/176?initial=true
 2023-05-15 17:08:25 +08:00
jinling.yang
e1a8f68eea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示 2023-05-15 17:02:01 +08:00
杨金灵
7ec8feec2c Accept Merge Request #175: (feature/表面工艺外协优化项 -> develop) 
Merge Request: 表面工艺外协优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/175?initial=true
 2023-05-12 17:41:23 +08:00
jinling.yang
cdb5493461 新增出库单验证前置和后置条件，外协工单点击完成时生成询价单 2023-05-12 17:36:59 +08:00
龚启豪
2601c28b4e Accept Merge Request #169: (feature/devops测试部署 -> develop) 
Merge Request: devops测试部署

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/169
 2023-04-27 15:20:21 +08:00
qihao.gong@jikimo.com
f7e234e1b9 devops测试部署 2023-04-27 15:19:03 +08:00
龚启豪
c5bf185534 Accept Merge Request #167: (feature/devops流程部署测试 -> develop) 
Merge Request: 测试dev

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/167?initial=true
 2023-04-27 14:48:00 +08:00
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