Commit Graph

222 Commits

Author SHA1 Message Date
jinling.yang
e638245b8a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
2023-08-08 17:18:06 +08:00
jinling.yang
b3f2065edd 夹具物料注册 2023-08-07 17:29:17 +08:00
jinling.yang
aa7e39c28a 新增采购入库时实时注册夹具产品到cloud 2023-08-04 17:33:21 +08:00
jinling.yang
72b3e736c0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复 2023-07-26 18:39:59 +08:00
jinling.yang
ae2fdad4f1 1.物料page里的库存模型新增物料长宽高三个字段
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
2023-07-21 17:35:44 +08:00
jinling.yang
1a0fa3fdb0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-06 17:33:47 +08:00
jinling.yang
6dc2935741 采购入库若选择的产品是刀具,则优化序列号生成规则 2023-06-16 17:10:31 +08:00
jinling.yang
f2218f7afb 出入库单新增验证及单个外协表面工艺Bug修复 2023-05-17 14:18:23 +08:00
jinling.yang
4e81243adc 出入库单状态修复 2023-05-16 17:32:23 +08:00
jinling.yang
cdb5493461 新增出库单验证前置和后置条件,外协工单点击完成时生成询价单 2023-05-12 17:36:59 +08:00
jinling.yang
32d53df8ec 表面工艺外协需求,不包含页面展示外协出入库单 2023-04-21 15:32:55 +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
a5c707bf43 判断外协工序是否连续有多个外协工序为同一个供应商(产品为表面工艺服务的供应商), 2023-04-14 17:54:20 +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
a812c603ea 代码规范整理,产品页面模型和胚料的模型类型字段做显示 2023-02-09 15:26:08 +08:00
gqh
5495f2436a 优化工单,英文改为中文展示,解除托盘展示托盘 2023-02-01 14:07:33 +08:00
jinling.yang
b7723f82d0 优化sf获取cnc程序和ftp 2023-01-09 19:54:02 +08:00
jinling.yang
a3e39d4fac 产品和制造订单新增模型和occ查看模型模块 2022-12-30 10:00:17 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
jinling.yang
c3fdaf8d76 更改制造模块名 2022-11-22 09:41:52 +08:00