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-09-30 16:43:19 +08:00
parent 41a3514456
commit da0ab9820f
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -340,22 +340,6 @@ public class EmisBaseService {
int statType_3_num=0;
int statType_4_num=0;
// List<Map> dbStatMapList = emisWaybillMapper.getWaybillStatMap(emisWaybill);
// if(!CollectionUtils.isEmpty(dbStatMapList)){
// for (Map objMap:dbStatMapList) {
// String waybillStatus= MapUtils.getString(objMap,"waybillStatus",null);
// int cnt= MapUtils.getIntValue(objMap,"cnt",0);
// if(WaybillStatus.INIT.statusCode.equals(waybillStatus)){
//
// waitDoNum=waitDoNum+cnt;
// statType_1_num=statType_1_num+cnt;
// }else{
// statType_2_num=statType_1_num+cnt;
// hasDoNum=hasDoNum+cnt;
// }
//
// }
// }
List<Map> dbStatMapList = emisWaybillMapper.getWaybillStatMap(emisWaybill);
if(!CollectionUtils.isEmpty(dbStatMapList)){
Map item0=dbStatMapList.get(0);

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

@ -1879,59 +1879,6 @@
</select>
<!-- where take_piece_employee_code is not null-->
<select id="getWaybillStatMap_old" parameterType="EmisWaybill" resultType="Map">
select a.waybill_status as waybillStatus,count(1) as cnt from emis_waybill a
<where>
a.del_flag='0'
<if test="id != null "> and a.id = #{id}</if>
<if test="orderSn != null and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or 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="sendSiteCode != null and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginSendDate}
</if>
<if test="params.endSendDate != null and params.endSendDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endSendDate}
</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and a.create_time <![CDATA[ >= ]]> #{params.beginCreateTime}
</if>
<if test="params.endCreateTime != null and params.endCreateTime != ''">
and a.create_time <![CDATA[ <= ]]> #{params.endCreateTime}
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (
a.send_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
a.dispatch_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 a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}
)
</if>
</where>
group by a.waybill_status
</select>
<select id="getWaybillStatMap" parameterType="EmisWaybill" resultType="Map">
select tba.waitGotCount,tbb.hasDoCount,tbc.hasCancelCount from (
select count(1) as waitGotCount
@ -2671,7 +2618,6 @@
<!-- 分配取件员 -->
<update id="assignTakeMan" parameterType="EmisWaybill">
update emis_waybill set
order_status = '3',
take_piece_employee_code = #{takePieceEmployeeCode}
<if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
<if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>