1.第三方产品，库存产品，单据，单据详情实体类及mapper增加字段

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java

@@ -28,5 +28,15 @@ public class ThrInvProductsEntity {
     private String code;
     private String name;
 
+    //增加字段
+    private String productDate; //生产日期
+    private String expireDate; //失效日期
+    private String productName; //产品名称
+    private String productId; //产品ID
+    private String standard; //规格型号
+    private String registerNo; //注册、备案证号
+    private String supId; //配送企业ID
+    private String supName; //配送企业名称
+
 
 }

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.entity.thrsys;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -19,4 +20,8 @@ public class ThrOrderDetailEntity {
     private String thirdSysFk;
     private Date updateTime;
 
+    //增加字段
+    private BigDecimal price; //单价
+    private String corpName; //往来单位
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java

@@ -18,4 +18,17 @@ public class ThrOrderEntity {
     private Date updateTime;
     private String originType;
 
+    //增加字段
+    private String startDate; //起始日期
+    private String endDate; //结束日期
+    private String createUser; //创建人
+    private String reviewUser; //审核人
+    private String address; //地址
+    private String linkMan; //联系人
+    private String linkTel; //联系电话
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java

@@ -30,4 +30,14 @@ public class ThrProductsEntity {
 
     private boolean isChecked;
 
+    //添加字段
+    private String model; //型号
+    private String standard; //规格型号，二合一字段
+    private String qtbm; //其他编码
+    private String zczyxqz; //注册有效期截止时间
+    private String remark; //备注
+    private String remark1; //备注1
+    private String remark2; //备注2
+    private String remark3; //备注3
+
 }

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml

@@ -44,14 +44,17 @@
         (
         inventoryCode,inventoryName,count,spec,
         warehouseName,warehouseCode,registerCertNo,manufacturingDate,
-        expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory
+        expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory,
+        productDate, expireDate, productName, productId, standard, registerNo, supId, supName
         )
         values
             (
             #{inventoryCode},  #{inventoryName},  #{count},  #{spec},
             #{warehouseName},  #{warehouseCode},  #{registerCertNo},  #{manufacturingDate},
             #{expirationDate},
-            #{thirdSysFk},#{batchNo},#{spaceCode},#{spaceName},#{updateTime},#{manufactory}
+            #{thirdSysFk},#{batchNo},#{spaceCode},#{spaceName},#{updateTime},#{manufactory},
+            #{productDate}, #{expireDate}, #{productName}, #{productId}, #{standard},
+            #{registerNo}, #{supId}, #{supName}
             )
     </insert>
 
@@ -60,7 +63,8 @@
         (
         inventoryCode,inventoryName,count,spec,
         warehouseName,warehouseCode,registerCertNo,manufacturingDate,
-        expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory
+        expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory,
+        productDate, expireDate, productName, productId, standard, registerNo, supId, supName
         )
         values
 
@@ -70,7 +74,9 @@
             #{item.inventoryCode}, #{item.inventoryName}, #{item.count}, #{item.spec},
             #{item.warehouseName}, #{item.warehouseCode}, #{item.registerCertNo},
             #{item.manufacturingDate}, #{item.expirationDate},
-            #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},#{item.spaceName},#{item.updateTime},#{item.manufactory}
+            #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},#{item.spaceName},#{item.updateTime},#{item.manufactory},
+            #{item.productDate},#{item.expireDate}, #{item.productName}, #{item.productId}, #{item.standard}, #{item.registerNo},
+            #{item.supId}, #{item.supName}
             )
         </foreach>
     </insert>
@@ -102,6 +108,14 @@
             <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="manufactory != null">manufactory=#{manufactory},</if>
+            <if test="productDate != null">productDate=#{productDate},</if>
+            <if test="expireDate != null">expireDate=#{expireDate},</if>
+            <if test="productName != null">productName=#{productName},</if>
+            <if test="productId != null">productId=#{productId},</if>
+            <if test="standard != null">standard=#{standard},</if>
+            <if test="registerNo != null">registerNo=#{registerNo},</if>
+            <if test="supId != null">supId=#{supId},</if>
+            <if test="supName != null">supName=#{supName},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml

@@ -38,25 +38,27 @@
 
     <insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity">
         replace INTO thr_order
-        (
+                (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType,
-        billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk, updateTime,originType
+                 startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
-        )
+                 remark3)
-        values
+        values (#{billNo},
-            (
+                #{billdate},
-            #{billNo},
+                #{corpId},
-            #{billdate},
+                #{corpName},
-            #{corpId},
+                #{billType},
-            #{corpName},
+                #{billFlag},
-            #{billType},
+                #{thirdSysFk}, #{updateTime}, #{originType},
-            #{billFlag},
+                #{startDate}, #{endDate}, #{createUser}, #{reviewUser},
-            #{thirdSysFk},#{updateTime},#{originType}
+                #{address}, #{linkMan}, #{linkTel}, #{remark}, #{remark1},
-            )
+                #{remark2}, #{remark3})
     </insert>
 
     <insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_order
         (
-        billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk,updateTime,originType
+        billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk,updateTime,originType,
+        startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
+        remark3
         )
         values
 
@@ -70,7 +72,9 @@
             #{item.billType},
             #{item.billFlag},
             #{item.thirdSysFk},#{item.updateTime},#{item.originType}
-            )
+            #{item.startDate}, #{item.endDate}, #{item.createUser}, #{item.reviewUser},
+            #{item.address}, #{item.linkMan}, #{item.linkTel}, #{item.remark}, #{item.remark1},
+            #{item.remark2}, #{item.remark3})
         </foreach>
     </insert>
 
@@ -94,6 +98,17 @@
             <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="originType != null">originType=#{originType},</if>
+            <if test="startDate != null">startDate=#{startDate},</if>
+            <if test="endDate != null">endDate=#{endDate},</if>
+            <if test="createUser != null">createUser=#{createUser},</if>
+            <if test="reviewUser != null">reviewUser=#{reviewUser},</if>
+            <if test="address != null">address=#{address},</if>
+            <if test="linkMan != null">linkMan=#{linkMan},</if>
+            <if test="linkTel != null">linkTel=#{linkTel},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="remark1 != null">remark1=#{remark1},</if>
+            <if test="remark2 != null">remark2=#{remark2},</if>
+            <if test="remark3 != null">remark3=#{remark3},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml

@@ -20,31 +20,25 @@
     <insert id="insertThrOrderDetail" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity">
         replace INTO thr_order_detail
-        (
+                (productId, productName, spec, batchNo, expireDate,
-        productId,productName,spec,batchNo,expireDate,
+                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
-        productDate,count,reCount,orderIdFk,thirdSysFk,updateTime
+        values (#{productId}, #{productName}, #{spec}, #{batchNo}, #{expireDate},
-        )
+                #{productDate}, #{count}, #{reCount}, #{orderIdFk}, #{thirdSysFk}, #{updateTime},
-        values
+                #{price}, #{corpName})
-            (
-            #{productId},#{productName},#{spec},#{batchNo},#{expireDate},
-            #{productDate},#{count},#{reCount},#{orderIdFk},#{thirdSysFk},#{updateTime}
-            )
     </insert>
 
     <insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_order_detail
-        (
+                (productId, productName, spec, batchNo, expireDate,
-        productId,productName,spec,batchNo,expireDate,
+                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
-        productDate,count,reCount,orderIdFk,thirdSysFk,updateTime
+                values
-        )
-        values
 
         <foreach collection="thrOrderDetailEntities" item="item" index="index"
                  separator=",">
-            (
+            (#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate},
-            #{item.productId},#{item.productName},#{item.spec},#{item.batchNo},#{item.expireDate},
+             #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk},
-            #{item.productDate},#{item.count},#{item.reCount},#{item.orderIdFk},#{item.thirdSysFk},#{item.updateTime}
+             #{item.updateTime},
-            )
+             #{item.price}, #{item.corpName})
         </foreach>
     </insert>
 
@@ -69,7 +63,8 @@
             <if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
             <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
-
+            <if test="price != null">price=#{price},</if>
+            <if test="corpName != null">corpName=#{corpName},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -51,58 +51,57 @@
 
     <insert id="insertThrProducts" keyProperty="id" parameterType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
         replace
-        INTO thr_products
+                INTO thr_products
-        (
+                (code, name, measname, spec, registerNo, manufactory,
-        code,name,measname,spec,registerNo,manufactory,
+                 cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
-        cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
+                 thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3)
-        thirdSysFk,updateTime,supName
+        values (#{code},
-        )
+                #{name},
-        values
+                #{measname},
-            (
+                #{spec},
-        #{code},
+                #{registerNo},
-        #{name},
+                #{manufactory},
-        #{measname},
+                #{cplb},
-        #{spec},
+                #{flbm},
-        #{registerNo},
+                #{qxlb},
-        #{manufactory},
+                #{ybbm},
-        #{cplb},
+                #{sptm},
-        #{flbm},
+                #{tyshxydm},
-        #{qxlb},
+                #{zczbhhzbapzbh},
-        #{ybbm},
+                #{ylqxzcrbarmc},
-        #{sptm},
+                #{ylqxzcrbarywmc},
-        #{tyshxydm},
+                #{cpms},
-        #{zczbhhzbapzbh},
+                #{thirdSysFk},
-        #{ylqxzcrbarmc},
+                #{updateTime},
-        #{ylqxzcrbarywmc},
+                #{model},
-        #{cpms}
+                #{standard},
-        #{thirdSysFk},
+                #{qtbm},
-        #{updateTime},
+                #{zczyxqz},
-        #{supName}
+                #{remark},
-        )
+                #{remark1},
+                #{remark2},
+                #{remark3})
     </insert>
 
     <insert id="insertThrProductss" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_products
-        (
+                (code, name, measname, spec, registerNo, manufactory,
-        code,name,measname,spec,registerNo,manufactory,
+                 cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
-        cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
+                 thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3)
-        thirdSysFk,updateTime,supName
+                values
-        )
-        values
 
         <foreach collection="thrProductsEntities" item="item" index="index"
                  separator=",">
-            (
+            (#{item.code},
-            #{item.code},
+             #{item.name},
-            #{item.name},
+             #{item.measname},
-            #{item.measname},
+             #{item.spec},
-            #{item.spec},
+             #{item.registerNo},
-            #{item.registerNo},
+             #{item.manufactory},
-            #{item.manufactory},
+             #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm}, #{item.sptm},
-            #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm},
+             #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.cpms},
-            #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms},
+             #{item.thirdSysFk}, #{item.updateTime}, #{item.supName}, #{item.model}, #{item.standard}, #{item.zczyxqz},
-            #{item.thirdSysFk},#{item.updateTime},#{item.supName}
+             #{item.remark}, #{item.remark1}, #{item.remark2}, #{item.remark3})
-            )
         </foreach>
     </insert>
 
@@ -134,7 +133,13 @@
             <if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="supName != null">supName=#{supName},</if>
-
+            <if test="model != null">model=#{model},</if>
+            <if test="standard != null">standard=#{standard},</if>
+            <if test="zczyxqz != null">zczyxqz=#{zczyxqz},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="remark1 != null">remark1=#{remark1},</if>
+            <if test="remark2 != null">remark2=#{remark2},</if>
+            <if test="remark3 != null">remark3=#{remark3},</if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -147,7 +152,8 @@
     <insert id="importThrProductss" parameterType="java.util.List">
         replace into thr_products (id, code, name, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm,
                                    qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
-                                   updateTime, supName) VALUES
+                                   updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2,
+                                   remark3) VALUES
         <foreach collection="thrProductsEntities" item="item" index="index" separator=",">
             (#{item.id},
              #{item.code},
@@ -168,7 +174,14 @@
              #{item.ylqxzcrbarywmc},
              #{item.cpms},
              #{item.updateTime},
-             #{item.supName})
+             #{item.supName},
+             #{item.model},
+             #{item.standard},
+             #{item.zczyxqz},
+             #{item.remark},
+             #{item.remark1},
+             #{item.remark2},
+             #{item.remark3})
         </foreach>
     </insert>
 </mapper>