From 51766084231bab909a6fc7935f3a0e57742d7025 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 11 Apr 2022 18:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/BaseController.java       | 23 +++++++++++++-
 .../gaotao/modules/base/dao/BaseMapper.java   | 14 +++++++--
 .../modules/base/service/BaseService.java     | 12 ++++++-
 .../base/service/Impl/BaseServiceImpl.java    | 11 ++++---
 src/main/resources/mapper/base/BaseMapper.xml | 31 +++++++++++++++++++
 5 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/base/controller/BaseController.java b/src/main/java/com/gaotao/modules/base/controller/BaseController.java
index ea2e518..27fe999 100644
--- a/src/main/java/com/gaotao/modules/base/controller/BaseController.java
+++ b/src/main/java/com/gaotao/modules/base/controller/BaseController.java
@@ -563,8 +563,29 @@ public class BaseController {
     @PostMapping(value="/searchPartNoData")
     @ResponseBody
     public Object searchPartNoData(@RequestBody PartData indata){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<PartData> result = baseService.searchPartNoData(indata);
+            map.put("success", true);
+            map.put("rows", result);
+            map.put("total", result.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
+
+    /**
+     * 获取计量单位
+     * @param
+     * @return
+     */
+    @PostMapping(value="/searchPartNoDataWithPage")
+    @ResponseBody
+    public Object searchPartNoDataWithPage(@RequestBody PartData indata){
 
-        PageUtils page  = baseService.searchPartNoData(indata);
+        PageUtils page  = baseService.searchPartNoDataWithPage(indata);
         return R.ok().put("page", page);
 
     }
diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
index 2f95c16..d1bd9b9 100644
--- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
+++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
@@ -3,7 +3,6 @@ package com.gaotao.modules.base.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.modules.base.entity.*;
-import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
 import com.gaotao.modules.pda.utils.ResponseData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -480,7 +479,18 @@ public interface BaseMapper {
      * @return List<PartData>>
      * @throw
      */
-    IPage<PartData> searchPartNoData(Page<PartData> page, @Param("query") PartData inData);
+    List<PartData> searchPartNoData(PartData indata);
+
+    /**
+     * @Description 查询-物料编码
+     * @Title searchPartNoData
+     * @param
+     * @author rq
+     * @date 2021/10/9 16:37
+     * @return List<PartData>>
+     * @throw
+     */
+    IPage<PartData> searchPartNoDataWithPage(Page<PartData> page, @Param("query") PartData inData);
 
     //----------停机原因--------------------------
 
diff --git a/src/main/java/com/gaotao/modules/base/service/BaseService.java b/src/main/java/com/gaotao/modules/base/service/BaseService.java
index d3c0c84..84a4822 100644
--- a/src/main/java/com/gaotao/modules/base/service/BaseService.java
+++ b/src/main/java/com/gaotao/modules/base/service/BaseService.java
@@ -243,7 +243,17 @@ public interface BaseService {
      * @return List<PartData>>
      * @throw
      */
-    PageUtils searchPartNoData(PartData indata);
+    List<PartData> searchPartNoData(PartData indata);
+    /**
+     * @Description 查询-物料编码
+     * @Title searchPartNoData
+     * @param
+     * @author rq
+     * @date 2021/10/9 16:37
+     * @return List<PartData>>
+     * @throw
+     */
+    PageUtils searchPartNoDataWithPage(PartData indata);
 
     //----------停机原因--------------------------
 
diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
index a3bfbfa..1388062 100644
--- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
@@ -10,7 +10,6 @@ import com.gaotao.modules.app.entity.WorkCenter;
 import com.gaotao.modules.base.dao.BaseMapper;
 import com.gaotao.modules.base.entity.*;
 import com.gaotao.modules.base.service.BaseService;
-import com.gaotao.modules.finishedProduct.vo.CRollinfoVo;
 import com.gaotao.modules.pda.utils.ResponseData;
 import com.gaotao.modules.schedule.mapper.ProcedureMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -783,13 +782,17 @@ public class BaseServiceImpl implements BaseService {
     }
     //----------查询-物料编码--------------------------
     @Override
-    public PageUtils searchPartNoData(PartData indata){
-        IPage<PartData> resultList = this.baseMapper.searchPartNoData(
+    public List<PartData> searchPartNoData(PartData indata){
+        List<PartData> result = baseMapper.searchPartNoData(indata);
+        return result;
+    }
+    @Override
+    public PageUtils searchPartNoDataWithPage(PartData indata){
+        IPage<PartData> resultList = this.baseMapper.searchPartNoDataWithPage(
                 new Page<PartData>(indata.getPage(), indata.getLimit()),indata);
         return new PageUtils(resultList);
     }
 
-
     //----------停机原因--------------------------
 
     @Override
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index 8a7f904..0fd1776 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -379,6 +379,37 @@
     </delete>
 <!--      查询-物料编码     -->
     <select id="searchPartNoData" resultType="com.gaotao.modules.base.entity.PartData">
+        Select T.PartNo,T.Site,T.PartDescription,T.Spec,T.UMID,T.Active,T.CreateDate,T.Remark,T.ConfigurationTemplateID
+        from Part as T
+        <where>
+                AND T.Site in  (Select Site from AccessSite where upper(UserID)=#{user})
+            <if test=" site != null and site != ''">
+                AND T.Site = #{site}
+            </if>
+            <if test="partNo != null and partNo != ''">
+                 AND T.PartNo  LIKE #{partNo}
+            </if>
+             <if test="partDescription != null and partDescription != ''">
+                 AND T.PartDescription  LIKE #{partDescription}
+            </if>
+             <if test="spec != null and spec != ''">
+                 AND T.Spec  LIKE #{spec}
+            </if>
+             <if test="active != null and active != ''">
+                 AND T.Active  = #{active}
+            </if>
+            <if test=" date1 != null ">
+                AND T.CreateDate >= #{date1}
+            </if>
+             <if test=" date2 != null ">
+                AND  #{date2} >=T.CreateDate
+            </if>
+        </where>
+
+    </select>
+
+
+    <select id="searchPartNoDataWithPage" resultType="com.gaotao.modules.base.entity.PartData">
         Select  T.PartNo,T.Site,T.PartDescription,T.Spec,T.UMID,T.Active,T.CreateDate,T.Remark,T.ConfigurationTemplateID
         from Part as T
         <where>