修改

src/main/java/com/steerinfo/dil/controller/TmstrainLoadingResultController.java

@@ -347,7 +347,20 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
         return success(result);
     }
 
-    @ApiOperation(value = "国产矿物流新增装车")
+    @ApiOperation(value = "进口矿导入")
+    @PostMapping(value = "/importImportedLoadResult")
+    public RESTfulResult importImportedLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        List<Map<String,Object>> result=null;
+        try{
+            result=tmstrainLoadingResultService.importImportedLoadResult(mapValue);
+        }catch (Exception e){
+            return failed(e.getMessage());
+        }
+        return success(result);
+    }
+
+
+    @ApiOperation(value = "国产矿新增/海港-老区轨道衡新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
     public RESTfulResult addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
         int result=0;

src/main/java/com/steerinfo/dil/model/TmstrainLoadingResult.java

@@ -117,9 +117,9 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     private String insertUpdateRemark;
 
     /**
-     * 是否删除（0:是, 1:已装车  2：已卸车）(DELETED,DECIMAL,0)
+     * 是否删除（0:正常, 1:已删除  2：已卸车）(DELETED,DECIMAL,0)
      */
-    @ApiModelProperty(value="是否删除（0:是, 1:已装车  2：已卸车）",required=false)
+    @ApiModelProperty(value="是否删除（0:正常, 1:已删除  2：已卸车）",required=false)
     private BigDecimal deleted;
 
     /**
@@ -182,6 +182,12 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="到货日期",required=false)
     private String arrivalDate;
 
+    /**
+     * 分组编号(GROUP_NO,DECIMAL,0)
+     */
+    @ApiModelProperty(value="分组编号",required=false)
+    private BigDecimal groupNo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -426,6 +432,14 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         this.arrivalDate = arrivalDate == null ? null : arrivalDate.trim();
     }
 
+    public BigDecimal getGroupNo() {
+        return groupNo;
+    }
+
+    public void setGroupNo(BigDecimal groupNo) {
+        this.groupNo = groupNo;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -461,6 +475,7 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         sb.append(", sendDate=").append(sendDate);
         sb.append(", tempResultId=").append(tempResultId);
         sb.append(", arrivalDate=").append(arrivalDate);
+        sb.append(", groupNo=").append(groupNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/ITmstrainLoadingResultService.java

@@ -53,6 +53,9 @@ public interface ITmstrainLoadingResultService{
     //国产矿导入
     List<Map<String, Object>> importDomesticLoadResult(Map<String, Object> mapValue);
 
+    //进口矿导入
+    List<Map<String, Object>> importImportedLoadResult(Map<String, Object> mapValue);
+
     //添加国产矿装车实绩
     int addDomesticLoadResult(Map<String, Object> mapValue) throws Exception;
 

src/main/java/com/steerinfo/dil/service/impl/TmstrainLoadingResultServiceImpl.java

@@ -105,7 +105,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     /**
-     * 进口矿新增装车实绩
+     * 进口矿新增装车实绩海港
      * @param mapValue
      * @return
      */
@@ -165,6 +165,8 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
 //            result.setResultIsclear(mapValue.get("resultIsclear").toString());
 //            result.setResultClass(mapValue.get("resultClass").toString());
             result.setResultRemarks((String) mapValue.get("resultRemarks"));//备注
+            result.setSendDate((String) map.get("sendDate"));//发货日期
+            result.setArrivalDate((String) map.get("arrivalDate"));//到货日期
             result.setResultWagonNo(map.get("wagonNo").toString());//车皮号
             //添加常规字段
             addRegularField(result,userId);
@@ -259,7 +261,66 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     /**
-     * 国产矿新增
+     * 进口矿导入，返回配单信息
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> importImportedLoadResult(Map<String, Object> mapValue) {
+        System.out.println("导入Excel：");
+        System.out.println(mapValue);
+        List<Map<String, Object>> list= (List<Map<String, Object>>) mapValue.get("list");
+        //获取分隔符
+        List<String> splits=tmstrainLoadingResultMapper.findSplitsForImported();
+        for(Map<String, Object> map:list){
+            //配单
+            List<Map<String,Object>> orderList= tmstrainLoadingResultMapper.getPurchaseOrderListForImported(map);
+            if(orderList.size() > 1){
+                //查询结果大于1，重新查询
+                String productName=map.get("productName").toString();
+                for(String split:splits){
+                    String arr[]=productName.split(split);// “ || ”
+                    if(arr.length>1){
+                        //切割成功,退出
+                        map.put("resultForeignShipName",arr[1]);
+                        break;
+                    }
+                    System.out.println("切割后的数组：");
+                    System.out.println(arr);
+                }
+                orderList= tmstrainLoadingResultMapper.getPurchaseOrderListForImported(map);
+                System.out.println("切割后数组");
+            }
+            if(orderList.size() == 1){
+                //只有采购订单唯一才配单，其他一律原样返回
+                Map<String,Object> details=orderList.get(0);
+                String purchaseOrderNo=(String) details.get("purchaseOrderNo");
+                String materialName=(String)details.get("materialName");
+                String resultForeignShipName=(String)details.get("resultForeignShipName");
+                String supplierName=(String)details.get("supplierName");
+                BigDecimal purchaseOrderId=DataChange.dataToBigDecimal(details.get("purchaseOrderId"));
+                BigDecimal materialId=DataChange.dataToBigDecimal(details.get("materialId"));
+                BigDecimal supplierId=DataChange.dataToBigDecimal(details.get("supplierId"));
+                BigDecimal batchId=DataChange.dataToBigDecimal(details.get("batchId"));
+                map.put("purchaseOrderNo",purchaseOrderNo);
+                map.put("materialName",materialName);
+                map.put("resultForeignShipName",resultForeignShipName);
+                map.put("supplierName",supplierName);
+                map.put("purchaseOrderId",purchaseOrderId);
+                map.put("materialId",materialId);
+                map.put("supplierId",supplierId);
+                map.put("batchId",batchId);
+            }else{
+                map.put("purchaseOrderNo","请手动选择采购订单");
+            }
+        }
+        System.out.println("返回配单数据：");
+        System.out.println(list);
+        return list;
+    }
+
+    /**
+     * 国产矿新增，海港-老区轨道衡新增
      * @param mapValue
      * @return
      */
@@ -300,7 +361,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             result.setBatchId(batchId);
             result.setArrivalStationId(new BigDecimal(map.get("arrivalStationId").toString()));//到站
             result.setResultLoadingDate(new Date((Long)map.get("resultLoadingDate")));//装车日期
-            result.setResultType(new BigDecimal(map.get("resultType").toString()));//装车类型,国产矿应该为3
+            result.setResultType(new BigDecimal(map.get("resultType").toString()));//装车类型
             result.setResultRemarks((String) map.get("resultRemarks"));//备注
             result.setResultWagonNo(map.get("wagonNo").toString());//车皮号
             //发货日期
@@ -309,6 +370,8 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             //到货日期
             String arriveDate =(String) map.get("arrivalDate");
             result.setArrivalDate(arriveDate);
+            //分组编号
+            result.setGroupNo(DataChange.dataToBigDecimal(map.get("groupNo")));
             //取得发站名，查询是否存在该站台，如果存在则绑定，否则新增该站台再绑定
             String sendStationName=(String) map.get("sendStation");//发站名
             if(sendStationName!=null){
@@ -931,7 +994,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         return tmstrainLoadingResultMapper.getResultType(map);
     }
 
-    //新增万州港-达州
+    //进口矿新增万州港-达州
     @Override
     public int addShipLoadResult(Map<String, Object> map) {
         //用户id
@@ -952,6 +1015,9 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             BigDecimal supplierUnitId = DataChange.dataToBigDecimal(map1.get("supplierUnitId"));
             BigDecimal resultId = tmstrainLoadingTempMapper.selectMaxId();
             String wgonNo1 =(String) map1.get("wagonNo");
+            String sendDate=(String) map1.get("sendDate");//发货日期
+            String arrivalDate=(String) map1.get("arrivalDate");//到货日期
+            BigDecimal groupNo=DataChange.dataToBigDecimal(map1.get("groupNo"));//分组编号
             //生成装车实绩
             TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
             //生成主键id
@@ -967,17 +1033,23 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             if (remarks!=null) {
                 tmstrainLoadingResult.setResultRemarks(remarks);
             }
+            if(arrivalStationId!=null && arrivalStationId.intValue() == 1){
+                tmstrainLoadingResult.setTrainCalculateId(new BigDecimal(13)); //设置计量衡为 铁专线（老区）
+                tmstrainLoadingResult.setSendRequest(new BigDecimal(1));
+            }
             tmstrainLoadingResult.setMaterialId(materialId);
             tmstrainLoadingResult.setSendUnitId(supplierUnitId);
             tmstrainLoadingResult.setTempResultId(tempResultId);
             tmstrainLoadingResult.setSendStationId(sendStationId);
-
             tmstrainLoadingResult.setArrivalStationId(arrivalStationId);
             tmstrainLoadingResult.setResultType(resultType);
             tmstrainLoadingResult.setDeleted(new BigDecimal(0));
             tmstrainLoadingResult.setInsertUsername(userId);
             tmstrainLoadingResult.setInsertTime(new Date());
             tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(calculateWagonWeight(wgonNo1)));
+            tmstrainLoadingResult.setSendDate(sendDate);
+            tmstrainLoadingResult.setArrivalDate(arrivalDate);
+            tmstrainLoadingResult.setGroupNo(groupNo);
             String arrivalName = tmstrainLoadingResultMapper.getArrivalName(arrivalStationId);
             if (arrivalName.contains("达州站")){
                 tmstrainLoadingResult.setSendRequest(new BigDecimal(1));

src/main/java/com/steerinfo/dil/service/impl/TmstrainMeasureCommissionServiceImpl.java

@@ -82,14 +82,12 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         measureCommission.remove("resultTotalId");
         //发送计量委托,成功返回1，失败返回0
         int i = sendMesToMeasure(measureCommission);
-
         System.out.println(measureCommission);
         if(i == 1){
             //添加计量委托实绩
             addMeasureCommission(map);
             updateTrainLoadResult(map);
         }
-        System.out.println(measureCommission);
         return 1;
     }
 

src/main/resources/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.xml

@@ -31,6 +31,7 @@
     <result column="SEND_DATE" jdbcType="VARCHAR" property="sendDate" />
     <result column="TEMP_RESULT_ID" jdbcType="DECIMAL" property="tempResultId" />
     <result column="ARRIVAL_DATE" jdbcType="VARCHAR" property="arrivalDate" />
+    <result column="GROUP_NO" jdbcType="DECIMAL" property="groupNo" />
   </resultMap>
   <sql id="columns">
     RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID, RESULT_WAGON_NO, RESULT_BILLABLE_TONNAGE,
@@ -38,7 +39,7 @@
     BATCH_ID, RESULT_CLASS, RESULT_LOADING_DATE, RESULT_REMARKS, INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID,
     RESULT_TYPE, TRAIN_CALCULATE_ID, UNLOADING_POINT_ID, SEND_UNIT_ID, SEND_REQUEST,
-    SEND_DATE, TEMP_RESULT_ID, ARRIVAL_DATE
+    SEND_DATE, TEMP_RESULT_ID, ARRIVAL_DATE, GROUP_NO
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.PURCHASE_ORDER_RAIL_PLAN_ID, t.RESULT_WAGON_NO, t.RESULT_BILLABLE_TONNAGE,
@@ -46,7 +47,7 @@
     t.BATCH_ID, t.RESULT_CLASS, t.RESULT_LOADING_DATE, t.RESULT_REMARKS, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
     t.SEND_STATION_ID, t.ARRIVAL_STATION_ID, t.RESULT_TYPE, t.TRAIN_CALCULATE_ID, t.UNLOADING_POINT_ID,
-    t.SEND_UNIT_ID, t.SEND_REQUEST, t.SEND_DATE, t.TEMP_RESULT_ID, t.ARRIVAL_DATE
+    t.SEND_UNIT_ID, t.SEND_REQUEST, t.SEND_DATE, t.TEMP_RESULT_ID, t.ARRIVAL_DATE, t.GROUP_NO
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRAIN_LOADING_RESULT
@@ -143,6 +144,9 @@
       <if test="arrivalDate != null and arrivalDate != ''">
         and ARRIVAL_DATE = #{arrivalDate}
       </if>
+      <if test="groupNo != null">
+        and GROUP_NO = #{groupNo}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -234,9 +238,12 @@
       <if test="arrivalDate != null and arrivalDate != ''">
         and ARRIVAL_DATE LIKE '%${arrivalDate}%'
       </if>
+      <if test="groupNo != null">
+        and GROUP_NO = #{groupNo}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
     delete from TMSTRAIN_LOADING_RESULT
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </delete>
@@ -327,6 +334,9 @@
     <if test="arrivalDate != null and arrivalDate != ''">
       or ARRIVAL_DATE = #{arrivalDate}
     </if>
+    <if test="groupNo != null">
+      or GROUP_NO = #{groupNo}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT (RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID,
@@ -338,8 +348,8 @@
                                          INSERT_UPDATE_REMARK, DELETED, SEND_STATION_ID,
                                          ARRIVAL_STATION_ID, RESULT_TYPE, TRAIN_CALCULATE_ID,
                                          UNLOADING_POINT_ID, SEND_UNIT_ID, SEND_REQUEST,
-                                         SEND_DATE, TEMP_RESULT_ID, ARRIVAL_DATE
-    )
+                                         SEND_DATE, TEMP_RESULT_ID, ARRIVAL_DATE,
+                                         GROUP_NO)
     values (#{resultId,jdbcType=DECIMAL}, #{purchaseOrderRailPlanId,jdbcType=DECIMAL},
             #{resultWagonNo,jdbcType=VARCHAR}, #{resultBillableTonnage,jdbcType=DECIMAL}, #{resultIsclear,jdbcType=VARCHAR},
             #{capacityId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{resultMaterialNumber,jdbcType=DECIMAL},
@@ -349,8 +359,8 @@
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{sendStationId,jdbcType=DECIMAL},
             #{arrivalStationId,jdbcType=DECIMAL}, #{resultType,jdbcType=DECIMAL}, #{trainCalculateId,jdbcType=DECIMAL},
             #{unloadingPointId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL}, #{sendRequest,jdbcType=DECIMAL},
-            #{sendDate,jdbcType=VARCHAR}, #{tempResultId,jdbcType=DECIMAL}, #{arrivalDate,jdbcType=VARCHAR}
-           )
+            #{sendDate,jdbcType=VARCHAR}, #{tempResultId,jdbcType=DECIMAL}, #{arrivalDate,jdbcType=VARCHAR},
+            #{groupNo,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT
@@ -442,6 +452,9 @@
       <if test="arrivalDate != null">
         ARRIVAL_DATE,
       </if>
+      <if test="groupNo != null">
+        GROUP_NO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -531,6 +544,9 @@
       <if test="arrivalDate != null">
         #{arrivalDate,jdbcType=VARCHAR},
       </if>
+      <if test="groupNo != null">
+        #{groupNo,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -562,7 +578,8 @@
         SEND_REQUEST = #{sendRequest,jdbcType=DECIMAL},
         SEND_DATE = #{sendDate,jdbcType=VARCHAR},
         TEMP_RESULT_ID = #{tempResultId,jdbcType=DECIMAL},
-        ARRIVAL_DATE = #{arrivalDate,jdbcType=VARCHAR}
+        ARRIVAL_DATE = #{arrivalDate,jdbcType=VARCHAR},
+        GROUP_NO = #{groupNo,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -652,10 +669,13 @@
       <if test="arrivalDate != null">
         ARRIVAL_DATE = #{arrivalDate,jdbcType=VARCHAR},
       </if>
+      <if test="groupNo != null">
+        GROUP_NO = #{groupNo,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
     <include refid="select" />
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>
@@ -682,7 +702,7 @@
     RESULT_TYPE, TRAIN_CALCULATE_ID,
     UNLOADING_POINT_ID, SEND_UNIT_ID,
     SEND_REQUEST, SEND_DATE, TEMP_RESULT_ID,
-    ARRIVAL_DATE)
+    ARRIVAL_DATE, GROUP_NO)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -698,7 +718,7 @@
     #{item.resultType,jdbcType=DECIMAL}, #{item.trainCalculateId,jdbcType=DECIMAL},
     #{item.unloadingPointId,jdbcType=DECIMAL}, #{item.sendUnitId,jdbcType=DECIMAL},
     #{item.sendRequest,jdbcType=DECIMAL}, #{item.sendDate,jdbcType=VARCHAR}, #{item.tempResultId,jdbcType=DECIMAL},
