From acb33aa1c4e1257f69623c659ecce926a0a3f5c6 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Tue, 17 Dec 2024 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java  | 1 +
 src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java | 2 +-
 src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java | 2 +-
 src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java | 2 +-
 src/main/resources/application-dev.yml                         | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
index 3edfed2..ee44708 100644
--- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
@@ -317,6 +317,7 @@ public class HlfyyyClient extends CommonHttpClient {
 //                    BeanUtil.copyProperties(dict,products);
                     oracleCompatibleCopy(dict, products);
                     products.setProductType(1);
+                    products.setQxlb(dict.getRemark1());
 //                    products.setRegisterNo(dict.getRegisterno());
                     return products;
                 }).collect(Collectors.toList());
diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java
index ced7f0b..4c04646 100644
--- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java
+++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA006Service.java
@@ -27,7 +27,6 @@ public class VA006Service extends ServiceImpl<VA006Mapper, VA006> {
         IPage<VA006> iPage = va006Mapper.getList(page,udiwmsBasicSkPrescribeRequest);
         List<VA006> list  =  iPage.getRecords();
         List<VA006> listNew  = new ArrayList<>();
-        list.sort( Comparator.comparing(VA006::getPrescribedate));
         if(list!=null && list.size() >0){
             String lastSql = "";
             if(defXmlSqlType.equals("Mysql")){
@@ -43,6 +42,7 @@ public class VA006Service extends ServiceImpl<VA006Mapper, VA006> {
                 listNew.add(va006New);
             }
         }
+        list.sort( Comparator.comparing(VA006::getPrescribedate));
         iPage.setRecords(listNew);
 
         return iPage;
diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java
index 316acb0..90fc984 100644
--- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java
+++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java
@@ -26,7 +26,6 @@ public class VA011Service extends ServiceImpl<VA011Mapper, VA011> {
         IPage<VA011> iPage = va011Mapper.getList(page,udiwmsBasicSkPrescribeRequest);
         List<VA011> list  =  iPage.getRecords();
         List<VA011> listNew  = new ArrayList<>();
-        list.sort( Comparator.comparing(VA011::getPrescribedate));
         if(list!=null && list.size() >0){
             String lastSql = "";
             if(defXmlSqlType.equals("Mysql")){
@@ -42,6 +41,7 @@ public class VA011Service extends ServiceImpl<VA011Mapper, VA011> {
                 listNew.add(va011New);
             }
         }
+        list.sort( Comparator.comparing(VA011::getPrescribedate));
         iPage.setRecords(listNew);
 
         return iPage;
diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java
index e34d736..f21436d 100644
--- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java
+++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA015Service.java
@@ -27,7 +27,6 @@ public class VA015Service extends ServiceImpl<VA015Mapper, VA015> {
         IPage<VA015> iPage = va015Mapper.getList(page,udiwmsBasicSkPrescribeRequest);
         List<VA015> list  =  iPage.getRecords();
         List<VA015> listNew  = new ArrayList<>();
-        list.sort( Comparator.comparing(VA015::getPrescribedate));
         if(list!=null && list.size() >0){
             String lastSql = "";
             if(defXmlSqlType.equals("Mysql")){
@@ -43,6 +42,7 @@ public class VA015Service extends ServiceImpl<VA015Mapper, VA015> {
                 listNew.add(va015New);
             }
         }
+        list.sort( Comparator.comparing(VA015::getPrescribedate));
         iPage.setRecords(listNew);
 
         return iPage;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ab7ffeb..026b01b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@ spring:
       strict: false
       datasource:
         master:
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_hlhy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlhy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver