From a04a342e13fedd17c8a6fdd98ce16d9ca3cd5e85 Mon Sep 17 00:00:00 2001
From: 10002617 <jianbo.lin@nflg.com>
Date: Wed, 6 May 2026 11:08:15 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"1475=20=E5=8F=91=E8=B4=A7=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=89=AB=E7=A0=81=E8=A3=85=E7=AE=B1=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1439f4f39d6fa258934c2b4b0e8fcff648b8aab9.
---
 .../WmsShipmentMaterialCodeItemQrMapper.java  |  3 ---
 ...lCodeItemQrMapperGetQrCodeByParamsDTO.java | 11 ----------
 ...IWmsShipmentMaterialCodeItemQrService.java |  6 ++----
 ...ShipmentMaterialCodeItemQrServiceImpl.java |  6 ------
 .../WmsShipmentMaterialCodeItemQrMapper.xml   | 21 -------------------
 .../controller/MaterialCodeController.java    | 12 -----------
 .../pojo/qo/MaterialCodeGetQRCodeQO.java      | 14 -------------
 7 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java
 delete mode 100644 nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/qo/MaterialCodeGetQRCodeQO.java

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..117e210f 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,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);
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/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java
deleted file mode 100644
index a66361a9..00000000
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/dto/WmsShipmentMaterialCodeItemQrMapperGetQrCodeByParamsDTO.java
+++ /dev/null
@@ -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;
-}
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..16aae7de 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
@@ -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);
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..cd48a864 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,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);
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
index d4a494ae..b579e906 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsShipmentMaterialCodeItemQrMapper.xml
@@ -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
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..946a9425 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
@@ -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使用）
      *
diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/qo/MaterialCodeGetQRCodeQO.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/qo/MaterialCodeGetQRCodeQO.java
deleted file mode 100644
index 2c0786b9..00000000
--- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/pojo/qo/MaterialCodeGetQRCodeQO.java
+++ /dev/null
@@ -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;
-}