From de81709cb6612492d32d6bc39e0b637825a16197 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 25 Jul 2023 18:44:06 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=89=8B=E6=8C=81=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E5=88=97=E8=A1=A8=E6=94=B9?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/xml/MpsSaleOrderMapper.xml     |  5 ++---
 .../pda/controller/PdaStCpInController.java   |  2 +-
 .../pda/service/PdaStCpInService.java         |  4 ++++
 .../service/impl/PdaStCpInServiceImpl.java    | 20 ++++++++++++++++++-
 .../src/main/resources/config/application.yml |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
index 7c2edeb5..e7dee79a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
@@ -85,10 +85,10 @@
             der.is_delete = '0'
             AND der.status = '10'
             <if test="begin_time != null and begin_time  != ''">
-                and der.create_time &lt;=  #{begin_time}
+                and der.plandeliver_date &lt;=  #{begin_time}
             </if>
             <if test="end_time != null and end_time  != ''">
-                and der.create_time &gt;=  #{end_time}
+                and der.plandeliver_date &gt;=  #{end_time}
             </if>
             <if test="sale_code != null and sale_code  != ''">
                 and der.sale_code LIKE '%${sale_code}%'
@@ -100,7 +100,6 @@
             </if>
         </where>
 
-
     </select>
     <select id="queryMap" resultType="java.util.Map">
         SELECT
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java
index 3399dcff..37118f4f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java
@@ -2,8 +2,8 @@ package org.nl.wms.storage_manage.pda.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiOperation;
 import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.pda.service.PdaStCpInService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStCpInService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStCpInService.java
index 8cac1a8a..6b433e0f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStCpInService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/PdaStCpInService.java
@@ -1,6 +1,7 @@
 package org.nl.wms.storage_manage.pda.service;
 
 import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
 
 /**
  * <p>
@@ -33,8 +34,11 @@ public interface PdaStCpInService {
     /**
      * 查询入库点下拉框
      * @param whereJson /
+     * @param page
      * @return JSONObject /
      */
+    Object getMaterial(JSONObject whereJson, PageQuery page);
+
     JSONObject getMaterial(JSONObject whereJson);
 
     /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java
index c3375bdd..ef3e3395 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java
@@ -5,6 +5,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
@@ -102,10 +106,24 @@ public class PdaStCpInServiceImpl implements PdaStCpInService {
         return result;
     }
 
+    @Override
+    public Object getMaterial(JSONObject whereJson, PageQuery page) {
+        Page<Object> result = PageHelper.startPage(page.getPage()==null?1:page.getPage(), page.getSize()==null?30:page.getPage());
+        List<Map> list = iMpsSaleOrderService.getPdaMaterial(whereJson);
+        for (Map map : list) {
+            Object plandeliver_date = map.get("plandeliver_date");
+            if (plandeliver_date !=null){
+                map.put("plandeliver_date",plandeliver_date.toString());
+            }
+        }
+        TableDataInfo build = TableDataInfo.build(list);
+        build.setTotalElements(result.getTotal());
+        return build;
+    }
+
     @Override
     public JSONObject getMaterial(JSONObject whereJson) {
         List<Map> list = iMpsSaleOrderService.getPdaMaterial(whereJson);
-
         JSONObject result = new JSONObject();
         result.put("data", JSONArray.parseArray(JSON.toJSONString(list)));
         result.put("message", "查询成功");
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml
index c9fe3dcb..095bb353 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev3
+    active: prod
   jackson:
     time-zone: GMT+8
   data: