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-14 10:48:12 +08:00
parent bed570773c
commit 7148100d4c
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-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
View File

@ -68,7 +68,7 @@ public class EmisWaybillAttachmentController extends EmisBaseController
/** /**
* 查询运单附件列表 * 查询运单附件列表
*/ */
@PreAuthorize("@ss.hasPermi('emis:emisWaybillAttachment:list')") // @PreAuthorize("@ss.hasPermi('emis:emisWaybillAttachment:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(EmisWaybillAttachment emisWaybillAttachment) public TableDataInfo list(EmisWaybillAttachment emisWaybillAttachment)
{ {

4
emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java
View File

@ -142,8 +142,8 @@ public class Kd100Helper {
// emisTmsTransferTrace.setTransferExpress("shunfeng"); // emisTmsTransferTrace.setTransferExpress("shunfeng");
// emisTmsTransferTrace = queryTmsTransferTraceByKd100(emisTmsTransferTrace); // emisTmsTransferTrace = queryTmsTransferTraceByKd100(emisTmsTransferTrace);
String str=queryTraceByMainNoAndCom("SF1532297522428","shunfeng"); String str=queryTraceByMainNoAndCom("T7080300003681","探路速运");
System.out.println(str);
List<EmisTmsScanRecord> list=cvtTraceToScanRecord("12321",str); List<EmisTmsScanRecord> list=cvtTraceToScanRecord("12321",str);
System.out.println(JSON.toJSONString(list)); System.out.println(JSON.toJSONString(list));
} catch (Exception e) { } catch (Exception e) {

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

@ -272,7 +272,7 @@
<if test="parentSiteCode != null and parentSiteCode != ''"> <if test="parentSiteCode != null and parentSiteCode != ''">
<choose> <choose>
<!-- 子网点 --> <!-- 子网点 -->
<when test="params.blIncludeChildSite != null and params.blIncludeChildSite == 1"> <when test="params.blIncludeChildSite != null and params.blIncludeChildSite == '1'">
AND site_code in ( AND site_code in (
SELECT t1.site_code FROM ( SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=