From 08369693c54e2121d652af7d15181f75802d4cdb Mon Sep 17 00:00:00 2001
From: Yangzz <9704.yyds@163.com>
Date: Mon, 4 Aug 2025 14:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=EF=BC=8C=E5=90=88?=
 =?UTF-8?q?=E7=BA=A6=E5=8F=B7=E7=A0=81=EF=BC=8C=E7=8A=B6=E6=80=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopOrderController.java       | 18 +++++
 .../shopOrder/dao/ShopOrderMapper.java        | 16 +++++
 .../shopOrder/entity/SearchShopOrder.java     | 12 +++-
 .../service/Impl/ShopOrderServiceImpl.java    | 10 +++
 .../shopOrder/service/ShopOrderService.java   | 12 ++++
 .../mapper/shopOrder/ShopOrderMapper.xml      | 69 ++++++++++++++++++-
 6 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
index f8c8c7f..da35bb8 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
@@ -3,9 +3,11 @@ package com.gaotao.modules.shopOrder.controller;
 import com.gaotao.common.annotation.RepeatSubmit;
 import com.gaotao.common.constant.SysMsgConstant;
 import com.gaotao.common.exception.ResponseEnum;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.pms.data.QcMethodData;
 import com.gaotao.modules.schedule.data.SearchScheduleData;
 import com.gaotao.modules.shopOrder.entity.*;
 import com.gaotao.modules.shopOrder.entity.dto.ShopOrderRoutingViaRevDto;
@@ -241,6 +243,22 @@ public class ShopOrderController extends AbstractController {
         return map;
     }
 
+    /*
+     * @Description 分页查询-生产订单
+     * @Title searchShopOrderByPaging
+     * @param indata
+     * @author Yangzz
+     * @date 2025/8/4 09:50
+     * @return {@link com.gaotao.common.utils.R}
+     * @throw
+     */
+    @PostMapping("/searchShopOrderByPaging")
+    public R searchShopOrderByPaging(@RequestBody SearchShopOrder indata){
+        PageUtils page = shopOrderService.searchShopOrderByPaging(indata);
+        return R.ok().put("page", page);
+    }
+
+
     //=============生产订单===================
 
     /**
diff --git a/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java b/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
index 64b033f..f763013 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/dao/ShopOrderMapper.java
@@ -1,9 +1,12 @@
 package com.gaotao.modules.shopOrder.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.modules.base.entity.RoutingHeaderData;
 import com.gaotao.modules.base.entity.WorkCenterResourceData;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.pms.data.QcMethodData;
 import com.gaotao.modules.schedule.data.SearchScheduleData;
 import com.gaotao.modules.shopOrder.entity.*;
 import com.gaotao.modules.shopOrder.entity.vo.WorkCenterVo;
@@ -163,6 +166,19 @@ public interface ShopOrderMapper {
      */
     List<SearchShopOrder> searchShopOrder(SearchShopOrder indata);
 
+    /**
+     * @Description 分页查询-生产订单
+     * @Title searchShopOrderByPaging
+     * @param page
+     * @param data
+     * @author rq
+     * @date 2021/10/10 22:05
+     * @return IPage<SearchShopOrder>
+     * @throw
+     */
+    IPage<SearchShopOrder> searchShopOrderByPaging(Page<SearchShopOrder> page, @Param("query") SearchShopOrder data);
+
+
 
     //=============生产订单===================
     /**
diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java
index 47d7551..c56625c 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchShopOrder.java
@@ -1,11 +1,12 @@
 package com.gaotao.modules.shopOrder.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gaotao.common.utils.QueryPage;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-public class SearchShopOrder {
+public class SearchShopOrder extends QueryPage {
     private String orderNo;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -84,6 +85,7 @@ public class SearchShopOrder {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date date4;
     private String user;
+    private String batchNo;
 
     public String getOrderNo() {
         return orderNo;
@@ -500,4 +502,12 @@ public class SearchShopOrder {
     public void setUser(String user) {
         this.user = user;
     }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
 }
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
index 328c269..20447ac 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
@@ -1,13 +1,17 @@
 package com.gaotao.modules.shopOrder.service.Impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.common.constant.SysMsgConstant;
 import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.DateUtil;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.base.dao.BaseMapper;
 import com.gaotao.modules.base.entity.*;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.pda.utils.DateUtils;
 import com.gaotao.modules.pda.utils.ResponseData;
+import com.gaotao.modules.pms.data.QcMethodData;
 import com.gaotao.modules.schedule.data.SearchScheduleData;
 import com.gaotao.modules.schedule.mapper.ProcedureMapper;
 import com.gaotao.modules.shopOrder.dao.ShopOrderMapper;
@@ -180,6 +184,12 @@ public class ShopOrderServiceImpl implements ShopOrderService {
         return result;
     }
 
+    @Override
+    public PageUtils searchShopOrderByPaging(SearchShopOrder indata) {
+        IPage<SearchShopOrder> list = this.shopOrderMapper.searchShopOrderByPaging(new Page<SearchShopOrder>(indata.getPage(), indata.getLimit()), indata);
+        return new PageUtils(list);
+    }
+
     //=============生产订单==================
     @Override
     public List<ShopOrderData> getShopOrderData(ShopOrderData indata) {
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java
index 0bf323b..5bc9963 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java
@@ -1,5 +1,6 @@
 package com.gaotao.modules.shopOrder.service;
 
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.base.entity.RoutingHeaderData;
 import com.gaotao.modules.oss.entity.SysOssEntity;
 import com.gaotao.modules.pda.utils.ResponseData;
@@ -119,6 +120,17 @@ public interface ShopOrderService {
      */
     List<SearchShopOrder> searchShopOrder(SearchShopOrder indata);
 
