From 223f4373380578b20c7fd3b7c0fa756ea70bf9f9 Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Tue, 19 Sep 2023 22:02:33 +0800
Subject: [PATCH] =?UTF-8?q?rev:aps=E5=AF=BC=E5=87=BA=E5=88=B0=E5=8E=9F?=
 =?UTF-8?q?=E6=96=99=E9=9C=80=E6=B1=82=EF=BC=8C=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=92=8C=E5=88=B0=E8=B4=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E4=B8=94=E5=90=8C=E4=B8=80=E5=A4=A9=E7=9A=84?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E6=88=90=E4=B8=80=E4=B8=AA=E5=8E=9F=E6=96=99=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/xml/PcsIfDemandorderMapper.xml    |  4 ++--
 .../dao/mapper/xml/PcsIfPurchaseorderMapper.xml  |  4 ++--
 .../impl/PcsIfDemandorderServiceImpl.java        |  4 ----
 .../impl/PcsIfPurchaseorderServiceImpl.java      | 16 ----------------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml
index 527d6e43..d85e98ec 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml
@@ -38,7 +38,7 @@
                 )
             </if>
         </where>
-        order by po.id desc
+        order by po.ask_time
     </select>
 
     <select id="queryAll" resultType="java.util.Map">
@@ -79,7 +79,7 @@
                 )
             </if>
         </where>
-        order by po.id desc
+        order by po.ask_time
     </select>
 
     <select id="updateSemirealSpec">
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
index b0b44301..377cbbcc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
@@ -38,7 +38,7 @@
                 )
             </if>
         </where>
-        order by po.id desc
+        order by po.ask_time
     </select>
 
     <select id="queryAll" resultType="java.util.Map">
@@ -86,7 +86,7 @@
                 )
             </if>
         </where>
-        order by po.id desc
+        order by po.ask_time
     </select>
 
     <select id="queryTransitQty" resultType="java.math.BigDecimal">
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfDemandorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfDemandorderServiceImpl.java
index db3f2048..091fd2bd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfDemandorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfDemandorderServiceImpl.java
@@ -1,6 +1,4 @@
 package org.nl.wms.pcs_manage.service.purchase.impl;
-
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -15,7 +13,6 @@ import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.masterdata_manage.service.material.dao.mapper.MdMeMaterialbaseMapper;
 import org.nl.wms.pcs_manage.PCSEnum;
@@ -28,7 +25,6 @@ import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfPurchaseorderMappe
 import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery;
 import org.nl.wms.storage_manage.CHECKEnum;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
index 95b1285b..1c91ae30 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
@@ -1,13 +1,10 @@
 package org.nl.wms.pcs_manage.service.purchase.impl;
-
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,28 +12,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
-import org.nl.modules.tools.service.dto.LocalStorageDto;
 import org.nl.wms.pcs_manage.PCSEnum;
 import org.nl.wms.pcs_manage.service.purchase.IPcsIfDemandorderService;
 import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService;
 import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfDemandorder;
 import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder;
-import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfDemandorderMapper;
 import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfPurchaseorderMapper;
 import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery;
-import org.nl.wms.storage_manage.CHECKEnum;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -48,8 +36,6 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import static org.nl.modules.common.utils.DateUtil.*;
@@ -67,8 +53,6 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl<PcsIfPurchaseorde
      @Resource
      private PcsIfPurchaseorderMapper purchaseorderMapper;
      @Resource
-     private PcsIfDemandorderMapper demandorderMapper;
-     @Resource
      private IPcsIfDemandorderService pcsIfDemandorderService;
 
      @Override