From 0683419892141975d28bd1deed1e5c9b43cd14d2 Mon Sep 17 00:00:00 2001
From: MrZhai <zrhdyxa@163.com>
Date: Sun, 27 Mar 2022 15:07:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=8F=8Amapper=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=202.=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=BA=93=E5=AD=98=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/thrsys/ThrInvProductsEntity.java   |  42 ++++++
 .../entity/thrsys/ThrOrderDetailEntity.java   |   4 +
 .../admin/entity/thrsys/ThrOrderEntity.java   |  13 ++
 .../entity/thrsys/ThrProductsEntity.java      |  10 ++
 .../thrsys/FilterThrInvProductsRequest.java   |  29 +++++
 .../res/inventory/ErpInvProductResponse.java  |  22 ++++
 .../mapper/thrsys/ThrInvProductsDao.xml       | 123 ++++++++++++++++++
 .../mybatis/mapper/thrsys/ThrOrderDao.xml     |  65 +++++----
 .../mapper/thrsys/ThrOrderDetailDao.xml       |  34 +++--
 9 files changed, 296 insertions(+), 46 deletions(-)
 create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrInvProductsEntity.java
 create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java
 create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java
 create mode 100644 api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrInvProductsEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrInvProductsEntity.java
new file mode 100644
index 0000000..cfc198e
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrInvProductsEntity.java
@@ -0,0 +1,42 @@
+package com.glxp.sale.admin.entity.thrsys;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ThrInvProductsEntity {
+
+    private Integer id;
+    private String inventoryCode;
+    private String inventoryName;
+    private String spec;
+    private Integer count;
+    private String batchNo;
+    private String warehouseName;
+    private String warehouseCode;
+    private String registerCertNo;
+    private String manufacturingDate;
+    private String expirationDate;
+    private String spaceCode;
+    private String spaceName;
+    private String thirdSysFk;
+    private Date updateTime;
+    private String manufactory;
+
+
+    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; //配送企业名称
+
+
+}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java
index 83b257c..5969b2a 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderDetailEntity.java
@@ -2,6 +2,7 @@ package com.glxp.sale.admin.entity.thrsys;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -19,4 +20,7 @@ public class ThrOrderDetailEntity {
     private String thirdSysFk;
     private Date updateTime;
 
+    //增加字段
+    private BigDecimal price; //单价
+    private String corpName; //往来单位
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java
index 5101571..8538bc2 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java
@@ -18,4 +18,17 @@ public class ThrOrderEntity {
     private Date updateTime;
     private String originType;
     private String unitIdFk;
+
+    //增加字段
+    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
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java
index ecd8562..54d56ed 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsEntity.java
@@ -28,4 +28,14 @@ public class ThrProductsEntity {
     private String supName;
     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
+
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java
new file mode 100644
index 0000000..4f54ea8
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvProductsRequest.java
@@ -0,0 +1,29 @@
+package com.glxp.sale.admin.req.thrsys;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import com.glxp.sale.admin.res.inventory.ErpInvProductResponse;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterThrInvProductsRequest extends ListPageRequest {
+
+    private String inventoryCode;
+    private String inventoryName;
+    private String thirdSysFk;
+    private String batchNo;
+    private String warehouseCode;
+    private List<String> inventoryCodes;
+    private String udiCode;
+    private String nameCode;
+    private String thirdSys;
+    List<ErpInvProductResponse> erpInvProductResponses;
+
+
+
+    private String spec;
+    private String registerCertNo;
+    private String manufactory;
+    private Integer filterCount;//0:不过滤，1，过滤等于0，2.过滤大于0
+}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java
new file mode 100644
index 0000000..2617bac
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/ErpInvProductResponse.java
@@ -0,0 +1,22 @@
+package com.glxp.sale.admin.res.inventory;
+
+import lombok.Data;
+
+@Data
+public class ErpInvProductResponse {
+
+    private String code;
+    private String name;
+    private String batchNo;
+    private String manufacturingDate;
+    private String expirationDate;
+    private String warehouseCode;
+    private String warehouseName;
+    private String registerCertNo;
+    private String spaceCode;
+    private String spaceName;
+    private String thirdSysFk;
+    private String spec;
+    private Integer count;
+    private String manufactory;
+}
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml
new file mode 100644
index 0000000..966ff7b
--- /dev/null
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml
@@ -0,0 +1,123 @@
+<?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.sale.admin.dao.thrsys.ThrInvProductsDao">
+
+    <select id="filterThrInvProductss" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrInvProductsRequest"
+            resultType="com.glxp.sale.admin.entity.thrsys.ThrInvProductsEntity">
+        SELECT * FROM thr_inv_products
+        <where>
+            <if test="inventoryCode != '' and inventoryCode != null">
+                AND inventoryCode LIKE concat('%',#{inventoryCode},'%')
+            </if>
+            <if test="inventoryName != '' and inventoryName != null">
+                AND inventoryName LIKE concat('%',#{inventoryName},'%')
+            </if>
+            <if test="filterCount != '' and filterCount != null and filterCount==1">
+                AND count <![CDATA[ = ]]> 0
+            </if>
+            <if test="filterCount != '' and filterCount != null and filterCount==2">
+                AND count <![CDATA[ > ]]> 0
+            </if>
+            <if test="spec != '' and spec != null">
+                AND spec LIKE concat('%',#{spec},'%')
+            </if>
+            <if test="registerCertNo != '' and registerCertNo != null">
+                AND registerCertNo LIKE concat('%',#{registerCertNo},'%')
+            </if>
+            <if test="manufactory != '' and manufactory != null">
+                AND manufactory LIKE concat('%',#{manufactory},'%')
+            </if>
+            <if test="thirdSysFk != '' and thirdSysFk != null">
+                AND thirdSysFk = #{thirdSysFk}
+            </if>
+        </where>
+        ORDER BY updateTime DESC
+    </select>
+
+    <select id="selectById" parameterType="Map" resultType="com.glxp.sale.admin.entity.thrsys.ThrInvProductsEntity">
+         select * FROM thr_inv_products  WHERE id =  #{id}
+    </select>
+    <insert id="insertThrInvProduct" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.thrsys.ThrInvProductsEntity">
+        replace INTO thr_inv_products
+        (
+        inventoryCode,inventoryName,count,spec,
+        warehouseName,warehouseCode,registerCertNo,manufacturingDate,
+        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},
+            #{productDate}, #{expireDate}, #{productName}, #{productId}, #{standard},
+            #{registerNo}, #{supId}, #{supName}
+            )
+    </insert>
+
+    <insert id="insertThrInvProducts" keyProperty="id" parameterType="java.util.List">
+        replace INTO thr_inv_products
+        (
+        inventoryCode,inventoryName,count,spec,
+        warehouseName,warehouseCode,registerCertNo,manufacturingDate,
+        expirationDate,thirdSysFk,batchNo,spaceCode,spaceName,updateTime,manufactory,
+        productDate, expireDate, productName, productId, standard, registerNo, supId, supName
+        )
+        values
+
+        <foreach collection="thrInvProductsEntities" item="item" index="index"
+                 separator=",">
+            (
+            #{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.productDate},#{item.expireDate}, #{item.productName}, #{item.productId}, #{item.standard}, #{item.registerNo},
+            #{item.supId}, #{item.supName}
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE FROM thr_inv_products  WHERE id =  #{id}
+    </delete>
+
+
+    <delete id="deleteAll">
+        DELETE FROM thr_inv_products
+    </delete>
+
+    <update id="updateThrInvProducts" parameterType="com.glxp.sale.admin.entity.thrsys.ThrInvProductsEntity">
+        UPDATE thr_inv_products
+        <trim prefix="set" suffixOverrides=",">
+            <if test="inventoryCode != null">inventoryCode=#{inventoryCode},</if>
+            <if test="inventoryName != null">inventoryName=#{inventoryName},</if>
+            <if test="spec != null">spec=#{spec},</if>
+            <if test="count != null">count=#{count},</if>
+            <if test="batchNo != null">batchNo=#{batchNo},</if>
+            <if test="warehouseName != null">warehouseName=#{warehouseName},</if>
+            <if test="warehouseCode != null">warehouseCode=#{warehouseCode},</if>
+            <if test="registerCertNo != null">registerCertNo=#{registerCertNo},</if>
+            <if test="manufacturingDate != null">manufacturingDate=#{manufacturingDate},</if>
+            <if test="expirationDate != null">expirationDate=#{expirationDate},</if>
+            <if test="spaceCode != null">spaceCode=#{spaceCode},</if>
+            <if test="spaceName != null">spaceName=#{spaceName},</if>
+            <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>
+
+</mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
index 04342fb..b4510d0 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
@@ -45,39 +45,40 @@
 
     <insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.thrsys.ThrOrderEntity">
         replace INTO thr_order
-        (
-        billNo,billdate,corpId,corpName,billType,billFlag,thirdSysFk, updateTime,originType,unitIdFk
-        )
-        values
-            (
-            #{billNo},
-            #{billdate},
-            #{corpId},
-            #{corpName},
-            #{billType},
-            #{billFlag},
-            #{thirdSysFk},#{updateTime},#{originType},#{unitIdFk}
-            )
+                (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk,
+                 startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
+                 remark3)
+        values (#{billNo},
+                #{billdate},
+                #{corpId},
+                #{corpName},
+                #{billType},
+                #{billFlag},
+                #{thirdSysFk}, #{updateTime}, #{originType}, #{unitIdFk},
+                #{startDate}, #{endDate}, #{createUser}, #{reviewUser},
+                #{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,unitIdFk
-        )
-        values
+                (billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk,
+                 startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
+                 remark3)
+                values
 
         <foreach collection="thrOrderEntities" item="item" index="index"
                  separator=",">
-            (
-            #{item.billNo},
-            #{item.billdate},
-            #{item.corpId},
-            #{item.corpName},
-            #{item.billType},
-            #{item.billFlag},
-            #{item.thirdSysFk},#{item.updateTime},#{item.originType},#{item.unitIdFk}
-            )
+            (#{item.billNo},
+             #{item.billdate},
+             #{item.corpId},
+             #{item.corpName},
+             #{item.billType},
+             #{item.billFlag},
+             #{item.thirdSysFk}, #{item.updateTime}, #{item.originType}, #{item.unitIdFk},
+             #{item.startDate}, #{item.endDate}, #{item.createUser}, #{item.reviewUser},
+             #{item.address}, #{item.linkMan}, #{item.linkTel}, #{item.remark}, #{item.remark1},
+             #{item.remark2}, #{item.remark3})
         </foreach>
     </insert>
 
@@ -102,7 +103,17 @@
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="originType != null">originType=#{originType},</if>
             <if test="unitIdFk != null">unitIdFk=#{unitIdFk},</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>
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml
index fd18fec..acb925f 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml
@@ -20,31 +20,26 @@
     <insert id="insertThrOrderDetail" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity">
         replace INTO thr_order_detail
-        (
-        productId,productName,spec,batchNo,expireDate,
-        productDate,count,reCount,orderIdFk,thirdSysFk,updateTime
-        )
-        values
-            (
-            #{productId},#{productName},#{spec},#{batchNo},#{expireDate},
-            #{productDate},#{count},#{reCount},#{orderIdFk},#{thirdSysFk},#{updateTime}
-            )
+                (productId, productName, spec, batchNo, expireDate,
+                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName)
+        values (#{productId}, #{productName}, #{spec}, #{batchNo}, #{expireDate},
+                #{productDate}, #{count}, #{reCount}, #{orderIdFk}, #{thirdSysFk}, #{updateTime},
+                #{price}, #{corpName})
     </insert>
 
     <insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List">
         replace INTO thr_order_detail
-        (
-        productId,productName,spec,batchNo,expireDate,
-        productDate,count,reCount,orderIdFk,thirdSysFk,updateTime
-        )
-        values
+                (productId, productName, spec, batchNo, expireDate,
+                 productDate, count, reCount, orderIdFk, thirdSysFk, updateTime
+                        , price, corpName)
+                values
 
         <foreach collection="thrOrderDetailEntities" item="item" index="index"
                  separator=",">
-            (
-            #{item.productId},#{item.productName},#{item.spec},#{item.batchNo},#{item.expireDate},
-            #{item.productDate},#{item.count},#{item.reCount},#{item.orderIdFk},#{item.thirdSysFk},#{item.updateTime}
-            )
+            (#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate},
+             #{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk},
+             #{item.updateTime},
+             #{item.price}, #{item.corpName})
         </foreach>
     </insert>
 
@@ -69,7 +64,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>