jinling.yang
|
d80b4b6169
|
新增库存模块的位置，外协出库，外协入库模板
|
2023-04-12 17:33:15 +08:00 |
|
jinling.yang
|
6ff307f364
|
1.优化sf的产品页面展示：新增服务产品的工艺参数字段，当产品类别为服务时，该字段出现出现，材料和型号隐藏；加工参数里的表面工艺参数字段的值显示为表面工艺+可选参数
2.修复sf的表面工艺工单及完成后的询价单
|
2023-04-03 17:42:31 +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 |
|
jinling.yang
|
446bd04a9d
|
新增同步mrs的表面工艺类别接口
|
2023-03-23 18:18:57 +08:00 |
|
jinling.yang
|
740df7c99a
|
新增表面工艺外协需求
|
2023-03-20 17:37:23 +08:00 |
|
马广威
|
9e5f70c988
|
Accept Merge Request #152: (feature/修正关系bug -> develop)
Merge Request: 修正关系bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/152?initial=true
|
2023-03-16 11:39:15 +08:00 |
|
mgw
|
4b82d20f18
|
修正bug
|
2023-03-16 11:37:35 +08:00 |
|
马广威
|
1d9e64e5e2
|
Accept Merge Request #151: (feature/优化数采功能 -> develop)
Merge Request: 数采优化，增加刀具对象的字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/151?initial=true
|
2023-03-16 10:37:20 +08:00 |
|
mgw
|
5f09b1f5cd
|
刀位对象增加寿命等字段
|
2023-03-16 10:30:41 +08:00 |
|
gqh
|
00fdf38cc7
|
测试devops
|
2023-03-15 16:30:29 +08:00 |
|
gqh
|
593ad9ecd5
|
测试devops
|
2023-03-15 10:07:53 +08:00 |
|
gqh
|
2088006f6a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2023-03-15 09:52:36 +08:00 |
|
gqh
|
1185aa5428
|
测试devops
|
2023-03-15 09:50:08 +08:00 |
|
杨金灵
|
669ca40cf0
|
Accept Merge Request #150: (feature/删除不要的模块 -> develop)
Merge Request: 删除已存在的3D模型展示模块
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/150?initial=true
|
2023-03-14 17:53:20 +08:00 |
|
jinling.yang
|
7846490de6
|
该3d模型模块已存在，无需再次存在
|
2023-03-14 17:50:48 +08:00 |
|
gqh
|
b9b22632ff
|
devops测试
|
2023-03-14 17:23:29 +08:00 |
|
gqh
|
780269429e
|
测试devops
|
2023-03-14 17:02:55 +08:00 |
|
gqh
|
2f24f102e5
|
devops测试
|
2023-03-14 16:46:36 +08:00 |
|
gqh
|
f0e49b6322
|
测试devops
|
2023-03-14 16:29:01 +08:00 |
|
gqh
|
1bff27f400
|
测试devops
|
2023-03-14 15:35:15 +08:00 |
|
龚启豪
|
bfd4f3c592
|
Accept Merge Request #149: (feature/一键打印功能 -> develop)
Merge Request: sf更新代码
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/149?initial=true
|
2023-03-14 14:58:10 +08:00 |
|
gqh
|
84ef243b9f
|
sf新增表面工艺参数同步接口和基础对象，新增dockerfile和requirements.txt文件
|
2023-03-14 14:56:18 +08:00 |
|
mgw
|
7074911b6e
|
修正合并下发bug
|
2023-03-10 18:18:12 +08:00 |
|
杨金灵
|
8b6a3c10f8
|
Accept Merge Request #148: (feature/3D模型展示 -> develop)
Merge Request: 3d模型展示
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/148?initial=true
|
2023-03-10 10:56:10 +08:00 |
|
jinling.yang
|
8e41e772ff
|
产品创建时上传3D模型
|
2023-03-10 10:53:05 +08:00 |
|
jinling.yang
|
dfeeed7b59
|
制造订单，产品，工单上进行3d模型展示
|
2023-03-09 17:34:44 +08:00 |
|
gqh
|
fddc8100d6
|
工单返工优化待排序（工单就绪状态还没完成）
|
2023-03-08 17:15:06 +08:00 |
|
mgw
|
e576a8f98d
|
增加“机床主轴转速”字段
|
2023-03-08 16:20:03 +08:00 |
|
马广威
|
52913d31be
|
Accept Merge Request #147: (feature/优化京东物流对接 -> develop)
Merge Request: 优化收货人公司字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/147?initial=true
|
2023-03-08 15:26:34 +08:00 |
|
mgw
|
a4ee163aa7
|
优化收货人公司字段
|
2023-03-08 15:24:55 +08:00 |
|
jinling.yang
|
2df811d4ce
|
产品新增3d模型展示
|
2023-03-06 17:02:21 +08:00 |
|
gqh
|
06efa1b777
|
3d模型
|
2023-03-03 18:17:48 +08:00 |
|
mgw
|
bebbaa2a5e
|
更改python地址解析包成功
|
2023-02-28 18:02:21 +08:00 |
|
gqh
|
adaecd6e09
|
一键打印功能
|
2023-02-28 17:32:24 +08:00 |
|
马广威
|
84a674e4e2
|
Accept Merge Request #146: (feature/增加一键下发时的补偿功能，改显示bug -> develop)
Merge Request: 增加一键下发时的补偿功能，改显示bug
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/146?initial=true
|
2023-02-27 15:38:29 +08:00 |
|
mgw
|
cbf51065b7
|
增加一键下发补偿值，优化显示bug
|
2023-02-27 15:29:12 +08:00 |
|
马广威
|
dcdb3534dd
|
Accept Merge Request #145: (feature/优化NC下发 -> develop)
Merge Request: NC下发测试成功，请求合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/145?initial=true
|
2023-02-27 14:57:30 +08:00 |
|
mgw
|
659651b930
|
增加sf.cnc.processing缺省视图
|
2023-02-27 14:52:20 +08:00 |
|
mgw
|
dd9d20ea2a
|
更改python地址解析库
|
2023-02-27 11:11:23 +08:00 |
|
mgw
|
57d403d754
|
下发完成后，关闭ftp连接
|
2023-02-27 09:52:17 +08:00 |
|
龚启豪
|
ad44c7c6a3
|
Accept Merge Request #143: (feature/sf胚料序号码验证 -> develop)
Merge Request: 坯料认证判断
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/143?initial=true
|
2023-02-27 09:44:51 +08:00 |
|
mgw
|
8247acb79a
|
优化代码，恢复屏蔽代码，准备去测试新的NC下发
|
2023-02-27 09:43:24 +08:00 |
|
mgw
|
6ae0abac94
|
三种下发方式均可被记录，本地测试成功
|
2023-02-24 17:47:28 +08:00 |
|
gqh
|
4ec5f2c1de
|
验证坯料序列号
|
2023-02-24 17:23:00 +08:00 |
|
mgw
|
5fbe834528
|
合并下发已完成，正在增加下发记录对象
|
2023-02-23 22:11:32 +08:00 |
|
mgw
|
444e99b4cf
|
合并下发功能已完成，待测试
|
2023-02-23 11:04:58 +08:00 |
|
mgw
|
52b045b658
|
合并下发本地测试已成功
|
2023-02-23 10:57:42 +08:00 |
|