From 72bd2b0e11eed1f75c2d892f4645a2dbe56f243a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 29 Jul 2025 14:00:05 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=E6=A0=B9=E6=8D=AE=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=8D=95=E5=8F=B7=E3=80=81=E4=B8=BB=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=E8=99=9A=E6=8B=9F=E5=8D=95?=
 =?UTF-8?q?=E3=80=81=E4=B8=BB=E5=8D=95=E7=9A=84=E7=BB=91=E5=AE=9A=20=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=91=98=E5=B7=A5=E6=8F=90=E6=88=90=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E6=97=B6=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81bug=E4=BF=AE=E5=A4=8D=20=20=20TMS=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=20-=20=E6=8F=90=E6=88=90=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A1=E6=8F=90=E6=AF=94=E4=BE=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20-=20=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E3=80=81=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E2=80=9D?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=90=AF=E7=94=A8=E5=B7=B2?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E3=80=81=E5=90=AF=E7=94=A8=E6=9C=AA=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E2=80=9D=E7=8A=B6=E6=80=81=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/EmisCommonController.java    | 24 +++++++++++++
 .../EmisSalesCommissionRatioController.java   | 11 +++++-
 .../emis/domain/EmisSalesCommissionRatio.java | 10 +++++-
 .../erp/emis/service/IEmisWaybillService.java |  6 ++++
 .../service/impl/EmisWaybillServiceImpl.java  | 10 ++++++
 .../mapper/EmisSalesCommissionRatioMapper.xml | 34 +++++++++++++++----
 .../mapper/EmisTransProductMapper.xml         |  7 +++-
 7 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 103f43b74..4243c5e31 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -772,6 +772,30 @@ public class EmisCommonController extends EmisBaseController
 
     }
 
+    /**
+     * 处理输入的历史虚拟单
+     * @return
+     */
+    @PostMapping("/handleInputVirtualWaybill")
+    public AjaxResult handleInputVirtualWaybill(@RequestBody List<EmisWaybill> emisWaybills){
+        String lockKey="handleInputVirtualWaybill";
+        log.info("handleHistoryVirtualWaybill start");
+
+        // 加锁查询
+        redissonService.lock(lockKey,300);
+        try{
+            emisWaybillService.handleInputVirtualWaybill(emisWaybills);
+        }catch(Exception ex){
+            ex.printStackTrace();
+            log.error("handleInputVirtualWaybill exception:"+ex.getMessage());
+        }
+        log.info("handleInputVirtualWaybill end");
+
+        redissonService.unlock(lockKey);
+        return AjaxResult.success("发送成功");
+
+    }
+
     /**
      * 自动出账触发
      * @return
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java
index 4ae9ae37f..c4b78a96f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSalesCommissionRatioController.java
@@ -26,9 +26,18 @@ public class EmisSalesCommissionRatioController extends BaseController {
     /**
      * 查询销售计提比例配置列表
      */
