From ffa70f634eaa4da242c82de40e33fa93e011911b Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Wed, 25 Dec 2024 18:00:21 +0800 Subject: [PATCH] =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/controller/base/MesBomController.java | 1 + .../i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java index a3212fd..4746e67 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesBomController.java @@ -82,6 +82,7 @@ public class MesBomController extends BaseMesController { ValidatorBean.checkNotNull(bom.getBomCode(), "BOM代码不能为空"); ValidatorBean.checkNotNull(bom.getEffStartTime(), "生效时间不能为空"); bom.setOrganizeCode(AuthUtil.getOrganizeCode()); + //bom.setOrganizeCode("C901"); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setListPager(bomService.queryMesDataTree(bom, pager)); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java index 5db3630..30e6039 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java @@ -91,8 +91,8 @@ public class MesBomService extends BaseMesService implements IMesBomServ MesBomTreeModel organize = new MesBomTreeModel(); organize.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); - // organize.setName(AuthUtil.getOrganize().getName()); - organize.setName("zxw"); + organize.setName(AuthUtil.getOrganize().getName()); + //organize.setName("zxw"); DdlPackBean packBean = DdlPackBean.getDdlPackBean(bom.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);