From 455b8117ed1b96f218ebbcfbef99baf3ecf004e5 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 12 Dec 2022 15:20:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=80=99=E9=80=89=E8=87=AA=E5=8A=A9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=90=8C=E6=AD=A5=E6=97=A0=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/res/basic/BussinessTypResponse.java     | 3 +++
 .../main/resources/mybatis/mapper/basic/BussinessTypeDao.xml   | 2 ++
 .../resources/mybatis/mapper/inventory/InvPreInProductDao.xml  | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java
index e284ef2b..90496027 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java
@@ -33,6 +33,7 @@ public class BussinessTypResponse {
     private boolean checkPc;
     private boolean checkWebNew;
     private boolean checkChange;
+    private boolean checkSp;
 
     private boolean secCheckUdims;
     private boolean secCheckPdaEd;
@@ -76,4 +77,6 @@ public class BussinessTypResponse {
     private boolean secCheckCopy;
 
     private boolean checkSelect; //判断多选框是否勾选
+
+    private boolean secCheckSp;  //自助平台同步
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 58ba333c..5147c8fc 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -327,6 +327,7 @@
             <if test="checkPc != null">checkPc=#{checkPc},</if>
             <if test="checkWebNew != null">checkWebNew=#{checkWebNew},</if>
             <if test="checkChange != null">checkChange=#{checkChange},</if>
+            <if test="checkSp != null">checkSp=#{checkSp},</if>
             <if test="secCheckUdims != null">secCheckUdims=#{secCheckUdims},</if>
             <if test="secCheckPdaEd != null">secCheckPdaEd=#{secCheckPdaEd},</if>
             <if test="secCheckPdaUn != null">secCheckPdaUn=#{secCheckPdaUn},</if>
@@ -335,6 +336,7 @@
             <if test="secCheckChange != null">secCheckChange=#{secCheckChange},</if>
             <if test="checkBalacne != null">checkBalacne=#{checkBalacne},</if>
             <if test="secCheckBalacne != null">secCheckBalacne=#{secCheckBalacne},</if>
+            <if test="secCheckSp != null">secCheckSp=#{secCheckSp},</if>
             <if test="index != null">index=#{index},</if>
             <if test="corpType != null">corpType=#{corpType},</if>
             <if test="storageCode != null">storageCode=#{storageCode},</if>
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index f0d8d70d..a58c7f4b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -200,7 +200,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-        group by inv_prein_product.id
+        group by inv_prein_product.orderIdFk
         order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"