Merge branch 'dev' into test

src/main/java/com/glxp/api/entity/inv/InvPreProductDetailEntity.java

@@ -87,21 +87,21 @@ public class InvPreProductDetailEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private int count;
+    private Integer count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private int reCount;
+    private Integer reCount;
 
 
     @TableField(value = "inCount")
-    private int inCount;
+    private Integer inCount;
 
 
     @TableField(value = "outCount")
-    private int outCount;
+    private Integer outCount;
 
 
     /**

src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java

@@ -72,21 +72,21 @@ public class InvProductDetailEntity {
      * 扫码数量
      */
     @TableField(value = "`count`")
-    private int count;
+    private Integer count;
 
     /**
      * 实际数量
      */
     @TableField(value = "reCount")
-    private int reCount;
+    private Integer reCount;
 
 
     @TableField(value = "inCount")
-    private int inCount;
+    private Integer inCount;
 
 
     @TableField(value = "outCount")
-    private int outCount;
+    private Integer outCount;
 
     /**
      * 部门编码

src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java

@@ -154,13 +154,21 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 
                 for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
                     //拆解库存表
+                    InvPreProductDetailEntity invPreInProductDetailEntity=new InvPreProductDetailEntity();
                     QueryWrapper<InvPreProductDetailEntity> ew=new QueryWrapper<>();
+                    if(bindInvSpaceRequest.getType()==3){
+                        ew.eq("code",invPlaceOrderDetailEntity.getCode());
+                        ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+                        ew.last("limit 1");
+                        invPreInProductDetailEntity=invPreProductDetailDao.selectOne(ew);
+                    }else{
                         ew.eq("code",invPlaceOrderDetailEntity.getCode());
                         ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode",""));
-
                         ew.gt("inCount",0);
                         ew.last("limit 1");
-                    InvPreProductDetailEntity invPreInProductDetailEntity=invPreProductDetailDao.selectOne(ew);
+                        invPreInProductDetailEntity=invPreProductDetailDao.selectOne(ew);
+                    }
+
                     if(invPreInProductDetailEntity.getInCount()>0){
                         String nameCode=invPreInProductDetailEntity.getNameCode();
                         int reCount=getActCount(nameCode);
@@ -172,7 +180,11 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 
                         ew.clear();
                         ew.eq("code",invPlaceOrderDetailEntity.getCode());
+                        if(bindInvSpaceRequest.getType()==3){
+                            ew.eq("invSpaceCode",bindInvSpaceRequest.getChangeSpaceCode());
+                        }else{
                             ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode());
+                        }
 
                         InvPreProductDetailEntity invPreInProductDetailEntity1=invPreProductDetailDao.selectOne(ew);
                         if(invPreInProductDetailEntity1!=null){
@@ -185,8 +197,12 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                             invPreInProductDetailEntity.setInCount(1);
                             invPreInProductDetailEntity.setCount(1);
                             invPreInProductDetailEntity.setOutCount(0);
-                            invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
                             invPreInProductDetailEntity.setReCount(reCount);
+                            if (bindInvSpaceRequest.getType()==3){
+                                invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
+                            }else{
+                                invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
+                            }
                             invPreProductDetailDao.insert(invPreInProductDetailEntity);
                         }
                     }
@@ -199,13 +215,20 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 
                 for (Integer i = 0; i < invPlaceOrderDetailEntity.getCount(); i++) {
                     //拆解库存表
+                    InvProductDetailEntity invPreInProductDetailEntity=new InvProductDetailEntity();
                     QueryWrapper<InvProductDetailEntity> ew=new QueryWrapper<>();
+                    if(bindInvSpaceRequest.getType()==3){
+                        ew.eq("code",invPlaceOrderDetailEntity.getCode());
+                        ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
+                        ew.last("limit 1");
+                        invPreInProductDetailEntity=invProductDetailDao.selectOne(ew);
+                    }else{
                         ew.eq("code",invPlaceOrderDetailEntity.getCode());
                         ew.and(o-> o.isNull("invSpaceCode").or().eq("invSpaceCode",""));
-
                         ew.gt("inCount",0);
                         ew.last("limit 1");
-                    InvProductDetailEntity invPreInProductDetailEntity=invProductDetailDao.selectOne(ew);
+                        invPreInProductDetailEntity=invProductDetailDao.selectOne(ew);
+                    }
                     if(invPreInProductDetailEntity.getInCount()>0){
                         String nameCode=invPreInProductDetailEntity.getNameCode();
                         int reCount=getActCount(nameCode);
@@ -217,7 +240,11 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 
                         ew.clear();
                         ew.eq("code",invPlaceOrderDetailEntity.getCode());
+                        if(bindInvSpaceRequest.getType()==3){
+                            ew.eq("invSpaceCode",bindInvSpaceRequest.getChangeSpaceCode());
+                        }else{
                             ew.eq("invSpaceCode",invPlaceOrderDetailEntity.getInvSpaceCode());
+                        }
 
                         InvProductDetailEntity invPreInProductDetailEntity1=invProductDetailDao.selectOne(ew);
                         if(invPreInProductDetailEntity1!=null){
@@ -231,7 +258,11 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                             invPreInProductDetailEntity.setCount(1);
                             invPreInProductDetailEntity.setOutCount(0);
                             invPreInProductDetailEntity.setReCount(reCount);
+                            if (bindInvSpaceRequest.getType()==3){
+                                invPreInProductDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
+                            }else{
                                 invPreInProductDetailEntity.setInvSpaceCode(invPlaceOrderDetailEntity.getInvSpaceCode());
+                            }
                             invProductDetailDao.insert(invPreInProductDetailEntity);
                         }
                     }

src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.auth.InvSpaceDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.InvSpace">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.InvSpace">
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="type" jdbcType="VARCHAR" property="type"/>

src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.auth.WarehouseBussinessTypeDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
         <!--@mbg.generated-->
         <!--@Table auth_warehouse_bustype-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>

src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.auth.WarehouseUserDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.WarehouseUserEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseUserEntity">
         <!--@mbg.generated-->
         <!--@Table auth_warehouse_user-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="userId" jdbcType="BIGINT" property="userid"/>
         <result column="userName" jdbcType="VARCHAR" property="username"/>

src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicHospTypeDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicHospTypeEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.basic.BasicHospTypeEntity">
         <!--@mbg.generated-->
         <!--@Table basic_hosp_type-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="parentCode" jdbcType="VARCHAR" property="parentCode"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>

src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoOrderUploadLogDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoOrderUploadLogEntity">
+    <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.inout.IoOrderUploadLogEntity">
         <!--@mbg.generated-->
         <!--@Table io_order_upload_log-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="billNo" jdbcType="VARCHAR" property="billNo"/>
         <result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
         <result column="billType" jdbcType="VARCHAR" property="billType"/>

src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.InvInnerOrderPdfTempDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
+  <resultMap autoMapping="true" id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
     <!--@mbg.generated-->
     <!--@Table inv_inner_order_pdf_temp-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="genkey" jdbcType="VARCHAR" property="genkey" />
     <result column="fileName" jdbcType="VARCHAR" property="fileName" />
     <result column="filePath" jdbcType="VARCHAR" property="filePath" />

src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.InvInnerOrderPrintDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
     <!--@mbg.generated-->
     <!--@Table inv_inner_order_print-->
-    <id column="id" jdbcType="INTEGER" property="id"/>
+<!--    <id column="id" jdbcType="INTEGER" property="id"/>-->
     <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
     <result column="udiCode" jdbcType="VARCHAR" property="udiCode"/>
     <result column="productId" jdbcType="VARCHAR" property="productId"/>

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.purchase.PurOrderDetailDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
     <!--@mbg.generated-->
     <!--@Table pur_order_detail-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
     <result column="productId" jdbcType="INTEGER" property="productId" />
     <result column="productName" jdbcType="VARCHAR" property="productName" />

src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.system.SyncDataChangeBustypesDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
+    <resultMap id="BaseResultMap"  autoMapping="true" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
         <!--@mbg.generated-->
         <!--@Table sync_data_change_bustypes-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="outChange" jdbcType="TINYINT" property="outChange"/>

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_biz-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_code-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_label-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_statemen-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml

@@ -3,8 +3,8 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.thrsys.ThrBusTypeOriginDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
+    <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="thirdSys" jdbcType="VARCHAR" property="thirdSys"/>

src/main/resources/schemas/schema_v2.1.sql

@@ -399,3 +399,13 @@ CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
 
 -- CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1);
+
+
+CALL Pro_Temp_ColumnWork('inv_place_order', 'count', 'int', 1);
+CALL Pro_Temp_ColumnWork('inv_place_order', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'id', 'bigint', 2);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'nameCode', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'supId', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'expireDate', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'produceDate', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'serialNo', 'varchar(255)', 1);