From 5e72d1309d4f25d88a0e98d8d0640051851611d7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 28 Dec 2024 17:16:33 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java  | 2 +-
 emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml   | 2 +-
 emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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 a093089db..fbbd37a24 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
@@ -3874,7 +3874,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
             fillMap.put("country", emisWaybillOld.getReceiveCountryName());
             fillMap.put("warehouse", emisWaybillOld.getIntoWarehouseName());
             fillMap.put("productName", emisWaybillOld.getProductTypeName());
-            fillMap.put("estDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, emisWaybillOld.getPickStartDate() == null ? emisWaybillOld.getOrderDate() : emisWaybillOld.getPickStartDate()));
+            fillMap.put("estDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, emisWaybillOld.getPickStartDate() == null ? emisWaybillOld.getOrderDate() : emisWaybillOld.getPickStartDate()));
             fillMap.put("declareType", customsEclaration);
             fillMap.put("eDeclareType", customsClear);
             fillMap.put("supplier", "");
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 35c906887..eabee6725 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -260,7 +260,7 @@
             ) tbe on tba.salesmen=tbe.salesmen and tba.billMonth=tbe.billMonth
 
             where 1=1
-                <if test="params.isNeedRecdPay != null and params.isNeedRecdPay=1">
+                <if test="params.isNeedRecdPay != null and params.isNeedRecdPay == 1">
                     and tba.totalNoRecdPayMoney  <![CDATA[ > ]]>  0
                     and (
                         ifnull( tbe.expiredNoRecdPayMoney, 0 ) <![CDATA[ > ]]>  0
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index c76bec33f..e4b92e806 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -111,10 +111,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null "> and id = #{id}</if>
             <if test="serialNo != null  and serialNo != ''"> and serial_no like concat('%', #{serialNo}, '%')</if>
             <if test="inNo != null  and inNo != ''">
-                and ( FIND_IN_SET(`in_no`,#{inNo}) or in_no like concat('%', #{inNo}, '%') )
+                and  FIND_IN_SET(`in_no`,#{inNo})
              </if>
             <if test="orderSn != null  and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
-            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )</if>
+            <if test="billCode != null  and billCode != ''"> and  FIND_IN_SET(`bill_code`,#{billCode})  </if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code=#{customerCode}</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
             <if test="entryDate != null "> and entry_date = #{entryDate}</if>