wlxxpt / Message-parsing · 提交

转到一个项目

作者 朱兆平
提交 aa4b8b0bc6f575920635bbcb5ea9adb312adb2c7 1 个父辈 e1bb7125

进出港数据统计服务

内嵌 并排对比
正在显示 13 个修改的文件 包含 307 行增加 和 10 行删除
@@ -16,7 +16,7 @@ spring: @@ -16,7 +16,7 @@ spring:
16 static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path} 16 static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
17 17
18 application: 18 application:
19 - name: changeManifestInfomation 19 + name: analysis-nmms
20 20
21 jackson: 21 jackson:
22 serialization: 22 serialization:
@@ -86,7 +86,8 @@ eureka: @@ -86,7 +86,8 @@ eureka:
86 client: 86 client:
87 #eureka注册中心服务器地址 87 #eureka注册中心服务器地址
88 service-url: 88 service-url:
89 - defaultZone: http://10.50.3.82:19527/eureka/ 89 +# defaultZone: http://10.50.3.82:19527/eureka/
  90 + defaultZone: http://192.168.1.53:12345/eureka/
90 registry-fetch-interval-seconds: 30 91 registry-fetch-interval-seconds: 30
91 lease-renewal-interval-in-seconds: 15 92 lease-renewal-interval-in-seconds: 15
92 lease-expiration-duration-in-seconds: 45 93 lease-expiration-duration-in-seconds: 45
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> 25 <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
26 <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息--> 26 <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
27 <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> 27 <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
28 - <level>trace</level> 28 + <level>debug</level>
29 </filter> 29 </filter>
30 <encoder> 30 <encoder>
31 <Pattern>${CONSOLE_LOG_PATTERN}</Pattern> 31 <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
@@ -172,8 +172,7 @@ @@ -172,8 +172,7 @@
172 172
173 <!--开发环境:打印控制台--> 173 <!--开发环境:打印控制台-->
174 <springProfile name="dev"> 174 <springProfile name="dev">
175 - <logger name="org.springframework.boot" level="trace"/>  
176 - <logger name="org.apache.tomcat" level="info" /> 175 + <logger name="org.springframework.boot" level="info"/>
177 <logger name="com.tianbo.imfClient.dao" level="DEBUG" /> 176 <logger name="com.tianbo.imfClient.dao" level="DEBUG" />
178 <root level="INFO"> 177 <root level="INFO">
179 <appender-ref ref="CONSOLE" /> 178 <appender-ref ref="CONSOLE" />
@@ -186,7 +185,7 @@ @@ -186,7 +185,7 @@
186 185
187 <!--生产环境:输出到文件--> 186 <!--生产环境:输出到文件-->
188 <springProfile name="pro"> 187 <springProfile name="pro">
189 - <logger name="org.springframework.boot" level="trace"/> 188 + <logger name="org.springframework.boot" level="info"/>
190 <logger name="com.tianbo.imfClient.dao" level="DEBUG" /> 189 <logger name="com.tianbo.imfClient.dao" level="DEBUG" />
191 <root level="info"> 190 <root level="info">
192 <appender-ref ref="CONSOLE" /> 191 <appender-ref ref="CONSOLE" />
@@ -81,6 +81,7 @@ @@ -81,6 +81,7 @@
81 <artifactId>ojdbc6</artifactId> 81 <artifactId>ojdbc6</artifactId>
82 <version>11.2.0.4.0-atlassian-hosted</version> 82 <version>11.2.0.4.0-atlassian-hosted</version>
83 </dependency> 83 </dependency>
  84 +
84 <!--util依赖--> 85 <!--util依赖-->
85 <dependency> 86 <dependency>
86 <groupId>com.tianbo</groupId> 87 <groupId>com.tianbo</groupId>
@@ -8,4 +8,6 @@ @@ -8,4 +8,6 @@
8 * 目前提供的接口有 8 * 目前提供的接口有
9 * 更新航班日期 9 * 更新航班日期
10 * 更新分单运抵状态重发分单 10 * 更新分单运抵状态重发分单
11 - * 查询运单回执信息,包括运单发送的报文ID  
  11 + * 查询运单回执信息,包括运单发送的报文ID
  12 +
  13 +* 新舱单接口服务
