From 28e3e82a42eca0cd2c98185e2a48cf838a6eeccb Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 17 Mar 2025 03:09:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=8F=91=E8=BF=90?= =?UTF-8?q?=EF=BC=8C=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/api/base/IMesLoadingListService.java | 5 + .../controller/base/MesLoadingListController.java | 38 ++++ .../serviceimpl/base/MesLoadingListService.java | 218 ++++++++++++++++++++- .../serviceimpl/base/MesVolvoRackService.java | 12 +- 4 files changed, 271 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java index 5f62aee..df22ebf 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; import io.swagger.annotations.ApiOperation; +import java.util.List; + /** * @Description: * @CreateDate 2024/04/16 @@ -13,4 +15,7 @@ public interface IMesLoadingListService extends IBaseMesService @ApiOperation("根据发运单号查询装车单信息") MesLoadingList getMesLoadingListByShippingCode(String organizeCode, String shippingCode); + void doSubmit(List ids); + + void doCreateVolvoAsn(List ids); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java index 3314042..9d06a2d 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java @@ -1,16 +1,54 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base; +import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListService; import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Api(description = "装车单主页面") @RestController @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesLoadingVehiclesOrder") public class MesLoadingListController extends BaseMesController { + @Autowired + private IMesLoadingListService mesLoadingListService; + + @PostMapping(value = "/submit") + @ApiOperation(value = "确认") + public ResultBean submit(@RequestBody List ids) { + try { + mesLoadingListService.doSubmit(ids); + return ResultBean.success("确认成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @PostMapping(value = "/createVolvoAsn") + @ApiOperation(value = "创建沃尔沃的ASN") + public ResultBean createVolvoAsn(@RequestBody List ids) { + try { + mesLoadingListService.doCreateVolvoAsn(ids); + return ResultBean.success("确认成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java index 3b6f0b2..51bfbae 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java @@ -7,22 +7,29 @@ import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.mes.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; +import cn.estsh.i3plus.platform.common.tool.TimeTool; 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.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup; +import cn.estsh.i3plus.pojo.mes.bean.edi.cd.*; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail; import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement; +import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail; import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel; import cn.estsh.i3plus.pojo.mes.repository.MesLoadingListDetailRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository; import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository; +import cn.estsh.i3plus.pojo.mes.repository.edi.cd.*; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import cn.hutool.core.date.DateTime; import lombok.extern.slf4j.Slf4j; +import org.elasticsearch.common.recycler.Recycler; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,8 +37,10 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; @Service @Slf4j @@ -42,11 +51,23 @@ public class MesLoadingListService extends BaseMesService implem @Autowired private MesShippingOrderManagementRepository shippingOrderManagementRepository; @Autowired + private MesShippingOrderManagementDetailRepository shippingOrderManagementDetailRDao; + @Autowired private MesLoadingListDetailRepository listDetailRepository; @Autowired private IMesPartShippingGroupService mesPartShippingGroupService; @Autowired private ISyncFuncService syncFuncService; + @Autowired + private MesCimVolvoJisRackIdDetailRepository volvoJisRackIdDetailRDao; + @Autowired + private MesCimVolvoJisRackIdRepository volvoJisRackIdRDao; + @Autowired + private MesCimVolvoLdjisRepository volvoLdjisRDao; + @Autowired + private MesCimVolvoAsnRepository volvoAsnRDao; + @Autowired + private MesCimVolvoAsnDetailRepository volvoAsnDetailRDao; @Override public MesLoadingList insert(MesLoadingList bean) { @@ -173,7 +194,7 @@ public class MesLoadingListService extends BaseMesService implem } } - + @Override protected void onInsertBean(MesLoadingList item) { List shippingOrderNoList = new ArrayList<>(); @@ -225,6 +246,7 @@ public class MesLoadingListService extends BaseMesService implem } + @Override protected void setPackQueryBean(MesLoadingList bean, DdlPackBean packBean) { DdlPreparedPack.getStringEqualPack(bean.getOrderCode(), "orderCode", packBean); DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean); @@ -243,4 +265,198 @@ public class MesLoadingListService extends BaseMesService implem DdlPreparedPack.getNumEqualPack(mesLoadingListDetail.getPid(),"id",packBean); return baseRDao.getByProperty(packBean); } + + @Override + public void doSubmit(List ids) { + List loadingLists = getMesLoadingListByIds(ids); + for (MesLoadingList loadingList : loadingLists) { + if (loadingList.getStatus() > MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue()) { + throw ImppExceptionBuilder.newInstance() + .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) + .setErrorDetail(String.format("装车单已扫描，不能再确认或取消确认！")) + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .build(); + } + } + + for (MesLoadingList loading : loadingLists) { + List orderManagements = getMesShippingOrderManagement(loading); + if (loading.getStatus() == MesExtEnumUtil.MES_LOADING_STATUS.CREATE.getValue()) { + loading.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue()); + for (MesShippingOrderManagement orderManagement : orderManagements) { + orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.LOADING.getValue()); + shippingOrderManagementRepository.update(orderManagement); + } + baseRDao.update(loading); + } else if (loading.getStatus() == MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue()) { + loading.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.CREATE.getValue()); + for (MesShippingOrderManagement orderManagement : orderManagements) { + orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue()); + shippingOrderManagementRepository.update(orderManagement); + } + baseRDao.update(loading); + } + } + } + + @Override + public void doCreateVolvoAsn(List ids) { + String organizeCode = AuthUtilExt.getOrganizeCode(); + List loadingLists = getMesLoadingListByIds(ids); + for (MesLoadingList loading : loadingLists) { + if (loading.getStatus() != MesExtEnumUtil.MES_LOADING_STATUS.SCANNED.getValue()) { + throw ImppExceptionBuilder.newInstance() + .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) + .setErrorDetail(String.format("装车单【%s】未执行装车校验！", loading.getOrderCode())) + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .build(); + } + } + for (MesLoadingList loading : loadingLists) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(loading.getId(), "pid", packBean); + List details = listDetailRepository.findByHqlWhere(packBean); + if (CollectionUtils.isEmpty(details)) { + throw ImppExceptionBuilder.newInstance() + .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) + .setErrorDetail(String.format("装车单【%s】明细为空！", loading.getOrderCode())) + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .build(); + } + MesCimVolvoJisRackId jisRackId = null; + for (MesLoadingListDetail detail : details) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(detail.getShippingCode(), "shippingCode", ddlPackBean); + MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(ddlPackBean); + if (orderManagement != null) { + ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(orderManagement.getId(), "pid", ddlPackBean); + List orderManagementDetails = shippingOrderManagementDetailRDao.findByHqlWhere(ddlPackBean); + for (MesShippingOrderManagementDetail orderManagementDetail : orderManagementDetails) { + if (orderManagementDetail.getSourceId() != null) { + MesCimVolvoJisRackIdDetail rackIdDetail = volvoJisRackIdDetailRDao.getById(orderManagementDetail.getSourceId()); + if (rackIdDetail != null) { + jisRackId = volvoJisRackIdRDao.getById(rackIdDetail.getJisRackIdFid()); + break; + } + } + } + } + if (jisRackId != null) { + break; + } + } + if (jisRackId == null) { + continue; + } + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(jisRackId.getConsignmentReference(), "consignmentReference", ddlPackBean); + MesCimVolvoLdjis volvoLdjis = volvoLdjisRDao.getByProperty(ddlPackBean); + if (volvoLdjis == null) { + continue; + } + + MesCimVolvoAsn volvoAsn = new MesCimVolvoAsn(); + volvoAsn.setOrganizeCode(organizeCode); + volvoAsn.setAsnDate(TimeTool.getNowTime("yyyy-MM-dd HH:mm:ss.SSS")); + volvoAsn.setAsnTime(TimeTool.getNowTime("yyyy-MM-dd HH:mm:ss.SSS")); + volvoAsn.setStatus(10); + volvoAsn.setMessage(volvoLdjis.getInterchangeHeader()); + volvoAsn.setProject(volvoLdjis.getMessageHeader()); + volvoAsn.setBeginningOfMessage(volvoLdjis.getBeginningOfMessage()); + volvoAsn.setSeller(volvoLdjis.getSeller()); + volvoAsn.setBuyer(volvoLdjis.getBuyer()); + volvoAsn.setShipFrom(volvoLdjis.getShipFrom()); + volvoAsn.setShipTo(volvoLdjis.getShipTo()); + volvoAsn.setAdviceNoteNo(volvoLdjis.getConsignmentReference()); + volvoAsn.setPlaceOfDischarge(volvoLdjis.getIdForPlaceOfDischarge()); + volvoAsn.setMtq(0.0); + volvoAsn.setKgm(0.0); + loading.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.CREATE_ASN.getValue()); + ConvertBean.serviceModelInitialize(volvoAsn, AuthUtil.getSessionUser().getUserName()); + volvoAsnRDao.save(volvoAsn); + + int packageId = 1; + for (MesLoadingListDetail detail : details) { + ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(detail.getShippingCode(), "shippingCode", ddlPackBean); + MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(ddlPackBean); + if (orderManagement != null) { + if (StringUtils.isEmpty(volvoAsn.getAsnNo())) { + ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(orderManagement.getShippingCode(), "jisRackId", ddlPackBean); + MesCimVolvoJisRackId rackId = volvoJisRackIdRDao.getByProperty(ddlPackBean); + if (rackId != null) { + volvoAsn.setAsnNo(rackId.getAsnNo()); + } + } + + ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(orderManagement.getId(), "pid", ddlPackBean); + List orderManagementDetails = shippingOrderManagementDetailRDao.findByHqlWhere(ddlPackBean); + for (MesShippingOrderManagementDetail orderManagementDetail : orderManagementDetails) { + MesCimVolvoJisRackId rackId = null; + MesCimVolvoJisRackIdDetail rackIdDetail = volvoJisRackIdDetailRDao.getById(orderManagementDetail.getSourceId()); + if (rackIdDetail != null) { + rackId = volvoJisRackIdRDao.getById(rackIdDetail.getJisRackIdFid()); + } + if (rackId == null) { + continue; + } + ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(rackId.getConsignmentReference(), "consignmentReference", ddlPackBean); + DdlPreparedPack.getStringEqualPack(rackId.getJisRackId(), "rackId", ddlPackBean); + volvoLdjis = volvoLdjisRDao.getByProperty(ddlPackBean); + if (volvoLdjis == null) { + continue; + } + + MesCimVolvoAsnDetail asnDetail = new MesCimVolvoAsnDetail(); + asnDetail.setAsnId(volvoAsn.getId()); + asnDetail.setSeq(orderManagement.getSeq()); + asnDetail.setPackagingReference(volvoLdjis.getPackageReference()); + asnDetail.setPackageTypeReference(volvoLdjis.getPackageReference()); + asnDetail.setPackageId(String.valueOf(packageId)); + asnDetail.setRackId(volvoLdjis.getRackId()); + asnDetail.setLineItem(orderManagementDetail.getCustPartNo()); + asnDetail.setDispatchedQuantity(volvoLdjis.getProductionReferencesSequenceNumber()); + asnDetail.setFyon(volvoLdjis.getProductionReferencesFyon()); + asnDetail.setRackPositionReferece(volvoLdjis.getProductionReferencesPosition()); + asnDetail.setPurchaseOrderNumber(volvoLdjis.getOrderReference()); + asnDetail.setAdditionalInternalDestination(volvoLdjis.getIdForAdditionalInternalDestination()); + asnDetail.setOrganizeCode(organizeCode); + ConvertBean.serviceModelInitialize(asnDetail, AuthUtil.getSessionUser().getUserName()); + volvoAsnDetailRDao.save(asnDetail); + packageId++; + } + } + } + } + } + + private List getMesLoadingListByIds(List ids) { + String organizeCode = AuthUtilExt.getOrganizeCode(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getInPackList(ids, "id", packBean); + return baseRDao.findByHqlWhere(packBean); + } + + private List getMesShippingOrderManagement(MesLoadingList loading) { + List orderManagements = new ArrayList<>(); + String organizeCode = AuthUtilExt.getOrganizeCode(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(loading.getId(), "pid", packBean); + List details = listDetailRepository.findByHqlWhere(packBean); + if (!CollectionUtils.isEmpty(details)) { + for (MesLoadingListDetail detail : details) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getStringEqualPack(detail.getShippingCode(), "shippingCode", ddlPackBean); + MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(ddlPackBean); + if (orderManagement != null) { + orderManagements.add(orderManagement); + } + } + } + return orderManagements; + } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java index c1f14b5..9bf5fbf 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java @@ -20,25 +20,30 @@ import java.util.List; @Slf4j public class MesVolvoRackService extends BaseMesService implements IMesVolvoRackService { + @Override protected void setPackQueryBean(MesVolvoRack bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getRackOwner(), "rackOwner", packBean); DdlPreparedPack.getNumEqualPack(bean.getRackType(), "rackType", packBean); } + @Override protected void onInsertBean(MesVolvoRack item) { // 数据校验 ValidatorBean.checkNotNull(item.getRackOwner(), "料架所有者"); ValidatorBean.checkNotNull(item.getRackSeq(), "料架系列号不能为空"); ValidatorBean.checkNotNull(item.getRackType(), "料架类型不能为空"); ValidatorBean.checkNotNull(item.getPositionTotal(), "位置总数不能为空"); + setBarcode(item); } + @Override protected void onUpdateBean(MesVolvoRack item) { // 数据校验 ValidatorBean.checkNotNull(item.getRackOwner(), "料架所有者"); ValidatorBean.checkNotNull(item.getRackSeq(), "料架系列号不能为空"); ValidatorBean.checkNotNull(item.getRackType(), "料架类型不能为空"); ValidatorBean.checkNotNull(item.getPositionTotal(), "位置总数不能为空"); + setBarcode(item); } @Override @@ -50,7 +55,12 @@ public class MesVolvoRackService extends BaseMesService implements ValidatorBean.checkNotNull(item.getRackSeq(), "料架系列号不能为空"); ValidatorBean.checkNotNull(item.getRackType(), "料架类型不能为空"); ValidatorBean.checkNotNull(item.getPositionTotal(), "位置总数不能为空"); - + setBarcode(item); } } + + private void setBarcode(MesVolvoRack bean) { + String barcode = "[)>" + (char)30 + "06" + (char)29 + "26BOD" + bean.getRackOwner().trim() + bean.getRackType().toString() + "+" + bean.getRackSeq() + (char)30 + (char)04; + bean.setBarCode(barcode); + } } From 0efed6c641c69c052edc32c89e556b8f9266f5a5 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 17 Mar 2025 11:47:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=90=E9=83=BD=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java index 9bf5fbf..5601052 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesVolvoRackService.java @@ -23,7 +23,7 @@ public class MesVolvoRackService extends BaseMesService implements @Override protected void setPackQueryBean(MesVolvoRack bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getRackOwner(), "rackOwner", packBean); - DdlPreparedPack.getNumEqualPack(bean.getRackType(), "rackType", packBean); + DdlPreparedPack.getStringLikerPack(bean.getRackType(), "rackType", packBean); } @Override