-     @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:list')")
+    @PreAuthorize("@ss.hasPermi('emis:salesCommissionRatio:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisSalesCommissionRatio query) {
+         if ("2".equals(query.getStatus())) {
+             // status=2: 启用且已过期，修改为查询启用状态且结束日期早于当前日期
+             query.setStatus("1");
+             query.getParams().put("endDateBeforeNow", true);
+         } else if ("3".equals(query.getStatus())) {
+             // status=3: 启用且未过期，修改为查询启用状态且结束日期晚于等于当前日期
+             query.setStatus("1");
+             query.getParams().put("endDateAfterNow", true);
+         }
         startPage();
         List<EmisSalesCommissionRatio> list = emisSalesCommissionRatioService.selectEmisSalesCommissionRatioList(query);
         return getDataTable(list);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java
index 4f0807ff9..6bf8b7455 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSalesCommissionRatio.java
@@ -1,8 +1,10 @@
 package com.xdadan.erp.emis.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import com.xdadan.erp.common.core.domain.BaseEntity;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 销售计提比例配置实体类
@@ -24,6 +26,12 @@ public class EmisSalesCommissionRatio extends BaseEntity {
     private String salesSupport;
     /** 销售支持占比 */
     private BigDecimal salesSupportRatio;
-    /** 启用状态 1-启用 0-未启用 **/
+    /** 启用状态 1-启用 0-未启用 2-启用已过期 3-启用未过期 **/
     private String status;
+    /* 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startDate;
+    /* 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endDate;
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index 5988b5ab6..95db1fb89 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -306,4 +306,10 @@ public interface IEmisWaybillService extends IDataAuditService
      *
      */
     void handleHistoryVirtualWaybill();
+
+    /**
+     *
+     * @param emisWaybills
+     */
+    void handleInputVirtualWaybill(List<EmisWaybill> emisWaybills);
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 6c14b452c..3f8b82a36 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -6044,6 +6044,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
     }
 
+    @Override
+    public void handleInputVirtualWaybill(List<EmisWaybill> emisWaybills) {
+        for (EmisWaybill emisWaybill : emisWaybills) {
+            EmisWaybill oldWaybill = emisWaybillMapper
+                    .selectMasterWaybillByBillCode(emisWaybill.getBillCode());
+            emisWaybill.setId(oldWaybill.getId());
+            updateWaybill(emisWaybill);
+        }
+    }
+
     // 新增内部类用于返回统计结果
     private static class ProblemHandleResult {
         int successCount;
diff --git a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
index caff09c55..450785fa7 100644
--- a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
@@ -11,10 +11,12 @@
         <result property="salesSupport" column="sales_support" />
         <result property="salesSupportRatio" column="sales_support_ratio" />
         <result property="status" column="status" />
+        <result property="startDate" column="start_date" />
+        <result property="endDate" column="end_date" />
     </resultMap>
 
     <sql id="selectEmisSalesCommissionRatioVo">
-        select id, sales_executive, sales_executive_ratio, salesmen, salesmen_ratio, sales_support, sales_support_ratio, status, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_sales_commission_ratio
+        select id, sales_executive, sales_executive_ratio, salesmen, salesmen_ratio, sales_support, sales_support_ratio, status, start_date, end_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_sales_commission_ratio
     </sql>
 
     <!-- 查询列表 -->
@@ -27,6 +29,15 @@
             <if test="salesSupport != null and salesSupport != ''">AND sales_support like concat('%', #{salesSupport}, '%')</if>
             <if test="status != null and status != ''">AND status = #{status}</if>
             <if test="delFlag != null and delFlag != ''">AND del_flag = #{delFlag}</if>
+            <if test="startDate != null">AND start_date = #{startDate}</if>
+            <if test="endDate != null">AND end_date = #{endDate}</if>
+            <!-- 处理status=2/3的特殊逻辑 -->
+            <if test="params.endDateBeforeNow != null and params.endDateBeforeNow == true">
+                and end_date &lt; NOW()
+            </if>
+            <if test="params.endDateAfterNow != null and params.endDateAfterNow == true">
+                and end_date &gt;= NOW()
+            </if>
         </where>
         ORDER BY id DESC
     </select>
@@ -48,6 +59,8 @@
             <if test="salesSupport != null and salesSupport != ''">sales_support,</if>
             <if test="salesSupportRatio != null">sales_support_ratio,</if>
             <if test="status != null">status,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
             <if test="createBy != null and createBy != ''">create_by,</if>
@@ -65,6 +78,8 @@
             <if test="salesSupport != null and salesSupport != ''">#{salesSupport},</if>
             <if test="salesSupportRatio != null">#{salesSupportRatio},</if>
             <if test="status != null">#{status},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
             <if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -87,6 +102,8 @@
             <if test="salesSupport != null">sales_support = #{salesSupport},</if>
             <if test="salesSupportRatio != null">sales_support_ratio = #{salesSupportRatio},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -113,16 +130,19 @@
         </foreach>
     </update>
 
-    <!-- 验重：salesExecutive、salesmen、salesSupport、status都相同视为重复 -->
+    <!-- 验重：salesExecutive、salesmen、salesSupport、status、startDate、endDate都相同视为重复 -->
     <select id="checkUnique" parameterType="com.xdadan.erp.emis.domain.EmisSalesCommissionRatio" resultType="int">
         SELECT COUNT(1)
         FROM emis_sales_commission_ratio
         WHERE sales_executive = #{salesExecutive}
-          AND salesmen = #{salesmen}
-          AND sales_support = #{salesSupport}
-          AND status = #{status}
-          AND del_flag = '0'
-          <if test="id != null">AND id != #{id}</if>
+        AND salesmen = #{salesmen}
+        AND sales_support = #{salesSupport}
+        AND status = #{status}
+        AND (
+        start_date &lt;= #{endDate} and end_date &gt;= #{startDate}
+        )
+        AND del_flag = '0'
+        <if test="id != null">AND id != #{id}</if>
     </select>
 
 </mapper> 
\ No newline at end of file
diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
index 98c91c0ae..e7f91c795 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
@@ -40,7 +40,12 @@
             <if test="prodNameEn != null  and prodNameEn != ''"> and prod_name_en like concat('%', #{prodNameEn}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="country != null  and country != ''"> and country=#{country}</if>
-            <if test="transLineCode != null  and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
+            <if test="transLineCode != null  and transLineCode != ''">
+                and trans_line_code in
+                <foreach collection="transLineCode.split(',')" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="transLine != null  and transLine != ''"> and trans_line like concat('%', #{transLine}, '%')</if>
             <if test="carryType != null  and carryType != ''"> and carry_type=#{carryType}</if>
             <if test="transType != null  and transType != ''"> and trans_type= #{transType}</if>