From a8f28c5cbe6f925b74b5459d7a03a9d99954c9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Sat, 18 May 2024 22:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AEbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesWorkCellBinService.java | 5 ++--- .../controller/base/MesWorkCellBinController.java | 6 ++--- .../base/MesCustomerOriganzeService.java | 26 +++++++++++----------- .../serviceimpl/base/MesCustomerPartService.java | 18 +++++++-------- .../serviceimpl/base/MesCustomerService.java | 18 +++++++-------- .../base/MesProdCraftRouteServiceImpl.java | 4 ++-- .../serviceimpl/base/MesShiftService.java | 4 ++++ .../serviceimpl/base/MesWorkCellBinService.java | 16 ++++++------- .../serviceimpl/base/MesWorkOrderService.java | 18 +++++++-------- 9 files changed, 59 insertions(+), 56 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java index 450d185..eb97111 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkCellBinService.java @@ -1,14 +1,13 @@ package cn.estsh.i3plus.ext.mes.api.base; -import cn.estsh.i3plus.pojo.mes.bean.MesPartPull; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg; /** * @Description: * @CreateDate 2024/04/16 * @Author mingliang.li */ -public interface IMesWorkCellBinService extends IBaseMesService { +public interface IMesWorkCellBinService extends IBaseMesService { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java index 750ba7b..db362b5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkCellBinController.java @@ -1,14 +1,14 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @Api("工位与Bin位关系") @RestController -@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellBin") +@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellBinCfg") -public class MesWorkCellBinController extends BaseMesController { +public class MesWorkCellBinController extends BaseMesController { } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java index ebc2243..512d278 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerOriganzeService.java @@ -27,18 +27,18 @@ public class MesCustomerOriganzeService extends BaseMesService impl protected void setPackQueryBean(MesCustomerPart bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean); - DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getErpPartNo(), "erpPartNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean); } @@ -43,19 +43,19 @@ public class MesCustomerPartService extends BaseMesService impl protected void onInsertBean(MesCustomerPart item) { // 数据校验 ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); - ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); + ValidatorBean.checkNotNull(item.getErpPartNo(), "零件号不能为空"); ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空"); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean); - DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getErpPartNo(), "erpPartNo", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean); boolean flg = baseRDao.isExitByHql(cellBinPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getPartNo(), item.getCustomerCode()) + .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getErpPartNo(), item.getCustomerCode()) .build(); } @@ -64,21 +64,21 @@ public class MesCustomerPartService extends BaseMesService impl protected void onUpdateBean(MesCarSeriesLoosePart item) { // 数据校验 - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空"); - ValidatorBean.checkNotNull(item.getCustomerPartNo(), "客户零件号不能为空"); + ValidatorBean.checkNotNull(item.getCustPartNo(), "客户零件号不能为空"); DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", cellBinPackBean); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", cellBinPackBean); - DdlPreparedPack.getStringEqualPack(item.getCustomerPartNo(), "customerPartNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustPartNo(), "custPartNo", cellBinPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean); boolean flg = baseRDao.isExitByHql(cellBinPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustomerPartNo(), item.getPartNo(), item.getCustomerCode()) + .setErrorDetail("【%s】客户零件号【%s】零件号【%s】客户代码已经存在，请检查数据", item.getCustPartNo(), item.getPartNo(), item.getCustCode()) .build(); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java index 68a0d13..09a2ff1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerService.java @@ -32,16 +32,16 @@ public class MesCustomerService extends BaseMesService implements I protected void onInsertBean(MesCustomer item) { // 数据校验 - ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空"); DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", roadPackBean); boolean flg = baseRDao.isExitByHql(roadPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】客户代码已经存在，请检查数据", item.getCustomerCode()) + .setErrorDetail("【%s】客户代码已经存在，请检查数据", item.getCustCode()) .build(); } @@ -65,30 +65,30 @@ public class MesCustomerService extends BaseMesService implements I } protected void setPackQueryBean(MesCustomer bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean); - DdlPreparedPack.getStringLikerPack(bean.getCustomerName(), "customerName", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean); + DdlPreparedPack.getStringLikerPack(bean.getCustName(), "custName", packBean); } protected void onDeleteId(Long id) { MesCustomer mesCustomer = baseRDao.getById(id); //校验客户物料是否存在 DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesCustomer.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringEqualPack(mesCustomer.getCustCode(), "custCode", packBean); if(mesCustomerPartRDao.isExitByHql(packBean)){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("客户代码【%s】存在客户零件号信息，请先删除对应的客户零件号信息", mesCustomer.getCustomerCode()) + .setErrorDetail("客户代码【%s】存在客户零件号信息，请先删除对应的客户零件号信息", mesCustomer.getCustCode()) .build(); } //校验客户车型配置 packBean = DdlPackBean.getDdlPackBean(mesCustomer.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(mesCustomer.getCustomerCode(), "customerCode", packBean); + DdlPreparedPack.getStringEqualPack(mesCustomer.getCustCode(), "custCode", packBean); if(mesCustomerCarModelRDao.isExitByHql(packBean)){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("客户代码【%s】存在客户车型配置信息，请先删除对应的客户车型配置信息", mesCustomer.getCustomerCode()) + .setErrorDetail("客户代码【%s】存在客户车型配置信息，请先删除对应的客户车型配置信息", mesCustomer.getCustCode()) .build(); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java index c6edd3d..92a48b7 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdCraftRouteServiceImpl.java @@ -79,7 +79,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService implements IMesShi ValidatorBean.checkNotNull(item.getShiftName(), "班次名称不能为空"); ValidatorBean.checkNotNull(item.getStartTime(), "开始时间不能为空"); ValidatorBean.checkNotNull(item.getEndTime(), "结束时间不能为空"); +/* ValidatorBean.checkNotNull(item.getWorkerQty(), "作业人数不能为空"); +*/ DdlPackBean cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getAreaCode(), "areaCode", cellBinPackBean); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java index 3536ed3..800a672 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCellBinService.java @@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -14,9 +14,9 @@ import org.springframework.stereotype.Service; @Service @Slf4j -public class MesWorkCellBinService extends BaseMesService implements IMesWorkCellBinService { +public class MesWorkCellBinService extends BaseMesService implements IMesWorkCellBinService { - protected void onInsertBean(MesWorkCellBin item) { + protected void onInsertBean(MesWorkCellBinCfg item) { // 数据校验 ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空"); ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空"); @@ -33,18 +33,18 @@ public class MesWorkCellBinService extends BaseMesService implem } cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getLocateNo(), "locateNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean); boolean flg1 = baseRDao.isExitByHql(cellBinPackBean); if (flg1) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getLocateNo()) + .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getBinCode()) .build(); } } - protected void onUpdateBean(MesWorkCellBin item) { + protected void onUpdateBean(MesWorkCellBinCfg item) { // 数据校验 ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空"); @@ -63,14 +63,14 @@ public class MesWorkCellBinService extends BaseMesService implem } cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getLocateNo(), "locateNo", cellBinPackBean); + DdlPreparedPack.getStringEqualPack(item.getBinCode(), "locateNo", cellBinPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean); boolean flg1 = baseRDao.isExitByHql(cellBinPackBean); if (flg1) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getLocateNo()) + .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getBinCode()) .build(); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 10aff37..f6419ed 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -93,7 +93,7 @@ public class MesWorkOrderService extends BaseMesService implements BeanUtils.copyProperties(bean, copyMesWorkOrder); copyMesWorkOrder.setProduceSeq(produceSeq + 1); copyMesWorkOrder.setQty(1D); - copyMesWorkOrder.setOrderNo(resultList.get(0) + "_" + copyMesWorkOrder.getOrganizeCode()); + copyMesWorkOrder.setWorkOrderNo(resultList.get(0) + "_" + copyMesWorkOrder.getOrganizeCode()); ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser()); MesWorkOrderLog workOrderLog = new MesWorkOrderLog(); @@ -123,7 +123,7 @@ public class MesWorkOrderService extends BaseMesService implements } genSerialNoModel.setPartNo(bean.getPartNo()); List resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList(); - bean.setOrderNo(resultList.get(0) + "_" + bean.getOrganizeCode()); + bean.setWorkOrderNo(resultList.get(0) + "_" + bean.getOrganizeCode()); bean.setQty(bean.getQty()); ConvertBean.serviceModelInitialize(bean, bean.getCreateUser()); @@ -214,7 +214,7 @@ public class MesWorkOrderService extends BaseMesService implements protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) { - DdlPreparedPack.getStringLikerPack(bean.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean); DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean); @@ -323,7 +323,7 @@ public class MesWorkOrderService extends BaseMesService implements DdlPackBean ddlPackBean; ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getSapWorkCenter(), "workCenterCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getProductVersion(), "productVersion", ddlPackBean); if (!mesProductVersionRDao.isExitByHql(ddlPackBean)) { MesException.throwMesBusiException("物料【%s】产线【%s】生产版本【%s】信息不存在", item.getPartNo(), mesWorkCenter.getWorkCenterCode(), item.getProductVersion()); @@ -334,12 +334,12 @@ public class MesWorkOrderService extends BaseMesService implements DdlPackBean ddlPackBean; ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", ddlPackBean); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getSapWorkCenter(), "workCenterCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean); ddlPackBean.setOrderByStr(" order by createDatetime desc "); MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean); if(Objects.isNull(mesProductVersion)){ MesException.throwMesBusiException("物料【%s】工作中心【%s】对应的生产版本信息不存在",item.getPartNo(), - mesWorkCenter.getSapWorkCenter()); + mesWorkCenter.getErpWorkCenter()); } return mesProductVersion; } @@ -395,7 +395,7 @@ public class MesWorkOrderService extends BaseMesService implements //获取生产版本 ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", ddlPackBean); - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getSapWorkCenter(), "workCenterCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getErpWorkCenter(), "workCenterCode", ddlPackBean); DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProductVersion(), "productVersion", ddlPackBean); MesProductVersion mesProductVersion = mesProductVersionRDao.getByProperty(ddlPackBean); if (null == mesProductVersion) { @@ -461,11 +461,11 @@ public class MesWorkOrderService extends BaseMesService implements newMesProductOffLine.setSerialNumber(sn); newMesProductOffLine.setUnit(mesBom.getUnit()); newMesProductOffLine.setItemUnit(mesBom.getItemUnit()); - newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getOrderNo()); + newMesProductOffLine.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); newMesProductOffLine.setWorkCenterCode(mesWorkOrder.getWorkCenterCode()); newMesProductOffLine.setWorkCellCode(mesWorkOrder.getWorkCellCode()); newMesProductOffLine.setReportType(mesWorkOrder.getReportType()); - newMesProductOffLine.setSapWorkCenter(mesWorkCenter.getSapWorkCenter()); + newMesProductOffLine.setSapWorkCenter(mesWorkCenter.getErpWorkCenter()); newMesProductOffLine.setOrganizeCode(mesWorkOrder.getOrganizeCode()); ConvertBean.serviceModelInitialize(newMesProductOffLine, mesWorkOrder.getCreateUser());