From f8fea9717dec1837a5dc88a77c813308689fdfe7 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 18 Mar 2022 23:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java | 2 +-
 .../resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml    | 3 +--
 .../src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml     | 3 ++-
 .../main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml    | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java
index 1627811..4dd90df 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/util/FilterUdiUtils.java
@@ -166,7 +166,7 @@ public class FilterUdiUtils {
             udi = udi.substring(1);
             for (int i = 0; i < spilts.length; i++) {
                 String tempStr = spilts[i];
-                if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("P")) {
+                if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("M")) {
                     produceDate = tempStr.substring(1);
                 } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("L")) {
                     batchNo = tempStr.substring(1);
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
index bdee216..e7b2445 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml
@@ -169,11 +169,10 @@
     <insert id="importBasicUnitMaintain" keyProperty="id">
         REPLACE
         INTO basic_corp
-                (id, thirdId, erpId, name, spell,
+                ( thirdId, erpId, name, spell,
                  addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,
                  thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType)
         values (
-        #{id},
         #{thirdId},
         #{erpId},
         #{name},
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
index 2d1e7d6..9234cba 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
@@ -120,13 +120,14 @@
     <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
         replace
         INTO basic_products
-        (
+        (id,
         nameCode,packRatio,packLevel,bhxjsl,
         bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
         cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
         ,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq)
         values
             (
+        #{id},
         #{nameCode},
         #{packRatio},
         #{packLevel},
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 116f57d..7c85c36 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -265,13 +265,14 @@
             parameterType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
         replace
         INTO basic_udirel
-        (
+        (id,
         thirdId,thirdName,uuid,isUseDy,updateTime,
         thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
         ,mainId,mainName,lockStatus,udplatCode,isAdavence
         )
         values
             (
+        #{id},
         #{thirdId},
         #{thirdName},
         #{uuid},