Commit Graph

17 Commits

Author SHA1 Message Date
gqh
edd6c30176 合并代码 2022-11-08 11:44:37 +08:00
gqh
dc24df19c2 修改 2022-11-08 10:39:45 +08:00
gqh
dcbf38c039 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程
# Conflicts:
#	sf_base/__manifest__.py
#	sf_bpm_api/__manifest__.py
#	sf_manufacturing_orders/models/sf_production.py
2022-11-08 10:30:00 +08:00
jinling.yang
c1d6a24cd9 去掉非相关代码 2022-11-08 10:01:53 +08:00
gqh
7118596e1c 工单流程代码合并 2022-11-07 16:42:49 +08:00
gqh
a49a24e9e6 合并代码 2022-11-07 10:59:22 +08:00
jinling.yang
71a925334e 生成产品的BOM上的加工工序 2022-10-26 17:27:32 +08:00
jinling.yang
c3a7a6c4d6 工序增加唯一编码,是否重复,排序;用xml代码生成CNC加工的标准工序;
产品增加模型类型对象和加工的面,包括胚料增加的尺寸
2022-10-25 17:30:13 +08:00
jinling.yang
97527da4d3 分配工厂条码字段注释去掉 2022-10-19 11:51:46 +08:00
jinling.yang
c2bf0b09a9 修改胚料匹配规则 2022-10-19 11:16:35 +08:00
jinling.yang
5b75e5423a 生成bom 2022-10-18 18:36:41 +08:00
jinling.yang
b4aa6b61ed 智能工厂去掉工厂token等信息 2022-10-14 16:36:45 +08:00
jinling.yang
5a0a727e8c 去掉redis等不相关需要的引用 2022-10-13 17:00:19 +08:00
jinling.yang
fcea2e25ab 修复智能工厂接收业务平台订单接口bug 2022-10-13 16:38:18 +08:00
jinling.yang
cba3ccb396 智能工厂创建产品 2022-10-12 21:48:56 +08:00
jinling.yang
d24ade9e55 智能工厂API接口创建销售订单 2022-10-11 21:54:44 +08:00
jinling.yang
e86a82c4b9 智能工厂接口新增相关字段 2022-10-10 23:13:35 +08:00