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 15:34:44 +08:00
parent 972c7b38f5
commit f2668259a3
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -529,6 +529,9 @@ public class EmisCommonController extends EmisBaseController
rstMap.put("sendCountry",sendCountry);
rstMap.put("receiveCountry",receiveCountry);
// sendCountry -- 发件国二字码
// receiveCountry -- 收件国二字码
rstMap.put("billCode",mainNo);
List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang);
rstMap.put("steps",stepList);

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

@ -339,22 +339,22 @@ 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)){
// 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> statNumList = new ArrayList<>();
// statType 1

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

@ -494,7 +494,7 @@
<select id="selectWaitGotOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillVo"/>
<where>
a.del_flag='0' and a.order_type='0' and a.waybill_status='0' and a.order_status='0'
a.del_flag='0' and a.order_type='0' and a.waybill_status='0' and a.order_status in('0','2')
<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>