aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-12-28 17:16:33 +08:00
parent d1f719aaea
commit 5e72d1309d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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", "");

2
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -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

4
emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
View File

@ -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>