From b94515daef0a52cd7c029577c7057a57fd37ee36 Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Tue, 9 Dec 2025 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/saleorder/vo/SaleOrderPageReqVO.java |  3 +++
 .../saleorder/SaleOrderServiceImpl.java        |  1 +
 .../mapper/saleorder/SaleOrderMapper.xml       |  5 ++++-
 .../src/views/oms/saleorder/index.vue          | 18 +++++++++++++++---
 .../src/views/oms/saleorder/index.vue          |  8 +++++---
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderPageReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderPageReqVO.java
index 5b89e4b..1e02335 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderPageReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderPageReqVO.java
@@ -48,6 +48,9 @@ public class SaleOrderPageReqVO extends PageParam {
     @Schema(description = "单据状态")
     private String billStatus;
 
+    @Schema(description = "物流单号")
+    private String logisticsCode;
+
     @Schema(description = "订单状态")
     private String orderStatus;
 
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index 13c3613..8c48245 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -260,6 +260,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         if(
             StringUtils.isNotBlank(pageReqVO.getBillno())
             ||StringUtils.isNotBlank(pageReqVO.getBillStatus())
+            ||StringUtils.isNotBlank(pageReqVO.getLogisticsCode())
             ||StringUtils.isNotBlank(pageReqVO.getPhone())
             ||StringUtils.isNotBlank(pageReqVO.getRemarks())
             ||ObjectUtil.isNotEmpty(pageReqVO.getBizdate())
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
index 3f098b5..ebf4118 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
@@ -11,6 +11,7 @@
         left join oms_brand brand on brand.id = a.brand_id
         <where>
             <if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
+            <if test="reqVO.logisticsCode != null and reqVO.logisticsCode != '' "> AND a.logistics_code = #{reqVO.logisticsCode} </if>
             <if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
             <if test="reqVO.bizdate != null "> AND a.bizdate between  #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
             <if test="reqVO.confirmdate != null "> AND a.confirmdate between  #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>
@@ -33,6 +34,7 @@
         left join oms_brand brand on brand.id = a.brand_id
         <where>
             <if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
+            <if test="reqVO.logisticsCode != null and reqVO.logisticsCode != '' "> AND a.logistics_code = #{reqVO.logisticsCode} </if>
             <if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
             <if test="reqVO.bizdate != null "> AND a.bizdate between  #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
             <if test="reqVO.confirmdate != null "> AND a.confirmdate between  #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>
@@ -93,12 +95,13 @@
 
 
     <select id="querySumTotalQty" resultType="Long" >
-        select sum(b.qty) from oms_saleorder a
+        select COALESCE(sum(b.qty),0) from oms_saleorder a
         left join oms_saleorder_entry b on a.id = b.parent_id
         left join oms_customer cus on cus.id = a.customer_id
         left join oms_brand brand on brand.id = a.brand_id
         <where>
         <if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
+        <if test="reqVO.logisticsCode != null and reqVO.logisticsCode != '' "> AND a.logistics_code = #{reqVO.logisticsCode} </if>
         <if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
         <if test="reqVO.bizdate != null "> AND a.bizdate between  #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
         <if test="reqVO.confirmdate != null "> AND a.confirmdate between  #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
index 9eb83c1..5b7d990 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
@@ -44,6 +44,15 @@
           class="!w-240px"
         />
       </el-form-item>
+      <el-form-item label="物流单号" prop="logisticsCode">
+        <el-input
+          v-model="queryParams.logisticsCode"
+          placeholder="请输入物流单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item label="业务日期" prop="bizdate">
         <el-date-picker
           v-model="queryParams.bizdate"
@@ -263,6 +272,7 @@
         :formatter="dateFormatter2"
         width="120px"
       />
+      <el-table-column label="物流单号" align="center" prop="logisticsCode" width="120px"/>
       <el-table-column label="手机" align="center" prop="phone" width="120px"/>
       <el-table-column label="备注" align="center" prop="remarks" width="150px"/>
       <el-table-column
@@ -443,6 +453,7 @@ const queryParams = reactive({
   confirmdate: [],
   plansenddate: [],
   phone: undefined,
+  logisticsCode: undefined,
   remarks: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
@@ -482,11 +493,12 @@ const getList = async () => {
       || (queryParams.customerName && queryParams.customerName.trim().length>0)
       || (queryParams.brandName && queryParams.brandName.trim().length>0)
       || (queryParams.materialName && queryParams.materialName.trim().length>0)
+      || (queryParams.logisticsCode && queryParams.logisticsCode.trim().length>0)
       || (queryParams.phone && queryParams.phone.trim().length>0)
       || (queryParams.remarks && queryParams.remarks.trim().length>0)
-      || (queryParams.bizdate && queryParams.bizdate.trim().length>0)
-      || (queryParams.confirmdate && queryParams.confirmdate.trim().length>0)
-      || (queryParams.plansenddate && queryParams.plansenddate.trim().length>0)
+      || (queryParams.bizdate && queryParams.bizdate.length>0)
+      || (queryParams.confirmdate && queryParams.confirmdate.length>0)
+      || (queryParams.plansenddate && queryParams.plansenddate.length>0)
      ){
       querySumTotalQtyOpen.value = true
       querySumTotalQty.value = data.otherMap['querySumTotalQty']
diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
index 6e63f04..3e9a138 100644
--- a/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
+++ b/hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
@@ -17,10 +17,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item :label="t('saleorder.customer')" prop="customerId">
+      <el-form-item :label="t('saleorder.logisticsCode')" prop="logisticsCode">
         <el-input
-          v-model="queryParams.customerId"
-          :placeholder="t('billform.pleaseenter')+''+t('saleorder.customer')"
+          v-model="queryParams.logisticsCode"
+          :placeholder="t('billform.pleaseenter')+''+t('saleorder.logisticsCode')"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -219,6 +219,7 @@
         width="120px"
       />
       <el-table-column :label="t('saleorder.phone')" align="center" prop="phone" width="120"/>
+      <el-table-column :label="t('saleorder.logisticsCode')" align="center" prop="logisticsCode" width="150"/>
       <el-table-column  :label="t('saleorder.remarks')" align="center" prop="remarks" width="150"/>
       <el-table-column
         :label="t('saleorder.createTime')"
@@ -392,6 +393,7 @@ const queryParams = reactive({
   confirmdate: [],
   plansenddate: [],
   phone: undefined,
+  logisticsCode: undefined,
   remarks: undefined,
 })
 const queryFormRef = ref() // 搜索的表单