diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentMaterialCodeItemQrMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentMaterialCodeItemQrMapper.java index c3cdaf66..f1d83437 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentMaterialCodeItemQrMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentMaterialCodeItemQrMapper.java @@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO; import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr; -import com.nflg.wms.repository.mapper.dto.WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO; +import com.nflg.wms.repository.mapper.dto.GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; */ public interface WmsShipmentMaterialCodeItemQrMapper extends BaseMapper { - String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params); + String getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params); ShipmentMaterialCodeQRVO getInfoByQRCode(String code); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO.java similarity index 69% rename from nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java rename to nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO.java index a66361a9..401be769 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO.java @@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper.dto; import lombok.Data; @Data -public class WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO { +public class GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO { private String materialNo; private String deviceNo; private String productionOrderNumber; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentMaterialCodeItemQrService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentMaterialCodeItemQrService.java index 2dc0d014..b7c84d3a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentMaterialCodeItemQrService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentMaterialCodeItemQrService.java @@ -3,7 +3,7 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO; import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr; -import com.nflg.wms.repository.mapper.dto.WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO; +import com.nflg.wms.repository.mapper.dto.GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; */ public interface IWmsShipmentMaterialCodeItemQrService extends IService { - String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params); + String getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params); ShipmentMaterialCodeQRVO getInfoByQRCode(String code); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentMaterialCodeItemQrServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentMaterialCodeItemQrServiceImpl.java index ab093ed1..b74fe1b2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentMaterialCodeItemQrServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentMaterialCodeItemQrServiceImpl.java @@ -3,7 +3,7 @@ package com.nflg.wms.repository.service.impl; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO; import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr; import com.nflg.wms.repository.mapper.WmsShipmentMaterialCodeItemQrMapper; -import com.nflg.wms.repository.mapper.dto.WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO; +import com.nflg.wms.repository.mapper.dto.GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO; import com.nflg.wms.repository.service.IWmsShipmentMaterialCodeItemQrService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -22,8 +22,8 @@ import java.util.List; public class WmsShipmentMaterialCodeItemQrServiceImpl extends ServiceImpl implements IWmsShipmentMaterialCodeItemQrService { @Override - public String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params) { - return baseMapper.getQRCodeByParams(params); + public String getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params) { + return baseMapper.getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(params); } @Override diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml index d4a494ae..95adc2df 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml @@ -2,7 +2,7 @@ - SELECT qr.no FROM wms_shipment_material_code_item_qr qr INNER JOIN wms_shipment_material_code_item it ON qr.item_id=it."id" diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java index d58e579f..39e69999 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java @@ -20,7 +20,7 @@ import com.nflg.wms.common.util.NumberUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; -import com.nflg.wms.repository.mapper.dto.WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO; +import com.nflg.wms.repository.mapper.dto.GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO; import com.nflg.wms.repository.service.*; import com.nflg.wms.shipment.pojo.dto.MaterialCodeForwardImportDTO; import com.nflg.wms.shipment.pojo.dto.PdfPageDTO; @@ -560,11 +560,11 @@ public class MaterialCodeController extends BaseController { } @PostMapping("getQRCode") - public ApiResult getQRCode(@RequestBody MaterialCodeGetQRCodeQO query) { - WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params = new WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO(); + public ApiResult getQRCode(@Valid @RequestBody MaterialCodeGetQRCodeQO query) { + GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params = new GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO(); BeanUtil.copyProperties(query, params); params.setStatus(0); - String qrCode = materialCodeItemQrService.getQRCodeByParams(params); + String qrCode = materialCodeItemQrService.getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(params); return ApiResult.success(qrCode); }