From f5015283f24cdc0bd450a4e72b70574f36014370 Mon Sep 17 00:00:00 2001
From: liujie <liujie123456>
Date: Fri, 10 May 2024 15:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8F=91=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E5=BC=A0=E6=95=B0=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yb/lb/webapp/invoice/InvoiceApp.java  | 27 +++++++++++++++++++
 .../Invoice/InvoiceInfoMapper.xml             | 24 +++++++++++++++++
 .../records/CrmInvoiceGoodsMapper.xml         |  3 +++
 .../stock/InventoryDetailMapper.xml           | 15 ++++++-----
 .../stock/entity/CrmInventoryDetail.java      |  4 +++
 5 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/invoice/InvoiceApp.java b/crm-admin/src/main/java/com/yb/lb/webapp/invoice/InvoiceApp.java
index 170d336..f08b510 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/invoice/InvoiceApp.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/invoice/InvoiceApp.java
@@ -42,6 +42,33 @@ public class InvoiceApp extends BaseController {
     @Autowired
     RoleDateUtils roleDateUtils;
 
+    /**
+     * @description: 分页查询根据客户id和商品编码查询发货单信息
+     * @author: lj
+     * @date: 2024/5/8
+     **/
+    @ResponseBody
+    @ApiOperation("分页查询根据客户id和商品编码查询发货单信息")
+    @RequestMapping(value = "/pageFHDList", method = RequestMethod.POST)
+    public Map<String, Object> pageFHDList(
+            @ApiParam(required = true, value = "客户id") @RequestParam(required = true) String clientId,
+            @ApiParam(required = true, value = "商品编码") @RequestParam(required = true) String goodsCode,
+            @ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(value = "page") Integer pageNum,
+            @ApiParam(required = true, value = "每页条数", defaultValue = "10") @RequestParam(value = "pageSize") Integer pageSize,
+            HttpServletRequest request) {
+        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> params = new HashMap<String, Object>();
+        String token = request.getHeader("token");
+        if (!redisService.exists(token)) {
+            return AjaxResult.error(ErrorUtils.IS_NOT_LOGIN_ERROR, "用户未登录");
+        }
+        params.put("clientId", clientId);
+        params.put("goodsCode", goodsCode);
+        params.put("page", pageNum);
+        params.put("pageSize", pageSize);
+        return toPage(invoiceService.pageList(params, ".pageFHDList"));
+    }
+
     /**
      * @description: 分页查询
      * @author: mzr
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml
index 0a0d75c..5348827 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml
@@ -71,6 +71,30 @@
     <select id="findCode" parameterType="map" resultType="Integer">
         SELECT count(1) AS "num" FROM crm_invoice_info WHERE invoice_no = #{invoiceNo}
     </select>
+    <!-- 分页查询根据客户id和商品编码查询发货单信息 -->
+    <select id="pageFHDList" parameterType="map" resultType="map">
+        SELECT
+       a.id,
+       a.invoice_id "invoiceId",
+       nvl(a.major_num, '') "majorNum",
+        nvl(a.auxiliary_num, '') "auxiliaryNum",
+        nvl(a.actual_major_num, '') "actualMajorNum",
+        nvl(a.actual_auxiliary_num, '') "actualAuxiliaryNum",
+       b.INVOICE_NO "invoiceNo",
+       b.INVOICE_DATE "invoiceDate",
+       b.DELIVERY_TIME "deliveryTime"
+        FROM crm_invoice_detail a
+        LEFT JOIN crm_invoice_info b ON a.invoice_id = b.id
+        <where>
+            <if test="clientId != null and clientId != ''">
+                and b.client_id = #{clientId}
+            </if>
+            <if test="goodsNo != null and goodsNo != ''">
+                AND a.GOODS_NO = #{goodsNo}
+            </if>
+        </where>
+        ORDER BY a.create_time DESC
+    </select>
     <!-- 列表擦查询 -->
     <select id="pageList" parameterType="map" resultMap="crmInvoiceInfoMap">
         SELECT
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml
index 891c4f9..bcb5abd 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/records/CrmInvoiceGoodsMapper.xml
@@ -121,6 +121,9 @@
         LEFT JOIN crm_invoice_detail b ON a.goods_no = b.goods_no
         LEFT JOIN crm_invoice_info c on b.invoice_id = c.id
         <where>
+            <if test="goodsNo != null and goodsNo != ''">
+                AND a.GOODS_NO = #{goodsNo}
+            </if>
             <if test="clientId != null and clientId != ''">
                 AND c.client_id = #{clientId}
             </if>
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml
index 3569714..41b75d7 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/InventoryDetailMapper.xml
@@ -27,12 +27,13 @@
         <result column="remark" property="remark" jdbcType="VARCHAR" />
         <result column="prod_date" property="prodDate" jdbcType="VARCHAR" />
         <result column="distributor_name" property="clientName" jdbcType="VARCHAR" />
+        <result column="join_fhd_num" property="joinFhdNum" jdbcType="VARCHAR" />
     </resultMap>
 
     <!-- 表查询字段 -->
     <sql id="allColumns">
         a.id, a.bill_id, a.bill_no, a.bill_date, a.client_id, a.confirm_status, a.create_time, a.goods_id, 
-        a.goods_no, a.last_num, a.count_num, a.diff_num, a.company_id, a.remark, a.prod_date,
+        a.goods_no, a.last_num, a.count_num, a.diff_num, a.company_id, a.remark, a.prod_date,a.join_fhd_num,
     </sql>
 
     <!-- 根据条件参数查询盘点子表列表 -->
@@ -93,7 +94,7 @@
         SELECT * FROM (
         SELECT
         c.distributor_name, a.goods_no, a.prod_date, b.goods_name, b.unit_name, b.specifications, b.goods_type_name,
-        a.count_num,
+        a.count_num,a.join_fhd_num,
         ROW_NUMBER () OVER(PARTITION BY a.client_id,a.goods_no ORDER BY a.bill_date DESC, a.create_time
         DESC) AS rn
         FROM crm_inventory_detail a
@@ -218,7 +219,7 @@
         INSERT INTO crm_inventory_detail (
             id, bill_id, bill_no, bill_date, client_id, confirm_status, create_time, goods_id, 
             goods_no, goods_name, unit_id, unit_name, specifications, goods_type_id, goods_type_name, last_num, 
-            count_num, diff_num, company_id, remark, prod_date
+            count_num, diff_num, company_id, remark, prod_date,join_fhd_num
         ) VALUES (
             #{id,jdbcType=VARCHAR},
             #{billId,jdbcType=VARCHAR},
@@ -240,7 +241,8 @@
             #{diffNum,jdbcType=VARCHAR},
             #{companyId,jdbcType=VARCHAR},
             #{remark,jdbcType=VARCHAR},
-            #{prodDate,jdbcType=VARCHAR}
+            #{prodDate,jdbcType=VARCHAR},
+            #{joinFhdNum,jdbcType=VARCHAR}
         )
     </insert>
 
@@ -249,7 +251,7 @@
         INSERT INTO crm_inventory_detail (
             id, bill_id, bill_no, bill_date, client_id, confirm_status, create_time, goods_id, 
             goods_no, goods_name, unit_id, unit_name, specifications, goods_type_id, goods_type_name, last_num, 
-            count_num, diff_num, company_id, remark, prod_date
+            count_num, diff_num, company_id, remark, prod_date,join_fhd_num
         )
         <foreach collection="list" index="index" item="item" separator="UNION ALL">
             SELECT
@@ -273,7 +275,8 @@
                 #{item.diffNum,jdbcType=VARCHAR},
                 #{item.companyId,jdbcType=VARCHAR},
                 #{item.remark,jdbcType=VARCHAR},
-                #{item.prodDate,jdbcType=VARCHAR}
+                #{item.prodDate,jdbcType=VARCHAR},
+            #{item.joinFhdNum,jdbcType=VARCHAR}
             FROM DUAL
         </foreach>
     </insert>
diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/CrmInventoryDetail.java b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/CrmInventoryDetail.java
index 1129a01..86adac2 100644
--- a/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/CrmInventoryDetail.java
+++ b/crm-webapp/src/main/java/com/yb/lb/webapp/stock/entity/CrmInventoryDetail.java
@@ -111,4 +111,8 @@ public class CrmInventoryDetail implements java.io.Serializable {
     @Excel(name = "客户名称", width = 20, orderNum = "0")
     private String clientName;
 
+    /** 关联发货单张数 */
+    @ApiModelProperty(value = "关联发货单张数")
+    private String joinFhdNum;
+
 }
\ No newline at end of file