From 015bda963532898c6e8ecfd9a089fd8afec1aab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 14 Dec 2022 09:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml  | 3 +--
 .../main/resources/mybatis/mapper/info/SyncDataSetDao.xml    | 4 ++--
 .../mybatis/mapper/inventory/InvPreInProductDao.xml          | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 26da151a..e9f3a7fe 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -589,7 +589,7 @@
             ignore
         INTO basic_udirel
         (id,
-        thirdId,thirdName,uuid,isUseDy,updateTime,modifyTime,
+        thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
         ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
         )
@@ -601,7 +601,6 @@
         #{uuid},
         #{isUseDy},
         #{updateTime},
-        #{modifyTime},
         #{thirdId1},
         #{thirdId2},
         #{thirdId3},
diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml
index 9602c3fa..5601c230 100644
--- a/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml
@@ -17,7 +17,7 @@
         typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv
         , basicThirdBusOrder, orderScanFinish,  dbDiProducts,downstreamEnable,syncTime,syncDownloadTime,
         orderUnReceive,orderUnCheck,busTypes,sysUser,syncIp,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction
-        ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert)
+        ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert,orderSyncDlTime)
         values (
         #{id},
         #{typeBus},
@@ -45,7 +45,7 @@
         #{basicSyncStart},
         #{entrustAction},
         #{unCheckCert},
-        #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}
+        #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert},#{orderSyncDlTime}
         )
     </insert>
 
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 a58c7f4b..778544f9 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -122,8 +122,9 @@
         inv_prein_product.batchNo
         ,inv_prein_product.productionDate,inv_prein_product.expireDate,
         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
-        inv_prein_product.inCount,inv_prein_product.outCount
-        ,inv_prein_product.reCount,inv_prein_product.customerId,
+        sum(inv_prein_product.inCount) as inCount,
+        sum(inv_prein_product.outCount) as outCount,
+        sum(inv_prein_product.reCount) as reCount, inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
         invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price,inv_warehouse_sub.name invSubStorageName
         ,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk