rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1475 发货系统扫码装箱逻辑修改

This commit is contained in:
10002617 2026-05-06 14:38:36 +08:00
parent 63456c0a34
commit f5235759e9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentMaterialCodeItemQrMapper.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO;
import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr; 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; import java.util.List;
@ -17,7 +17,7 @@ import java.util.List;
*/ */
public interface WmsShipmentMaterialCodeItemQrMapper extends BaseMapper<WmsShipmentMaterialCodeItemQr> { public interface WmsShipmentMaterialCodeItemQrMapper extends BaseMapper<WmsShipmentMaterialCodeItemQr> {
String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params); String getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params);
ShipmentMaterialCodeQRVO getInfoByQRCode(String code); ShipmentMaterialCodeQRVO getInfoByQRCode(String code);

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java → nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper.dto;
import lombok.Data; import lombok.Data;
@Data @Data
public class WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO { public class GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO {
private String materialNo; private String materialNo;
private String deviceNo; private String deviceNo;
private String productionOrderNumber; private String productionOrderNumber;

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentMaterialCodeItemQrService.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.repository.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO;
import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr; 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; import java.util.List;
@ -17,7 +17,7 @@ import java.util.List;
*/ */
public interface IWmsShipmentMaterialCodeItemQrService extends IService<WmsShipmentMaterialCodeItemQr> { public interface IWmsShipmentMaterialCodeItemQrService extends IService<WmsShipmentMaterialCodeItemQr> {
String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params); String getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params);
ShipmentMaterialCodeQRVO getInfoByQRCode(String code); ShipmentMaterialCodeQRVO getInfoByQRCode(String code);

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentMaterialCodeItemQrServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.repository.service.impl;
import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO; import com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO;
import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr; import com.nflg.wms.repository.entity.WmsShipmentMaterialCodeItemQr;
import com.nflg.wms.repository.mapper.WmsShipmentMaterialCodeItemQrMapper; 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.nflg.wms.repository.service.IWmsShipmentMaterialCodeItemQrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -22,8 +22,8 @@ import java.util.List;
public class WmsShipmentMaterialCodeItemQrServiceImpl extends ServiceImpl<WmsShipmentMaterialCodeItemQrMapper, WmsShipmentMaterialCodeItemQr> implements IWmsShipmentMaterialCodeItemQrService { public class WmsShipmentMaterialCodeItemQrServiceImpl extends ServiceImpl<WmsShipmentMaterialCodeItemQrMapper, WmsShipmentMaterialCodeItemQr> implements IWmsShipmentMaterialCodeItemQrService {
@Override @Override
public String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params) { public String getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params) {
return baseMapper.getQRCodeByParams(params); return baseMapper.getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(params);
} }
@Override @Override

2
nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.wms.repository.mapper.WmsShipmentMaterialCodeItemQrMapper"> <mapper namespace="com.nflg.wms.repository.mapper.WmsShipmentMaterialCodeItemQrMapper">
<select id="getQRCodeByParams" resultType="string"> <select id="getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus" resultType="string">
SELECT qr.no SELECT qr.no
FROM wms_shipment_material_code_item_qr qr FROM wms_shipment_material_code_item_qr qr
INNER JOIN wms_shipment_material_code_item it ON qr.item_id=it."id" INNER JOIN wms_shipment_material_code_item it ON qr.item_id=it."id"

8
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
View File

@ -20,7 +20,7 @@ import com.nflg.wms.common.util.NumberUtil;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.*; 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.repository.service.*;
import com.nflg.wms.shipment.pojo.dto.MaterialCodeForwardImportDTO; import com.nflg.wms.shipment.pojo.dto.MaterialCodeForwardImportDTO;
import com.nflg.wms.shipment.pojo.dto.PdfPageDTO; import com.nflg.wms.shipment.pojo.dto.PdfPageDTO;
@ -560,11 +560,11 @@ public class MaterialCodeController extends BaseController {
} }
@PostMapping("getQRCode") @PostMapping("getQRCode")
public ApiResult<String> getQRCode(@RequestBody MaterialCodeGetQRCodeQO query) { public ApiResult<String> getQRCode(@Valid @RequestBody MaterialCodeGetQRCodeQO query) {
WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params = new WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO(); GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO params = new GetQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatusParamsDTO();
BeanUtil.copyProperties(query, params); BeanUtil.copyProperties(query, params);
params.setStatus(0); params.setStatus(0);
String qrCode = materialCodeItemQrService.getQRCodeByParams(params); String qrCode = materialCodeItemQrService.getQRCodeByMaterialNoAndDeviceNoAndProductionOrderNumberAndStatus(params);
return ApiResult.success(qrCode); return ApiResult.success(qrCode);
} }