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-06-13 22:42:49 +08:00
parent 69608ab05e
commit 95d01b1c12
4 changed files with 92 additions and 30 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/EmisTmsScanRecordServiceImpl.java
View File

@ -522,6 +522,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 获取快递公司
String transferCompanyName=DictUtils.getDictLabel("emis_express_code",transferCode);
emisTmsScanRecord.setRemark("["+transferCompanyName+" "+transferBillcode +"] 发往["+destCity+"]");
emisTmsScanRecord.setScanSite(transferCompanyName);
emisTmsScanRecord.setScanMan(transferCompanyName);
// 更新waybill做转单
wayBillTransfer(emisTmsScanRecord.getBillCode(),transferCode,transferBillcode,destCity);

55
emis-biz/src/main/resources/mapper/EmisTmsPackMapper.xml
View File

@ -38,35 +38,62 @@
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="packNo != null and packNo != ''"> and pack_no like concat('%', #{packNo}, '%')</if>
<if test="packNo != null and packNo != ''"> and ( FIND_IN_SET(`pack_no`,#{packNo}) or pack_no like concat('%', #{packNo}, '%') )</if>
<if test="packName != null and packName != ''"> and pack_name like concat('%', #{packName}, '%')</if>
<if test="packDate != null "> and pack_date like concat('%', #{packDate}, '%')</if>
<if test="destCountry != null and destCountry != ''"> and dest_country like concat('%', #{destCountry}, '%')</if>
<if test="destCountry != null and destCountry != ''"> and dest_country=#{destCountry}</if>
<if test="destCountryName != null and destCountryName != ''"> and dest_country_name like concat('%', #{destCountryName}, '%')</if>
<if test="blUnpack != null and blUnpack != ''"> and bl_unpack like concat('%', #{blUnpack}, '%')</if>
<if test="sendStiteCode != null and sendStiteCode != ''"> and send_stite_code like concat('%', #{sendStiteCode}, '%')</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code like concat('%', #{nextSiteCode}, '%')</if>
<if test="blUnpack != null and blUnpack != ''"> and bl_unpack= #{blUnpack}</if>
<if test="sendStiteCode != null and sendStiteCode != ''"> and send_stite_code= #{sendStiteCode}</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code=#{nextSiteCode}</if>
<if test="nextStation != null and nextStation != ''"> and next_station like concat('%', #{nextStation}, '%')</if>
<if test="totalParcelQty != null "> and total_parcel_qty = #{totalParcelQty}</if>
<if test="totalWaybillQty != null "> and total_waybill_qty = #{totalWaybillQty}</if>
<if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
<if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
<if test="packStatus != null and packStatus != ''"> and pack_status like concat('%', #{packStatus}, '%')</if>
<if test="packStatus != null and packStatus != ''"> and pack_status=#{packStatus}</if>
<if test="extData != null and extData != ''"> and ext_data like concat('%', #{extData}, '%')</if>
<if test="opMan != null and opMan != ''"> and op_man like concat('%', #{opMan}, '%')</if>
<if test="ext1 != null and ext1 != ''"> and ext1 like concat('%', #{ext1}, '%')</if>
<if test="ext2 != null and ext2 != ''"> and ext2 like concat('%', #{ext2}, '%')</if>
<if test="ext3 != null and ext3 != ''"> and ext3 like concat('%', #{ext3}, '%')</if>
<if test="ext4 != null and ext4 != ''"> and ext4 like concat('%', #{ext4}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by=#{createBy}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateBy != null and updateBy != ''"> and update_by=#{updateBy}</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and create_time <![CDATA[ >= ]]> #{params.beginCreateTime}
</if>
<if test="params.endCreateTime != null and params.endCreateTime != ''">
and create_time <![CDATA[ <= ]]> #{params.endCreateTime}
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (
send_stite_code in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
or
create_site in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
)
</if>
</where>
order by create_time desc
</select>

62
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
View File

@ -53,25 +53,25 @@
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="batchNo != null and batchNo != ''"> and batch_no like concat('%', #{batchNo}, '%')</if>
<if test="batchNo != null and batchNo != ''"> and ( FIND_IN_SET(`batch_no`,#{batchNo}) or batch_no like concat('%', #{batchNo}, '%') )</if>
<if test="batchName != null and batchName != ''"> and batch_name like concat('%', #{batchName}, '%')</if>
<if test="batchDate != null "> and batch_date = #{batchDate}</if>
<if test="transLineType != null and transLineType != ''"> and trans_line_type like concat('%', #{transLineType}, '%')</if>
<if test="productType != null and productType != ''"> and product_type like concat('%', #{productType}, '%')</if>
<if test="batchType != null and batchType != ''"> and batch_type like concat('%', #{batchType}, '%')</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
<if test="startSiteCode != null and startSiteCode != ''"> and start_site_code like concat('%', #{startSiteCode}, '%')</if>
<if test="sendCountry != null and sendCountry != ''"> and send_country like concat('%', #{sendCountry}, '%')</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code like concat('%', #{nextSiteCode}, '%')</if>
<if test="airBilllNo != null and airBilllNo != ''"> and air_billl_no like concat('%', #{airBilllNo}, '%')</if>
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
<if test="productType != null and productType != ''"> and product_type=#{productType}</if>
<if test="batchType != null and batchType != ''"> and batch_type=#{batchType}</if>
<if test="transType != null and transType != ''"> and trans_type=#{transType}</if>
<if test="startSiteCode != null and startSiteCode != ''"> and start_site_code=#{startSiteCode}</if>
<if test="sendCountry != null and sendCountry != ''"> and send_country=#{sendCountry}</if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and next_site_code=#{nextSiteCode}</if>
<if test="airBilllNo != null and airBilllNo != ''"> and air_billl_no=#{airBilllNo}</if>
<if test="etd != null "> and etd = #{etd}</if>
<if test="eta != null "> and eta = #{eta}</if>
<if test="packNum != null "> and pack_num = #{packNum}</if>
<if test="carNo != null and carNo != ''"> and car_no like concat('%', #{carNo}, '%')</if>
<if test="shipNo != null and shipNo != ''"> and ship_no like concat('%', #{shipNo}, '%')</if>
<if test="clearanceResStatus != null and clearanceResStatus != ''"> and clearance_res_status like concat('%', #{clearanceResStatus}, '%')</if>
<if test="declareResStatus != null and declareResStatus != ''"> and declare_res_status like concat('%', #{declareResStatus}, '%')</if>
<if test="destCountry != null and destCountry != ''"> and dest_country like concat('%', #{destCountry}, '%')</if>
<if test="carNo != null and carNo != ''"> and car_no=#{carNo}</if>
<if test="shipNo != null and shipNo != ''"> and ship_no=#{shipNo}</if>
<if test="clearanceResStatus != null and clearanceResStatus != ''"> and clearance_res_status= #{clearanceResStatus}</if>
<if test="declareResStatus != null and declareResStatus != ''"> and declare_res_status=#{declareResStatus}</if>
<if test="destCountry != null and destCountry != ''"> and dest_country=#{destCountry}</if>
<if test="destCountryName != null and destCountryName != ''"> and dest_country_name like concat('%', #{destCountryName}, '%')</if>
<if test="totalParcelQty != null "> and total_parcel_qty = #{totalParcelQty}</if>
<if test="totalWaybillQty != null "> and total_waybill_qty = #{totalWaybillQty}</if>
@ -85,8 +85,38 @@
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and create_time <![CDATA[ >= ]]> #{params.beginCreateTime}
</if>
<if test="params.endCreateTime != null and params.endCreateTime != ''">
and create_time <![CDATA[ <= ]]> #{params.endCreateTime}
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (
start_site_code in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
or
create_site in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
)
</if>
</where>
order by create_time desc
</select>

3
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -568,6 +568,9 @@
<if test="params.isNeedPack != null and params.isNeedPack == 1">
and a.bill_code not in( select etp.bill_code from emis_tms_pack_dtl etp where etp.del_flag='0' )
and a.trans_line_type in(
select line_code from emis_trans_line etl where etl.trans_type=1
)
and a.bl_is_question = '0'
</if>