jinling.yang
|
a33b16cf78
|
Merge branch 'feature/110301' into develop
|
2022-11-07 10:31:58 +08:00 |
|
jinling.yang
|
65a7d74430
|
修改匹配加工中心
|
2022-11-04 16:08:43 +08:00 |
|
jinling.yang
|
14d0d32ab6
|
匹配加工中心
|
2022-11-03 17:58:33 +08:00 |
|
mgw
|
99d56cb53e
|
将采集到的数据添加到机床对象的page中
|
2022-11-03 17:37:19 +08:00 |
|
gqh
|
671901cb8d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_base/security/ir.model.access.csv
# sf_base/views/mrs_common_view.xml
|
2022-11-03 15:11:09 +08:00 |
|
gqh
|
9e3f17da91
|
Merge branch 'feature/绑定托盘功能' into develop
|
2022-11-03 15:10:07 +08:00 |
|
gqh
|
3dfbd7a1e4
|
新增工单字段
|
2022-11-03 15:09:36 +08:00 |
|
jinling.yang
|
8e337dda97
|
Merge branch 'feature/1025' into develop
|
2022-11-03 15:01:36 +08:00 |
|
jinling.yang
|
f2988ddffb
|
根据工序模板生成工单，及相关页面新增加工面板及重复字段
|
2022-11-03 15:01:15 +08:00 |
|
jinling.yang
|
ae85009a18
|
修复模板类型工序
|
2022-11-01 17:30:25 +08:00 |
|
jinling.yang
|
7067b29735
|
新增根据模型类型计算出产品的胚料尺寸
|
2022-10-31 17:34:44 +08:00 |
|
gqh
|
d375787160
|
托盘根据工单绑定制造订单，修改托盘状态
添加解除装夹功能
三元定位增加xy 8个点的字段
|
2022-10-31 17:32:44 +08:00 |
|
jinling.yang
|
002653957e
|
改造制造订单里的生成工单
|
2022-10-27 17:27:40 +08:00 |
|
gqh
|
ccb26bc4ec
|
托盘打印出条形码功能
|
2022-10-27 17:24:08 +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 |
|
gqh
|
0fb751ebbe
|
托盘绑定工单，托盘生成二维码
|
2022-10-25 17:19:42 +08:00 |
|
gqh
|
9ee33ae0b9
|
Merge branch 'feature/制造订单单一制造' into develop
|
2022-10-24 16:21:00 +08:00 |
|
gqh
|
60bd5002bc
|
解决单一制造出库单bug
|
2022-10-19 17:19:43 +08:00 |
|
jinling.yang
|
33adc646e2
|
智能工厂-制造模块基础设置新增托盘
|
2022-10-19 15:46:07 +08:00 |
|
jinling.yang
|
97527da4d3
|
分配工厂条码字段注释去掉
|
2022-10-19 11:51:46 +08:00 |
|
jinling.yang
|
b24e0e1001
|
Merge branch 'feature/101401' into develop
|
2022-10-19 11:17:07 +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
|
c06fec0e74
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_base/views/menu_view.xml
# sf_base/views/mrs_common_view.xml
|
2022-10-14 16:41:22 +08:00 |
|
jinling.yang
|
b4aa6b61ed
|
智能工厂去掉工厂token等信息
|
2022-10-14 16:36:45 +08:00 |
|
gqh
|
5e5d62eabd
|
制造订单 单个制造
|
2022-10-14 14:44:05 +08:00 |
|
jinling.yang
|
8611e138b3
|
新增工厂临时token密钥字段
|
2022-10-13 17:25:25 +08:00 |
|
jinling.yang
|
5a0a727e8c
|
去掉redis等不相关需要的引用
|
2022-10-13 17:00:19 +08:00 |
|
gqh
|
7e98d35f14
|
更新sf
|
2022-10-13 16:43:36 +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
|
153abaab2d
|
Merge commit 'd24ade9e55501e74591717f8938ac35f5089eca2' into develop
|
2022-10-11 22:02:32 +08:00 |
|
jinling.yang
|
d24ade9e55
|
智能工厂API接口创建销售订单
|
2022-10-11 21:54:44 +08:00 |
|
gqh
|
f671896219
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-11 16:02:07 +08:00 |
|
gqh
|
aebd4d3f32
|
修复sf同步问题
|
2022-10-11 16:01:36 +08:00 |
|
jinling.yang
|
f632dca7d9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-10 23:13:56 +08:00 |
|
jinling.yang
|
e86a82c4b9
|
智能工厂接口新增相关字段
|
2022-10-10 23:13:35 +08:00 |
|
gqh
|
6d2292e1d0
|
合并业务平台
|
2022-10-10 17:01:22 +08:00 |
|
gqh
|
839de4c95f
|
更新sf
|
2022-10-10 10:52:24 +08:00 |
|
gqh
|
88bed4d910
|
Merge branch 'feature/合并智能工厂' into develop
|
2022-10-08 17:38:07 +08:00 |
|
gqh
|
b89ded6c47
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/合并智能工厂
|
2022-10-08 17:37:27 +08:00 |
|
gqh
|
7c7ae5f9f8
|
合并智能工厂代码
|
2022-10-08 17:37:10 +08:00 |
|
jinling.yang
|
b3d1972943
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-08 17:33:45 +08:00 |
|
jinling.yang
|
373400ed53
|
修改智能工厂接收业务平台订单接口
|
2022-10-08 17:33:27 +08:00 |
|
gqh
|
14ef518bd5
|
注册机床
|
2022-10-08 15:43:44 +08:00 |
|
gqh
|
1f2e86081b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2022-10-08 09:48:54 +08:00 |
|
gqh
|
2e6b2489ee
|
一键同步 代码优化 常量共享
|
2022-10-08 09:41:57 +08:00 |
|
jinling.yang
|
7da0591eeb
|
Merge branch 'feature/1007' into develop
|
2022-10-07 23:47:49 +08:00 |
|
jinling.yang
|
5b333fb1a6
|
这2个文件暂时废弃
|
2022-10-07 23:47:34 +08:00 |
|