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

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

This reverts commit 1439f4f39d.
This commit is contained in:
10002617 2026-05-06 11:08:15 +08:00
parent 1439f4f39d
commit a04a342e13
7 changed files with 2 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ 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 java.util.List;
@ -17,8 +16,6 @@ import java.util.List;
*/
public interface WmsShipmentMaterialCodeItemQrMapper extends BaseMapper<WmsShipmentMaterialCodeItemQr> {
String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params);
ShipmentMaterialCodeQRVO getInfoByQRCode(String code);
List<ShipmentMaterialCodeQRVO> getListVOByItemIds(List<Long> ids);

11
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java
View File

@ -1,11 +0,0 @@
package com.nflg.wms.repository.mapper.dto;
import lombok.Data;
@Data
public class WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO {
private String materialNo;
private String deviceNo;
private String productionOrderNumber;
private Integer status;
}

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

@ -1,9 +1,9 @@
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.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.constraints.NotEmpty;
import java.util.List;
@ -17,8 +17,6 @@ import java.util.List;
*/
public interface IWmsShipmentMaterialCodeItemQrService extends IService<WmsShipmentMaterialCodeItemQr> {
String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params);
ShipmentMaterialCodeQRVO getInfoByQRCode(String code);
List<ShipmentMaterialCodeQRVO> getListVOByItemIds(List<Long> ids);

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

@ -3,7 +3,6 @@ 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.service.IWmsShipmentMaterialCodeItemQrService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@ -21,11 +20,6 @@ import java.util.List;
@Service
public class WmsShipmentMaterialCodeItemQrServiceImpl extends ServiceImpl<WmsShipmentMaterialCodeItemQrMapper, WmsShipmentMaterialCodeItemQr> implements IWmsShipmentMaterialCodeItemQrService {
@Override
public String getQRCodeByParams(WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params) {
return baseMapper.getQRCodeByParams(params);
}
@Override
public ShipmentMaterialCodeQRVO getInfoByQRCode(String code) {
return baseMapper.getInfoByQRCode(code);

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

@ -2,27 +2,6 @@
<!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">
<select id="getQRCodeByParams" resultType="string">
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"
INNER JOIN wms_shipment_material_code mc ON mc."id"=it.material_code_id
<where>
<if test="materialNo!=null and materialNo!=''">
and it.material_no=#{materialNo}
</if>
<if test="deviceNo!=null and deviceNo!=''">
and mc.device_no=#{deviceNo}
</if>
<if test="productionOrderNumber!=null and productionOrderNumber!=''">
and it.production_order_number=#{productionOrderNumber}
</if>
<if test="status!=null and status!=''">
and it.status=#{status}
</if>
</where>
</select>
<select id="getInfoByQRCode" resultType="com.nflg.wms.common.pojo.vo.ShipmentMaterialCodeQRVO">
SELECT qr.id,qr.no,it.material_no,it.material_describe,qr.num,it.unit,qr.status,mc.device_no,mc.customer_name
FROM wms_shipment_material_code_item_qr qr

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

@ -1,6 +1,5 @@
package com.nflg.wms.shipment.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
@ -20,11 +19,9 @@ 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.service.*;
import com.nflg.wms.shipment.pojo.dto.MaterialCodeForwardImportDTO;
import com.nflg.wms.shipment.pojo.dto.PdfPageDTO;
import com.nflg.wms.shipment.pojo.qo.MaterialCodeGetQRCodeQO;
import com.nflg.wms.shipment.pojo.vo.MaterialCodeItemVO;
import com.nflg.wms.shipment.service.BasdeSerialNumberControllerService;
import com.nflg.wms.shipment.util.*;
@ -559,15 +556,6 @@ public class MaterialCodeController extends BaseController {
});
}
@PostMapping("getQRCode")
public ApiResult<String> getQRCode(@RequestBody MaterialCodeGetQRCodeQO query) {
WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO params = new WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO();
BeanUtil.copyProperties(query, params);
params.setStatus(0);
String qrCode = materialCodeItemQrService.getQRCodeByParams(params);
return ApiResult.success(qrCode);
}
/**
* 清单明细-根据二维码唯一号获取物料信息（PDA使用）
*

14
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/qo/MaterialCodeGetQRCodeQO.java
View File

@ -1,14 +0,0 @@
package com.nflg.wms.shipment.pojo.qo;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@Data
public class MaterialCodeGetQRCodeQO {
@NotBlank(message = "materialNo不能为空")
private String materialNo;
@NotBlank(message = "deviceNo不能为空")
private String deviceNo;
@NotBlank(message = "productionOrderNumber不能为空")
private String productionOrderNumber;
}