From 08f5b2ba7b357ea2dae3108a21ad2a1d32ddeb23 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Tue, 25 Jun 2024 13:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/scm/BusinessOrderMapper.xml        |  8 ++++++-
 .../java/jnpf/entity/BusinessOrderEntity.java |  3 +++
 .../entity/DeliveryProductRelationEntity.java |  2 ++
 .../DeliveryProductRelationModel.java         |  4 ++++
 .../scm/saleCenter/deliveryOrder/form.vue     | 22 ++++++++++++++++++-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
index a4f484db..e45f295d 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
@@ -96,6 +96,8 @@
         <result column="wareHouseName" property="wareHouseName"/>
         <result column="realName" property="realName"/>
         <result column="realNameA" property="realNameA"/>
+        <result column="taxCount" property="taxCount"/>
+
     </resultMap>
 
     <resultMap id="purchaseOrder" type="jnpf.entity.BusinessOrderEntity">
@@ -765,14 +767,18 @@
             b.NAME AS subjectName,
             c.contract_name AS contractName,
             d.name as secondCustomName,
-            e.name as businessLineName
+            e.name as businessLineName,
+            SUM(f.tax_count) AS taxCount
         FROM
             jg_business_order a
                 LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_contract c ON a.contract_id = c.id AND c.f_delete_mark is NULL
                 LEFT JOIN jg_subject_basic d ON a.second_subject_basic_id = d.id AND d.f_delete_mark IS NULL
                 LEFT JOIN jg_business_line e ON a.business_line_id = e.id AND e.f_delete_mark IS NULL
+                LEFT JOIN jg_business_order_product_relational f ON a.id=f.business_order_id AND f.f_delete_mark IS NULL
             ${ew.customSqlSegment}
+        GROUP BY
+            a.id
     </select>
     <select id="queryCurrentDayNum" resultType="java.math.BigDecimal">
         SELECT IFNULL(SUM( business_num ),0) businessNum from jg_business_order_product_relational where business_order_id in (SELECT a.id from jg_business_order a
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java
index f572bb36..728cd0dd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java
@@ -212,4 +212,7 @@ public class BusinessOrderEntity  {
     private String productId;
     @TableField(exist = false)
     private BigDecimal profit;
+
+    @TableField(exist = false)
+    private BigDecimal taxCount;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java
index d9298f27..944c2488 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java
@@ -88,6 +88,8 @@ public class DeliveryProductRelationEntity  {
     private String tenantId;
     @TableField(value = "CLEAR_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal clearWeight;
+    @TableField(value = "INVENTORY_NO" , updateStrategy = FieldStrategy.IGNORED)
+    private String inventoryNo;
 
     @TableField(exist = false)
     private BigDecimal remainingStockableQuantity;
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java
index 87c5c3fc..68248376 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryorder/DeliveryProductRelationModel.java
@@ -87,4 +87,8 @@ public class DeliveryProductRelationModel  {
     /** 净重 **/
     @JSONField(name = "clearWeight")
     private BigDecimal clearWeight;
+
+    /** 批次号库存数量 **/
+    @JSONField(name = "inventoryNo")
+    private String inventoryNo;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
index 59330bff..87bf8cc5 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
@@ -800,6 +800,21 @@
                   </template>
                 </el-table-column>
 
+                <el-table-column label="库存数量"
+                  v-if="judgeShow('deliveryproductrelation-inventoryNo')" prop="inventoryNo"
+                  width="200">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-inventoryNo')">*</span>库存数量
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.inventoryNo"
+                      @change="changeData('deliveryproductrelation-inventoryNo', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+
                 <el-table-column label="生产日期" v-if="judgeShow('warehousingproduct-produceDate')"
                   prop="produceDate" width="200">
                   <template slot="header">
@@ -1030,6 +1045,7 @@ export default {
           deliveryNum: '',
           deliveryNumOptions: [],
           batchNo: '',
+          inventoryNo: '',
           batchNoOptions: [],
           produceTime: '',
           produceTimeOptions: [],
@@ -1128,7 +1144,7 @@ export default {
       transportModeProps: { "label": "fullName", "value": "id" },
       deliveryTypeOptions: [{ "fullName": "销售发货", "id": "2" }],
       deliveryTypeProps: { "label": "fullName", "value": "id" },
-      businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "客户名称", "value": "subjectName" }, { label: "销售数量", value: "planPurchaseNum" }, { "label": "单据类型", "value": "orderType1" }, { "label": "配送方式", "value": "deliveryType1" }, { "label": "状态", "value": "saleStatus" },],
+      businessIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "客户名称", "value": "subjectName" }, { label: "销售数量", value: "planPurchaseNum" }, { label: "销售金额", value: "taxCount" }, { "label": "单据类型", "value": "orderType1" }, { "label": "配送方式", "value": "deliveryType1" }, { "label": "状态", "value": "saleStatus" },],
       reservedFields1columnOptions: [{ "label": "业务线编码", "value": "code" }, { "label": "业务线名称", "value": "name" },],
       subjectIdcolumnOptions: [{ "label": "客户编码", "value": "code" }, { "label": "客户名称", "value": "name" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
@@ -1280,6 +1296,8 @@ export default {
       }
       this.dataForm.deliveryProductRelationList[idx].batchNo = val2.batch_number
       this.dataForm.deliveryProductRelationList[idx].produceDate = val2.produce_date
+      this.dataForm.deliveryProductRelationList[idx].inventoryNo = val2.inventory_number
+
       this.inventoryIdList.push(val2.id)
     },
     //选择数据弹窗
@@ -1701,6 +1719,7 @@ export default {
         cargoId: '',
         deliveryNum: undefined,
         batchNo: undefined,
+        inventoryNo: undefined,
         produceTime: undefined,
         returnUnit: undefined,
         tax: undefined,
@@ -1716,6 +1735,7 @@ export default {
       item.cargoId = undefined
       item.deliveryNum = undefined
       item.batchNo = undefined
+      item.inventoryNo = undefined
       item.produceDate = undefined
       this.dataForm.deliveryProductRelationList.push(item)
       this.childIndex = this.dataForm.deliveryProductRelationList.length - 1