@@ -21,7 +21,6 @@ import org.springframework.web.client.RestTemplate; @@ -21,7 +21,6 @@ import org.springframework.web.client.RestTemplate;
21 @EnableDiscoveryClient 21 @EnableDiscoveryClient
22 @EnableTransactionManagement 22 @EnableTransactionManagement
23 @MapperScan("com.tianbo.imfClient.dao") 23 @MapperScan("com.tianbo.imfClient.dao")
24 -@ComponentScan({"com.tianbo.imfClient"})  
25 public class ImfClientApplication { 24 public class ImfClientApplication {
26 25
27 public static void main(String[] args) { 26 public static void main(String[] args) {
  1 +package com.tianbo.imfClient.controller;
  2 +
  3 +import com.tianbo.imfClient.dao.AGENTSTATISTICSMapper;
  4 +import com.tianbo.imfClient.dao.ARRIVEDSECONDARYMapper;
  5 +import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER;
  6 +import com.tianbo.imfClient.model.ResultJson;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.web.bind.annotation.*;
  9 +
  10 +import java.util.HashMap;
  11 +import java.util.List;
  12 +import java.util.Map;
  13 +
  14 +/**
  15 + * 出港运抵服务接口
  16 + */
  17 +@RestController
  18 +@RequestMapping("/agent")
  19 +public class AgentController {
  20 +
  21 + @Autowired
  22 + private AGENTSTATISTICSMapper agentstatisticsMapper;
  23 + /**
  24 + * 查询统计出港业务数据接口
  25 + */
  26 + @GetMapping("/analysis")
  27 + public ResultJson analysis(@RequestParam(value = "startdate",required = true) String startdate,
  28 + @RequestParam(value = "enddate",required = true) String enddate){
  29 +
  30 + Map map = new HashMap();
  31 + map.put("startdate",startdate);
  32 + map.put("enddate",enddate);
  33 + List<ORIGINMANIFESTMASTER> list = agentstatisticsMapper.statistics(map);
  34 +
  35 + return new ResultJson("200","success",list);
  36 + }
  37 +}
  1 +package com.tianbo.imfClient.controller;
  2 +
  3 +import com.tianbo.imfClient.dao.ORIGINMANIFESTMASTERMapper;
  4 +import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER;
  5 +import com.tianbo.imfClient.model.ResultJson;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +import org.springframework.web.bind.annotation.GetMapping;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.bind.annotation.RequestParam;
  10 +import org.springframework.web.bind.annotation.RestController;
  11 +
  12 +import java.util.HashMap;
  13 +import java.util.List;
  14 +import java.util.Map;
  15 +
  16 +/**
  17 + * 出港运抵服务接口
  18 + */
  19 +@RestController
  20 +@RequestMapping("/nmmsAnalysis")
  21 +public class NmmsAnalysisController {
  22 +
  23 + @Autowired
  24 + private ORIGINMANIFESTMASTERMapper mapper;
  25 + /**
  26 + * 查询统计出港业务数据接口
  27 + */
  28 + @GetMapping("/analysis")
  29 + public ResultJson analysis(@RequestParam(value = "startdate",required = true) String startdate,
  30 + @RequestParam(value = "enddate",required = true) String enddate){
  31 +
  32 + Map map = new HashMap();
  33 + map.put("startdate",startdate);
  34 + map.put("enddate",enddate);
  35 + List<ORIGINMANIFESTMASTER> list = mapper.analysis(map);
  36 +
  37 + return new ResultJson("200","success",list);
  38 + }
  39 +}
  1 +package com.tianbo.imfClient.dao;
  2 +
  3 +import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER;
  4 +
  5 +import javax.annotation.Resource;
  6 +import java.util.HashMap;
  7 +import java.util.List;
  8 +import java.util.Map;
  9 +
  10 +@Resource
  11 +public interface AGENTSTATISTICSMapper {
  12 + List<ORIGINMANIFESTMASTER> statistics(Map map);
  13 +}
@@ -3,8 +3,13 @@ package com.tianbo.imfClient.dao; @@ -3,8 +3,13 @@ package com.tianbo.imfClient.dao;
3 import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER; 3 import com.tianbo.imfClient.model.ORIGINMANIFESTMASTER;
4 4
5 import java.util.HashMap; 5 import java.util.HashMap;
  6 +import java.util.List;
  7 +import java.util.Map;
6 8
7 public interface ORIGINMANIFESTMASTERMapper { 9 public interface ORIGINMANIFESTMASTERMapper {
  10 +
  11 + List<ORIGINMANIFESTMASTER> analysis(Map map);
  12 +
8 int insert(ORIGINMANIFESTMASTER record); 13 int insert(ORIGINMANIFESTMASTER record);
9 14
10 int insertSelective(ORIGINMANIFESTMASTER record); 15 int insertSelective(ORIGINMANIFESTMASTER record);
  1 +package com.tianbo.imfClient.model;
  2 +
  3 +import lombok.Data;
  4 +
  5 +@Data
  6 +public class AnalysisBaseModel {
  7 +
  8 + private String chinesedescription;
  9 + private String destinationstationcn;
  10 + private String countrydescchn;
  11 + private String areadescchn;
  12 + private String waybillnosecondary;
  13 +
  14 +
  15 +}
@@ -2,7 +2,7 @@ package com.tianbo.imfClient.model; @@ -2,7 +2,7 @@ package com.tianbo.imfClient.model;
2 2
3 import java.util.Date; 3 import java.util.Date;
4 4
5 -public class ORIGINMANIFESTMASTER { 5 +public class ORIGINMANIFESTMASTER extends AnalysisBaseModel{
6 private String autoid; 6 private String autoid;
7 7
8 private String waybillnomaster; 8 private String waybillnomaster;
@@ -442,4 +442,5 @@ public class ORIGINMANIFESTMASTER { @@ -442,4 +442,5 @@ public class ORIGINMANIFESTMASTER {
442 public void setConsigneePhone(String consigneePhone) { 442 public void setConsigneePhone(String consigneePhone) {
443 this.consigneePhone = consigneePhone == null ? null : consigneePhone.trim(); 443 this.consigneePhone = consigneePhone == null ? null : consigneePhone.trim();
444 } 444 }
445 -}  
  445 +}
  446 +
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
  3 +<mapper namespace="com.tianbo.imfClient.dao.AGENTSTATISTICSMapper" >
  4 + <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" >
  5 + <result column="运单号" property="autoid" jdbcType="VARCHAR" />
  6 + <result column="航空托运人名称" property="waybillnomaster" jdbcType="VARCHAR" />
  7 + <result column="航空销售代理人名称" property="segment" jdbcType="VARCHAR" />
  8 + <result column="航协编号" property="originatingstation" jdbcType="VARCHAR" />
  9 + <result column="航空公司运输证明" property="destinationstation" jdbcType="VARCHAR" />
  10 + <result column="运输条件鉴定书" property="totalweight" jdbcType="VARCHAR" />
  11 + <result column="承运人" property="totalpiece" jdbcType="VARCHAR" />
  12 + <result column="航班号" property="manifesttotalpiece" jdbcType="VARCHAR" />
  13 + <result column="航班日期" property="manifesttotalweight" jdbcType="VARCHAR" />
  14 + <result column="航班起始站" property="flightno" jdbcType="VARCHAR" />
  15 + <result column="航班目的站" property="productname" jdbcType="VARCHAR" />
  16 + <result column="运单件数" property="customsstatus" jdbcType="VARCHAR" />
  17 + <result column="运单重量" property="carrier1" jdbcType="VARCHAR" />
  18 + <result column="操作时间" property="arrivalstation1" jdbcType="VARCHAR" />
  19 + <result column="关区" property="carrier2" jdbcType="VARCHAR" />
  20 + <result column="预配品名" property="arrivalstation2" jdbcType="VARCHAR" />
  21 + <result column="收货人公司" property="carrier3" jdbcType="VARCHAR" />
  22 + <result column="收货人地址" property="arrivalstation3" jdbcType="VARCHAR" />
  23 + <result column="收货人城市" property="paymode" jdbcType="VARCHAR" />
  24 + <result column="收货人国家" property="specialgoodscode" jdbcType="VARCHAR" />
  25 + <result column="收货人电话" property="customscode" jdbcType="VARCHAR" />
  26 + <result column="收货人名称" property="shippername" jdbcType="VARCHAR" />
  27 + <result column="发货人名称" property="shipperaddress" jdbcType="VARCHAR" />
  28 + <result column="发货人地址" property="consigneename" jdbcType="VARCHAR" />
  29 + <result column="发货人城市" property="consigneeaddress" jdbcType="VARCHAR" />
  30 + <result column="发货人国家" property="receiptinformation" jdbcType="VARCHAR" />
  31 + <result column="发货人电话" property="specificConsigneePhone" jdbcType="VARCHAR" />
  32 + <result column="发货人名称" property="consigneePhone" jdbcType="VARCHAR" />
  33 + <result column="海关回执状态" property="status" jdbcType="VARCHAR" />
  34 + <result column="海关回执信息" property="isbatch" jdbcType="VARCHAR" />
  35 + <result column="发货人编码" property="originatingstationBill" jdbcType="VARCHAR" />
  36 + <result column="收货人编码" property="destinationstationBill" jdbcType="VARCHAR" />
  37 + <result column="货物品名" property="reportorder" jdbcType="VARCHAR" />
  38 + <result column="二级类名称" property="islast" jdbcType="VARCHAR" />
  39 + <result column="一级类名称" property="shipperCode" jdbcType="VARCHAR" />
  40 + <result column="代理人三字码" property="shipperCountrycode" jdbcType="VARCHAR" />
  41 + <result column="代理人全称" property="shipperPhone" jdbcType="VARCHAR" />
  42 + <result column="代理人类别" property="shipperFax" jdbcType="VARCHAR" />
  43 + <result column="代理联系人" property="consigneeCode" jdbcType="VARCHAR" />
  44 + <result column="代理联系人电话" property="consigneeCountrycode" jdbcType="VARCHAR" />
  45 + </resultMap>
  46 +
  47 +
  48 + <select id="statistics" resultMap="BaseResultMap" parameterType="java.util.Map">
  49 +SELECT
  50 + SD.SD_WAYBILL "运单号",
  51 + SD.SD_CARGO_SHIPPER_NAME "航空托运人名称" ,
  52 + SD.SD_CARGO_AGENT_NAME "航空销售代理人名称",
  53 + SD.SD_IATA_NUMBER "航协编号 ",
  54 + SD.SD_TRANSPORT_CERTIFICATE "航空公司运输证明",
  55 + SD.SD_TRANSPORTATION_PROVE "运输条件鉴定书",
  56 + MF.CARRIER "承运人",
  57 + MF.FLIGHTNO "航班号",
  58 + MF.FLIGHTDATE "航班日期",
  59 + MF.ORIGINATINGSTATION "航班起始站",
  60 + MF.DESTINATIONSTATION "航班目的站",
  61 + MF.TOTALPIECE "运单件数",
  62 + MF.TOTALWEIGHT "运单重量",
  63 + MF.STOWAGEDATE "操作时间",
  64 + MF.CUSTOMSCODE "关区",
  65 + MF.PRODUCTNAME "预配品名",
  66 + MF.SH_COMPANY "收货人公司",
  67 + MF.SH_ADDRESS "收货人地址",
  68 + MF.SH_CITY "收货人城市",
  69 + MF.SH_COUNTRY "收货人国家",
  70 + MF.SH_TELEPHONE "收货人电话",
  71 + MF.SH_NAME "收货人名称",
  72 + MF.CO_COMPANY "发货人名称",
  73 + MF.CO_ADDRESS "发货人地址",
  74 + MF.CO_CITY "发货人城市",
  75 + MF.CO_COUNTRY "发货人国家",
  76 + MF.CO_TELEPHONE "发货人电话",
  77 + MF.CO_NAME "发货人名称",
  78 + MF.RESPONSE_CODE "海关回执状态",
  79 + MF.RESPONSE_TEXT "海关回执信息",
  80 + MF.SHPCUSID "发货人编码",
  81 + MF.CNECUSID "收货人编码",
  82 + SCN.SD_CARGO_NAME "货物品名",
  83 + twoType.TWO_TYPE_NAME "二级类名称",
  84 + bigType.TYPE_NAME "一级类名称",
  85 + HSI.FOR_SHORT "代理人三字码",
  86 + HSI.FULL_NAME "代理人全称",
  87 + HSI.THE_SHIPPER_TYPE "代理人类别",
  88 + HSI.CONTACTS "代理联系人",
  89 + HSI.PHONE "代理联系人电话"
  90 +FROM
  91 + SECURITY_DECLARATION SD
  92 + LEFT JOIN MANIFEST MF ON MF.WAYBILLNOMASTER = SD.SD_WAYBILL
  93 + LEFT JOIN SD_CARGO_NAME SCN ON SCN.SD_WAYBILL = SD.SD_WAYBILL
  94 + LEFT JOIN SD_TWO_TYPE twoType ON twoType.CARGO_NAME = SCN.SD_CARGO_NAME
  95 + LEFT JOIN SD_BIG_TYPE bigType on bigType.ID = twoType.BIG_TYPE_ID
  96 + LEFT JOIN HZ_WAYBILL_INFO HWI ON hwi.WAYBILL_ID = MF.WAYBILLNOMASTER
  97 + LEFT JOIN HZ_SHIPPER_INFORMATION HSI ON HWI.HZINFOR_ID = HSI.ID
  98 +WHERE
  99 + trunc( MF.FLIGHTDATE ) BETWEEN to_date( #{startdate,jdbcType=VARCHAR}, 'yyyy-mm-dd' )
  100 + AND to_date(#{enddate,jdbcType=VARCHAR},'yyyy-mm-dd')
  101 + ORDER BY MF.FLIGHTDATE
  102 + </select>
  103 +</mapper>
@@ -4,9 +4,12 @@ @@ -4,9 +4,12 @@
4 <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" > 4 <resultMap id="BaseResultMap" type="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" >
5 <result column="AUTOID" property="autoid" jdbcType="VARCHAR" /> 5 <result column="AUTOID" property="autoid" jdbcType="VARCHAR" />
6 <result column="WAYBILLNOMASTER" property="waybillnomaster" jdbcType="VARCHAR" /> 6 <result column="WAYBILLNOMASTER" property="waybillnomaster" jdbcType="VARCHAR" />
  7 + <result column="WAYBILLNOSECONDARY" property="waybillnosecondary" jdbcType="VARCHAR" />
7 <result column="SEGMENT" property="segment" jdbcType="VARCHAR" /> 8 <result column="SEGMENT" property="segment" jdbcType="VARCHAR" />
8 <result column="ORIGINATINGSTATION" property="originatingstation" jdbcType="VARCHAR" /> 9 <result column="ORIGINATINGSTATION" property="originatingstation" jdbcType="VARCHAR" />
  10 + <result column="ORIGINATINGSTATIONCN" property="chinesedescription" jdbcType="VARCHAR" />
9 <result column="DESTINATIONSTATION" property="destinationstation" jdbcType="VARCHAR" /> 11 <result column="DESTINATIONSTATION" property="destinationstation" jdbcType="VARCHAR" />
  12 + <result column="DESTINATIONSTATIONCN" property="destinationstationcn" jdbcType="VARCHAR" />
10 <result column="TOTALWEIGHT" property="totalweight" jdbcType="VARCHAR" /> 13 <result column="TOTALWEIGHT" property="totalweight" jdbcType="VARCHAR" />
11 <result column="TOTALPIECE" property="totalpiece" jdbcType="VARCHAR" /> 14 <result column="TOTALPIECE" property="totalpiece" jdbcType="VARCHAR" />
12 <result column="MANIFESTTOTALPIECE" property="manifesttotalpiece" jdbcType="VARCHAR" /> 15 <result column="MANIFESTTOTALPIECE" property="manifesttotalpiece" jdbcType="VARCHAR" />
@@ -46,7 +49,86 @@ @@ -46,7 +49,86 @@
46 <result column="SPECIFIC_CONSIGNEENAME" property="specificConsigneename" jdbcType="VARCHAR" /> 49 <result column="SPECIFIC_CONSIGNEENAME" property="specificConsigneename" jdbcType="VARCHAR" />
47 <result column="SPECIFIC_CONSIGNEE_PHONE" property="specificConsigneePhone" jdbcType="VARCHAR" /> 50 <result column="SPECIFIC_CONSIGNEE_PHONE" property="specificConsigneePhone" jdbcType="VARCHAR" />
48 <result column="CONSIGNEE_PHONE" property="consigneePhone" jdbcType="VARCHAR" /> 51 <result column="CONSIGNEE_PHONE" property="consigneePhone" jdbcType="VARCHAR" />
  52 + <result column="COUNTRYDESCCHN" property="countrydescchn" jdbcType="VARCHAR" />
  53 + <result column="AREADESCCHN" property="areadescchn" jdbcType="VARCHAR" />
49 </resultMap> 54 </resultMap>
  55 +
  56 + <select id="analysis" resultMap="BaseResultMap" parameterType="java.util.Map">
  57 +SELECT
  58 + T.FLIGHTNO,
  59 + T.FLIGHT_DATE,
  60 + T.SEGMENT,
  61 + T.WAYBILLNOMASTER,
  62 + T.WAYBILLNOSECONDARY,
  63 + T.TOTALPIECE,
  64 + T.TOTALWEIGHT,
  65 + T.MANIFESTTOTALPIECE,
  66 + T.MANIFESTTOTALWEIGHT,
  67 + T.PRODUCTNAME,
  68 + T.ORIGINATINGSTATION,
  69 + C.CHINESEDESCRIPTION as ORIGINATINGSTATIONCN,
  70 + T.DESTINATIONSTATION,
  71 + C1.CHINESEDESCRIPTION AS DESTINATIONSTATIONCN,
  72 + T.SHIPPER_COUNTRYCODE,
  73 + COUNTRY.COUNTRYDESCCHN,
  74 + AREA.AREADESCCHN
  75 +FROM
  76 + (
  77 + SELECT
  78 + M.FLIGHTNO AS FLIGHTNO,
  79 + M.FLIGHT_DATE AS FLIGHT_DATE,
  80 + M.SEGMENT AS SEGMENT,
  81 + M.WAYBILLNOMASTER AS WAYBILLNOMASTER,
  82 + '' AS WAYBILLNOSECONDARY,
  83 + M.TOTALPIECE AS TOTALPIECE,
  84 + M.TOTALWEIGHT AS TOTALWEIGHT,
  85 + M.MANIFESTTOTALPIECE AS MANIFESTTOTALPIECE,
  86 + M.MANIFESTTOTALWEIGHT AS MANIFESTTOTALWEIGHT,
  87 + M.PRODUCTNAME AS PRODUCTNAME,
  88 + M.ORIGINATINGSTATION AS ORIGINATINGSTATION,
  89 + M.DESTINATIONSTATION AS DESTINATIONSTATION,
  90 + M.SHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE
  91 + FROM
  92 + ORIGINMANIFESTMASTER M UNION
  93 + SELECT
  94 + awbh.FLIGHTNO AS FLIGHTNO,
  95 + awbh.FLIGHT_DATE AS FLIGHT_DATE,
  96 + awbh.SEGMENT AS SEGMENT,
  97 + awbh.WAYBILLNOMASTER AS WAYBILLNOMASTER,
  98 + awbh.WAYBILLNOSECONDARY AS WAYBILLNOSECONDARY,
  99 + awbh.PIECE AS TOTALPIECE,
  100 + awbh.WEIGHT AS TOTALWEIGHT,
  101 + awbh.MANIFESTPIECE AS MANIFESTTOTALPIECE,
  102 + awbh.MANIFESTWEIGHT AS MANIFESTTOTALWEIGHT,
  103 + awbh.AWBHPRODUCTNAME AS PRODUCTNAME,
  104 + awbh.ORIGINATINGSTATION AS ORIGINATINGSTATION,
  105 + awbh.DESTINATIONSTATION AS DESTINATIONSTATION,
  106 + awbh.AWBHSHIPPER_COUNTRYCODE AS SHIPPER_COUNTRYCODE
  107 + FROM
  108 + V_AWBA_AWBH awbh
  109 + ) T
  110 +LEFT JOIN
  111 + TB_AIRPORTCODE C
  112 +ON
  113 + C.CITYCODE = T.ORIGINATINGSTATION
  114 +LEFT JOIN
  115 + TB_AIRPORTCODE C1
  116 + ON
  117 + C1.CITYCODE = T.DESTINATIONSTATION
  118 +LEFT JOIN
  119 + T_BAS_COUNTRY COUNTRY
  120 + ON
  121 + COUNTRY.COUNTRYID = T.SHIPPER_COUNTRYCODE
  122 +LEFT JOIN
  123 + T_BAS_AREA AREA
  124 + ON
  125 + C.AREA = AREA.AREAID
  126 + WHERE
  127 + trunc( T.FLIGHT_DATE ) BETWEEN to_date( #{startdate,jdbcType=VARCHAR}, 'yyyy-mm-dd' )
  128 + AND to_date(#{enddate,jdbcType=VARCHAR},'yyyy-mm-dd')
  129 + ORDER BY T.FLIGHT_DATE,T.FLIGHTNO,WAYBILLNOMASTER,WAYBILLNOSECONDARY DESC
  130 +
  131 + </select>
50 <insert id="insert" parameterType="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" > 132 <insert id="insert" parameterType="com.tianbo.imfClient.model.ORIGINMANIFESTMASTER" >
51 insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT, 133 insert into ORIGINMANIFESTMASTER (AUTOID, WAYBILLNOMASTER, SEGMENT,
52 ORIGINATINGSTATION, DESTINATIONSTATION, 134 ORIGINATINGSTATION, DESTINATIONSTATION,