+    /**
+     * @Description 分页查询-生产订单
+     * @Title searchShopOrderByPaging
+     * @param indata
+     * @author rq
+     * @date 2021/10/10 22:05
+     * @return PageUtils
+     * @throw
+     */
+    PageUtils searchShopOrderByPaging(SearchShopOrder indata);
+
     //=============生产订单===================
     /**
      * @Description 生产订单
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index eded02c..e898f56 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -277,6 +277,73 @@
 
         </where>
     </select>
+    <select id="searchShopOrderByPaging" parameterType="com.gaotao.modules.shopOrder.entity.SearchShopOrder" resultType="com.gaotao.modules.shopOrder.entity.SearchShopOrder">
+        Select T.OrderNo,T.NeedDate,T.OrderType,T.PartNo,p.PartDescription+' / '+isnull(p.Spec,'') as PartDescription,
+        T.LotSize,T.Planner,T.Status,T.CustomerID,P.ConfigurationTemplateID as CustomerName,T.PlanStartDate,T.Leadtime,
+        T.EnterDate,T.Username,T.FinishedQty,T.ReleaseDate,T.ReleaseGuys,T.ScheduleDate,T.Scheduler,T.IssueDate,
+        T.ReportDate,T.ReceiveDate,T.Printed,T.ProjectID,pr.ProjectName,T.BOMRevNo,T.RoutingRevNo,T.OriginalNeedDate,
+        T.OrderRef1,T.OrderRef2,T.Site,T.Remark,CostRollUpFlag,T.ManualFlag,T.OriSOOrderNo,P.FamilyID,
+        dbo.Get_PartFamilyDesc(P.Site,P.FamilyID) as FamilyName,P.GroupID,dbo.Get_PartGroupDesc(P.Site,P.GroupID) as
+        GroupName,
+        T.ReceiveStatus,T.RepairSOFlag,T.E_OriginalOrderType,T.E_OriginalOrderNo,T.E_Levels,P.PartType,P.Remark as
+        CustPartNo,
+        T.NeedDate as COPlanShipDate, T.batch_no batchNo
+        from Part as p,ShopOrder as T
+        left join Project as pr on pr.Site=T.Site and pr.Projectid=T.ProjectID
+        <where>
+            AND T.Site=p.Site and T.PartNo=p.PartNo
+            and T.site in (Select Site from AccessSite where upper(UserID)=#{query.user})
+            <if test=" query.orderType != null and query.orderType != ''">
+                AND T.OrderType like #{query.orderType}
+            </if>
+            <if test=" query.planner != null and query.planner != ''">
+                AND T.Planner like #{query.planner}
+            </if>
+            <if test=" query.site != null and query.site != ''">
+                AND T.Site like #{query.site}
+            </if>
+            <if test=" query.partType != null and query.partType != ''">
+                AND P.PartType like #{query.partType}
+            </if>
+            <if test=" query.partNo != null and query.partNo != ''">
+                AND T.PartNo like #{query.partNo}
+            </if>
+            <if test=" query.partDescription != null and query.partDescription != ''">
+                AND p.PartDescription like #{query.partDescription}
+            </if>
+            <if test=" query.projectID != null and query.projectID != ''">
+                AND T.ProjectID like #{query.projectID}
+            </if>
+            <if test=" query.remark != null and query.remark != ''">
+                AND T.Remark like #{query.remark}
+            </if>
+            <if test=" query.orderNo != null and query.orderNo != ''">
+                AND T.OrderNo like #{query.orderNo}
+            </if>
+            <if test=" query.orderRef1 != null and query.orderRef1 != ''">
+                AND T.OrderRef1 like #{query.orderRef1}
+            </if>
+            <if test=" query.costRollUpFlag != null and query.costRollUpFlag != ''">
+                AND CostRollUpFlag like #{query.costRollUpFlag}
+            </if>
+            <if test=" query.status != null and query.status != ''">
+                AND T.Status = #{query.status}
+            </if>
+            <if test=" query.date1 != null ">
+                AND T.EnterDate >= #{query.date1}
+            </if>
+            <if test=" query.date2 != null ">
+                AND dateadd( DAY, 1, #{query.date2} ) > T.EnterDate
+            </if>
+            <if test=" query.date3 != null ">
+                AND T.PlanStartTime >= #{query.date3}
+            </if>
+            <if test=" query.date4 != null ">
+                AND dateadd( DAY, 1, #{query.date4} ) > T.PlanStartTime
+            </if>
+
+        </where>
+    </select>
     <select id="getShopOrderData" resultType="com.gaotao.modules.shopOrder.entity.ShopOrderData">
         SELECT
         T.*,dbo.Get_ProjectDesc(T.Site,T.ProjectID) as ProjectIDName,P.Remark as PartRemark,P.ConfigurationTemplateID,
@@ -306,7 +373,7 @@
                 AND T.PartNo like #{partNo}
             </if>
             <if test=" status != null and status != ''">
-                AND T.Status = ${status}
+                AND T.Status = #{status}
             </if>
             <if test=" date1 != null ">
                 AND T.NeedDate >= #{date1}