-    #{item.arrivalDate,jdbcType=VARCHAR} from dual
+    #{item.arrivalDate,jdbcType=VARCHAR}, #{item.groupNo,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -820,6 +840,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.arrivalDate,jdbcType=VARCHAR}
     </foreach>
+    ,GROUP_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.groupNo,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.resultId,jdbcType=DECIMAL}
@@ -1616,7 +1640,9 @@
     and db.RESULT_FOREIGN_SHIP_NAME is not null
     and rsu.SUPPLIER_NAME is not null
     <if test="materialName != null and materialName!=''.toString()" >
-      and  rm.MATERIAL_NAME like concat(concat('%',#{materialName}),'%')
+      and (rm.MATERIAL_NAME like concat(concat('%',#{materialName}),'%')
+      or apo.PURCHASE_ORDER_NO like concat(concat('%',#{materialName}),'%')
+      )
     </if>
     <if test="resultForeignShipName != null and resultForeignShipName!=''.toString()">
       and db.RESULT_FOREIGN_SHIP_NAME like concat(concat('%',#{resultForeignShipName}),'%')

src/main/resources/com/steerinfo/dil/mapper/TmstrainMeasureCommissionMapper.xml

@@ -343,39 +343,43 @@
 
 <!--  查询车皮计量委托 -->
   <select id="getTrainMeasureCommission" parameterType="map" resultType="java.util.Map">
-    select
-      APO.PURCHASE_ORDER_NO   "purchaseOrder",
-      TLR.RESULT_WAGON_NO      "carNum",
-      RS.SUPPLIER_NAME            "sendUnit",
-      RSH.SHIPPER_NAME            "ReceivUnit",
-      RM.MATERIAL_NAME            "materiaName",
-      RM.MATERIAL_ID              "materialId",
-      CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
-      RW.WAREHOUSE_NAME           "unloadPlace",
-      TLR.INSERT_UPDATE_REMARK    "demo",
-      DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
-      TLR.UNLOADING_POINT_ID "unloadPointId",
-      TTR.TOTAL_RESULT_ID          "resultTotalId",
-      TTR.TRANSPORT_NUM  "transportNum",
-      APO.SUPPLIER_SCREEN_INFO "supplierScreenInfo",
-      TLR.SEND_DATE "sendDate",
-      TLR.ARRIVAL_DATE "arrivalDate",
-      TLR.RESULT_BILLABLE_TONNAGE "standardWeight"
-    from TMSTRAIN_LOADING_RESULT TLR
-           left join AMS_PURCHASE_ORDER APO
-                     on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
-           left join DIL_BATCH DB
-                     on DB.BATCH_ID = APO.BATCH_ID
-           left join RMS_SUPPLIER RS
-                     on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-           left join RMS_SHIPPER RSH
-                     on RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
-           left join RMS_MATERIAL RM
-                     on RM.MATERIAL_ID = DB.MATERIAL_ID
-           left join RMS_WAREHOUSE RW
-                     on RW.WAREHOUSE_ID = TLR.UNLOADING_POINT_ID
-           left join TMSTRAIN_TOTAL_RESULT TTR
-                     on TTR.LOADING_ID = TLR.RESULT_ID
+      select
+          APO.PURCHASE_ORDER_NO   "purchaseOrder",
+          TLR.RESULT_WAGON_NO      "carNum",
+          RS.SUPPLIER_NAME            "sendUnit",
+          RSH.SHIPPER_NAME            "ReceivUnit",
+          RM.MATERIAL_NAME            "materiaName",
+          RM.MATERIAL_ID              "materialId",
+          CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
+          RW.WAREHOUSE_NAME           "unloadPlace",
+          TLR.INSERT_UPDATE_REMARK    "demo",
+          DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
+          TLR.UNLOADING_POINT_ID "unloadPointId",
+          TTR.TOTAL_RESULT_ID          "resultTotalId",
+          TTR.TRANSPORT_NUM  "transportNum",
+          APO.SUPPLIER_SCREEN_INFO "supplierScreenInfo",
+          TLR.SEND_DATE "sendDate",
+          TLR.ARRIVAL_DATE "arrivalDate",
+          TLR.RESULT_BILLABLE_TONNAGE "standardWeight",
+			TLR.GROUP_NO "groupNo",
+			RAS.ARRIVAL_NAME "sendStation"
+      from TMSTRAIN_LOADING_RESULT TLR
+          left join AMS_PURCHASE_ORDER APO
+      on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
+          left join DIL_BATCH DB
+          on DB.BATCH_ID = APO.BATCH_ID
+          left join RMS_SUPPLIER RS
+          on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+          left join RMS_SHIPPER RSH
+          on RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+          left join RMS_MATERIAL RM
+          on RM.MATERIAL_ID = DB.MATERIAL_ID
+          left join RMS_WAREHOUSE RW
+          on RW.WAREHOUSE_ID = TLR.UNLOADING_POINT_ID
+          left join TMSTRAIN_TOTAL_RESULT TTR
+          on TTR.LOADING_ID = TLR.RESULT_ID
+          left join RMSTRAIN_ARRIVAL_SEND RAS
+          on RAS.ARRIVAL_ID = TLR.SEND_STATION_ID
     where TLR.RESULT_ID = #{resultId}
   </select>