合并采购进口矿火运

pom.xml

@@ -111,11 +111,11 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                                                <table>AMS_PURCHASE_ORDER</table><!--采购订单-->
-                        <!--                        <table>AMSTRAIN_WAGON_PLEASE</table>&lt;!&ndash;请车作业&ndash;&gt;-->
+<!--                                                <table>AMS_PURCHASE_ORDER</table>&lt;!&ndash;采购订单&ndash;&gt;-->
+<!--                                                <table>TMSTRAIN_PLEASE_APPROVE_RESULT</table>&lt;!&ndash;请车作业&ndash;&gt;-->
 <!--                                                <table>TMSTRAIN_WAGON_LOAD_RESULT</table>&lt;!&ndash;车皮装车作业&ndash;&gt;-->
                                                 <table>TMSTRAIN_LOADING_RESULT</table><!--车皮装车作业-->
-<!--                                                <table>TMSTRAIN_WAGON_UNLOAD_RESULT</table>&lt;!&ndash;车皮卸车作业&ndash;&gt;-->
+                                                <table>TMSTRAIN_WAGON_UNLOAD_RESULT</table><!--车皮卸车作业-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -54,8 +54,9 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     public RESTfulResult getTmstrainWagonLoad(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize){
-
+                                              Integer pageSize,
+                                              Integer resultType){
+        mapValue.put("resultType", resultType);
         List<Map<String, Object>> tmstrainWagonLoad = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> tmstrainWagonLoad1 = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
@@ -167,9 +168,9 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
      * @return
      */
     @ApiOperation(value="获取装车车皮号")
-    @GetMapping(value = "/getWagonNo")
-    public RESTfulResult getWagonNo(){
-        return success(tmstrainLoadingResultService.getWagonNo());
+    @GetMapping(value = "/getWagonNo/{resultType}")
+    public RESTfulResult getWagonNo(@PathVariable("resultType") Integer resultType){
+        return success(tmstrainLoadingResultService.getWagonNo(resultType));
     }
 
 

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

@@ -57,11 +57,10 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer status){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
+                                           Integer status,
+                                           Integer resultType){
         mapValue.put("status", status);
+        mapValue.put("resultType", resultType);
         //不分页筛选数据
         List<Map<String, Object>> wagonPleaseTotal = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -172,7 +171,9 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
     public RESTfulResult getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize){
+                                           Integer pageSize,
+                                                  Integer resultType){
+        mapValue.put("resultType", resultType);
         //不分页筛选数据
         List<Map<String, Object>> wagonPleaseTotal = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
         PageHelper.startPage(pageNum,pageSize);

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

@@ -56,8 +56,10 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
     public RESTfulResult getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize){
+                                              Integer pageSize,
+                                              Integer resultType){
 
+        mapValue.put("resultType", resultType);
         List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
@@ -91,14 +93,8 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
     })
     @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
     public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult,Integer orderType){
-        int i=0;
-        int i1=0;
-        if (orderType==3){
-               i = tmstrainWagonUnloadResultService.addTmstrainWagonLoadResult(tmstrainWagonUnloadResult);
-        }else if (orderType==4){
-               i1=tmstrainWagonUnloadResultService.addTmstrainWagonLoadResultForConverted(tmstrainWagonUnloadResult);
-        }
-        return success(i+i1);
+        tmstrainWagonUnloadResultService.insertTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
+        return success();
     }
 
     /**
@@ -172,14 +168,8 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
     public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId,Integer orderType){
-        List<Map<String, Object>> tmstrainWagonUnLoadResultByUnLoadingId=null;
-        List<Map<String, Object>> UnLoadResultByUnLoadingId=null;
-        if (orderType==3) {
-             tmstrainWagonUnLoadResultByUnLoadingId = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
-        }else if (orderType==4){
-            UnLoadResultByUnLoadingId=tmstrainWagonUnloadResultService.selectUnloadByLoadingId(unloadingId);
-        }
-        return success();
+        List<Map<String, Object>> mes = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
+        return success(mes);
     }
    //********内转物流展示卸车实绩**************************************
    @ApiOperation(value="查询卸车作业信息")

src/main/java/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.java

@@ -29,7 +29,7 @@ public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoading
     //获得批次ID
     List<Map<String, Object>> getBatchId();
     //获得装车车皮号
-    List<Map<String, Object>> getWagonNo();
+    List<Map<String, Object>> getWagonNo(Integer resultType);
     //获得要渲染的数据
     List<Map<String, Object>> selectByResultId(BigDecimal ResultId);
     //通过发站ID查询所属港口ID

src/main/java/com/steerinfo/dil/mapper/TmstrainPleaseApproveResultMapper.java

@@ -12,7 +12,7 @@ import java.util.Map;
 
 @Mapper
 public interface TmstrainPleaseApproveResultMapper extends IBaseMapper<TmstrainPleaseApproveResult, BigDecimal> {
-    //查询所有已下发的请车作业 状态码为 0
+    //查询所有的请车作业 状态码为 0
     List<Map<String, Object>> getAllWagonPlease(Map<String, Object> mapValue);
 
     //通过Id查询请车作业

src/main/java/com/steerinfo/dil/mapper/TmstrainWagonUnloadResultMapper.java

@@ -26,10 +26,10 @@ public interface TmstrainWagonUnloadResultMapper extends IBaseMapper<TmstrainWag
     List<Map<String, Object>> getUnloadingRouteName();
     //获得要渲染的数据
     List<Map<String, Object>> selectByUnLoadingId(BigDecimal unloadingId);
+
     //内转物流查询卸车实绩
     List<Map<String,Object>> selectWagonUnLoadResult(Map<String,Object> map);
-    //内转物流通过id渲染数据
-    List<Map<String,Object>> selectUnloadByLoadingId(BigDecimal UnloadingId);
+
     //内转物流查询火车卸货实绩
     List<Map<String,Object>> getTrainResult(Map<String,Object> map);
 }

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

@@ -3,19 +3,20 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="车皮装车作业")
 public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(RESULT_ID,DECIMAL,38)
+     * 主键ID(RESULT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal resultId;
 
     /**
-     * 采购订单ID/发运计划ID(PURCHASE_ORDER_RAIL_PLAN_ID,DECIMAL,38)
+     * 采购订单ID/发运计划ID(PURCHASE_ORDER_RAIL_PLAN_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="采购订单ID/发运计划ID",required=false)
     private BigDecimal purchaseOrderRailPlanId;
@@ -39,19 +40,19 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     private String resultIsclear;
 
     /**
-     * 运力ID（汽车车牌号）(CAPACITY_ID,DECIMAL,38)
+     * 运力ID（汽车车牌号）(CAPACITY_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="运力ID（汽车车牌号）",required=false)
     private BigDecimal capacityId;
 
     /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="物资ID",required=false)
     private BigDecimal materialId;
 
     /**
-     * 钢材件数(RESULT_MATERIAL_NUMBER,DECIMAL,38)
+     * 钢材件数(RESULT_MATERIAL_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="钢材件数",required=false)
     private BigDecimal resultMaterialNumber;
@@ -63,7 +64,7 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     private BigDecimal resultMaterialTheoryweight;
 
     /**
-     * 批次ID(BATCH_ID,DECIMAL,38)
+     * 批次ID(BATCH_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="批次ID",required=false)
     private BigDecimal batchId;
@@ -134,6 +135,12 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="到站ID",required=false)
     private BigDecimal arrivalStationId;
 
+    /**
+     * 装车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）2：采购进口矿（海港-老区轨道衡）3：采购国产矿 4：内转(RESULT_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）2：采购进口矿（海港-老区轨道衡）3：采购国产矿 4：内转",required=false)
+    private BigDecimal resultType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -314,6 +321,14 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         this.arrivalStationId = arrivalStationId;
     }
 
+    public BigDecimal getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(BigDecimal resultType) {
+        this.resultType = resultType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -341,6 +356,7 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", sendStationId=").append(sendStationId);
         sb.append(", arrivalStationId=").append(arrivalStationId);
+        sb.append(", resultType=").append(resultType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -10,13 +10,13 @@ import java.util.Date;
 @ApiModel(value="请车/批车作业")
 public class TmstrainPleaseApproveResult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(RESULT_ID,DECIMAL,38)
+     * 主键ID(RESULT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal resultId;
 
     /**
-     * 发运计划ID(RAIL_PLAN_ID,DECIMAL,38)
+     * 发运计划ID(RAIL_PLAN_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="发运计划ID",required=false)
     private BigDecimal railPlanId;
@@ -40,25 +40,25 @@ public class TmstrainPleaseApproveResult implements IBasePO<BigDecimal> {
     private String resultCategory;
 
     /**
-     * 发货单位ID（资源管理托运人）(SHIPPER_ID,DECIMAL,38)
+     * 发货单位ID（资源管理托运人）(SHIPPER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="发货单位ID（资源管理托运人）",required=false)
     private BigDecimal shipperId;
 
     /**
-     * 发站ID(SEND_STATION_ID,DECIMAL,38)
+     * 发站ID(SEND_STATION_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="发站ID",required=false)
     private BigDecimal sendStationId;
 
     /**
-     * 到站ID(TO_THE_STATION_ID,DECIMAL,38)
+     * 到站ID(TO_THE_STATION_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="到站ID",required=false)
     private BigDecimal toTheStationId;
 
     /**
-     * 请车数(RESULT_PLEASE_NUMBER,DECIMAL,38)
+     * 请车数(RESULT_PLEASE_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="请车数",required=false)
     private BigDecimal resultPleaseNumber;
@@ -70,7 +70,7 @@ public class TmstrainPleaseApproveResult implements IBasePO<BigDecimal> {
     private Date resultPleaseDate;
 
     /**
-     * 批车数(RESULT_APPROVE_NUMBER,DECIMAL,38)
+     * 批车数(RESULT_APPROVE_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="批车数",required=false)
     private BigDecimal resultApproveNumber;
@@ -112,11 +112,17 @@ public class TmstrainPleaseApproveResult implements IBasePO<BigDecimal> {
     private String insertUpdateRemark;
 
     /**
-     * 状态：0未下发 1已下发 2已批车 3逻辑删除(STATUS,DECIMAL,38)
+     * 状态：0未下发 1已下发 2已批车 3逻辑删除(STATUS,DECIMAL,0)
      */
     @ApiModelProperty(value="状态：0未下发 1已下发 2已批车 3逻辑删除",required=false)
     private BigDecimal status;
 
+    /**
+     * 请车批车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）3：采购国产矿  4：内转钢材到异地库(RESULT_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="请车批车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）3：采购国产矿  4：内转钢材到异地库",required=false)
+    private BigDecimal resultType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -273,6 +279,14 @@ public class TmstrainPleaseApproveResult implements IBasePO<BigDecimal> {
         this.status = status;
     }
 
+    public BigDecimal getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(BigDecimal resultType) {
+        this.resultType = resultType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -297,6 +311,7 @@ public class TmstrainPleaseApproveResult implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", status=").append(status);
+        sb.append(", resultType=").append(resultType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1,273 +0,0 @@
-package com.steerinfo.dil.model;
-
-import com.steerinfo.framework.model.IBasePO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel(value="车皮装车作业")
-public class TmstrainWagonLoadResult implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(LOADING_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal loadingId;
-
-    /**
-     * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="采购订单ID",required=false)
-    private BigDecimal purchaseOrderId;
-
-    /**
-     * 车皮号(WAGON_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="车皮号",required=false)
-    private String wagonNo;
-
-    /**
-     * 计费吨位(LOADING_BILLABLE_TONNAGE,DECIMAL,0)
-     */
-    @ApiModelProperty(value="计费吨位",required=false)
-    private Short loadingBillableTonnage;
-
-    /**
-     * 班别（0:白班，1：夜班）(RESULT_CLASS,VARCHAR,20)
-     */
-    @ApiModelProperty(value="班别（0:白班，1：夜班）",required=false)
-    private String resultClass;
-
-    /**
-     * 装车时间(LOADING_WAGON_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="装车时间",required=false)
-    private Date loadingWagonTime;
-
-    /**
-     * 备注(LOADING_REMARK,VARCHAR,20)
-     */
-    @ApiModelProperty(value="备注",required=false)
-    private String loadingRemark;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    /**
-     * 品名(PRODUCT_NAME,VARCHAR,36)
-     */
-    @ApiModelProperty(value="品名",required=false)
-    private String productName;
-
-    /**
-     * 发站ID(SEND_STATION_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="发站ID",required=false)
-    private Short sendStationId;
-
-    /**
-     * 到站ID(ARRIVAL_STATION_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="到站ID",required=false)
-    private Short arrivalStationId;
-
-    /**
-     * 是否删除(DELETED,DECIMAL,0)
-     */
-    @ApiModelProperty(value="是否删除",required=false)
-    private Short deleted;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.loadingId;
-    }
-
-    @Override
-    public void setId(BigDecimal loadingId) {
-        this.loadingId = loadingId;
-    }
-
-    public BigDecimal getLoadingId() {
-        return loadingId;
-    }
-
-    public void setLoadingId(BigDecimal loadingId) {
-        this.loadingId = loadingId;
-    }
-
-    public BigDecimal getPurchaseOrderId() {
-        return purchaseOrderId;
-    }
-
-    public void setPurchaseOrderId(BigDecimal purchaseOrderId) {
-        this.purchaseOrderId = purchaseOrderId;
-    }
-
-    public String getWagonNo() {
-        return wagonNo;
-    }
-
-    public void setWagonNo(String wagonNo) {
-        this.wagonNo = wagonNo == null ? null : wagonNo.trim();
-    }
-
-    public Short getLoadingBillableTonnage() {
-        return loadingBillableTonnage;
-    }
-
-    public void setLoadingBillableTonnage(Short loadingBillableTonnage) {
-        this.loadingBillableTonnage = loadingBillableTonnage;
-    }
-
-    public String getResultClass() {
-        return resultClass;
-    }
-
-    public void setResultClass(String resultClass) {
-        this.resultClass = resultClass == null ? null : resultClass.trim();
-    }
-
-    public Date getLoadingWagonTime() {
-        return loadingWagonTime;
-    }
-
-    public void setLoadingWagonTime(Date loadingWagonTime) {
-        this.loadingWagonTime = loadingWagonTime;
-    }
-
-    public String getLoadingRemark() {
-        return loadingRemark;
-    }
-
-    public void setLoadingRemark(String loadingRemark) {
-        this.loadingRemark = loadingRemark == null ? null : loadingRemark.trim();
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getInsertUpdateRemark() {
-        return insertUpdateRemark;
-    }
-
-    public void setInsertUpdateRemark(String insertUpdateRemark) {
-        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName == null ? null : productName.trim();
-    }
-
-    public Short getSendStationId() {
-        return sendStationId;
-    }
-
-    public void setSendStationId(Short sendStationId) {
-        this.sendStationId = sendStationId;
-    }
-
-    public Short getArrivalStationId() {
-        return arrivalStationId;
-    }
-
-    public void setArrivalStationId(Short arrivalStationId) {
-        this.arrivalStationId = arrivalStationId;
-    }
-
-    public Short getDeleted() {
-        return deleted;
-    }
-
-    public void setDeleted(Short deleted) {
-        this.deleted = deleted;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", loadingId=").append(loadingId);
-        sb.append(", purchaseOrderId=").append(purchaseOrderId);
-        sb.append(", wagonNo=").append(wagonNo);
-        sb.append(", loadingBillableTonnage=").append(loadingBillableTonnage);
-        sb.append(", resultClass=").append(resultClass);
-        sb.append(", loadingWagonTime=").append(loadingWagonTime);
-        sb.append(", loadingRemark=").append(loadingRemark);
-        sb.append(", insertUsername=").append(insertUsername);
-        sb.append(", insertTime=").append(insertTime);
-        sb.append(", updateUsername=").append(updateUsername);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
-        sb.append(", productName=").append(productName);
-        sb.append(", sendStationId=").append(sendStationId);
-        sb.append(", arrivalStationId=").append(arrivalStationId);
-        sb.append(", deleted=").append(deleted);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -3,19 +3,20 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="车皮卸车作业")
 public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(UNLOADING_ID,DECIMAL,38)
+     * 主键ID(UNLOADING_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal unloadingId;
 
     /**
-     * 采购订单ID/发运计划ID(PURCHASE_ORDER_RAIL_PLAN_ID,DECIMAL,38)
+     * 采购订单ID/发运计划ID(PURCHASE_ORDER_RAIL_PLAN_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="采购订单ID/发运计划ID",required=false)
     private BigDecimal purchaseOrderRailPlanId;
@@ -39,7 +40,7 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
     private Date resultUnloadTime;
 
     /**
-     * 卸车地点(UNLOADING_POINT_ID,DECIMAL,38)
+     * 卸车地点(UNLOADING_POINT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="卸车地点",required=false)
     private BigDecimal unloadingPointId;
@@ -98,6 +99,12 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否删除（0:否, 1:是）",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 卸车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）2：采购进口矿（海港-老区轨道衡）3：采购国产矿 4：内转(RESULT_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸车类型：1：采购进口矿（万州港-达州站/万州港-老区轨道衡）2：采购进口矿（海港-老区轨道衡）3：采购国产矿 4：内转",required=false)
+    private BigDecimal resultType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -230,6 +237,14 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public BigDecimal getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(BigDecimal resultType) {
+        this.resultType = resultType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -251,6 +266,7 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", resultType=").append(resultType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -1,8 +1,6 @@
 package com.steerinfo.dil.service;
 
 import com.steerinfo.dil.model.TmstrainLoadingResult;
-import com.steerinfo.dil.model.TmstrainWagonLoadResult;
-import com.steerinfo.framework.service.IBaseService;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -33,7 +31,7 @@ public interface ITmstrainLoadingResultService{
     //获得批次ID
     List<Map<String, Object>> getBatchId();
     //获得装车车皮号
-    List<Map<String, Object>> getWagonNo();
+    List<Map<String, Object>> getWagonNo(Integer resultType);
     //通过主键获得车皮装车信息
     List<Map<String, Object>> getTmstrainLoadingResultByResultId(BigDecimal resultId);
     //修改车皮装车作业实绩

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

@@ -25,8 +25,10 @@ public interface ITmstrainWagonUnloadResultService{
     List<Map<String, Object>> getTmstrainWagonUnLoad(Map<String,Object> map);
     //通过主键删除车皮卸车作业实绩
     int deleteTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId);
-    //新增车皮卸车作业实绩
-    int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
+
+    //新增车皮卸车实绩
+    int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
+
     //修改车皮装车作业实绩
     int updateTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
     //查询火运实绩
@@ -37,12 +39,13 @@ public interface ITmstrainWagonUnloadResultService{
     List<Map<String, Object>> getUnloadingRouteName();
     //通过主键获取车皮卸车信息
     List<Map<String, Object>> getTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId);
+
     //内转物流新增卸车实绩
-    int addTmstrainWagonLoadResultForConverted(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
+//    int addTmstrainWagonLoadResultForConverted(TmstrainWagonUnloadResult tmstrainWagonUnloadResult);
+
     //内转物流查询卸车实绩
     List<Map<String,Object>> selectWagonUnLoadResult(Map<String,Object> map);
-    //内转物流通过id渲染数据
-    List<Map<String,Object>> selectUnloadByLoadingId(BigDecimal UnloadingId);
+
     //内转物流查询火车卸货实绩
     List<Map<String,Object>> getTrainResult(Map<String,Object> map);
 }

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

@@ -38,11 +38,30 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     private WmshBoundFeign wmshBoundFeign;
 
 
+    /**
+     * 查看所有装车实绩
+     * @param map
+     * @return
+     */
     @Override
     public List<Map<String, Object>> getTmstrainWagonLoad(Map<String, Object> map) {
-        return tmstrainLoadingResultMapper.getTmsWagonLoadInfo(map);
+        BigDecimal resultType = DataChange.dataToBigDecimal(map.get("resultType"));
+        switch (resultType.intValue()){
+            case 1:
+            case 2:
+                return tmstrainLoadingResultMapper.getTmsWagonLoadInfo(map);
+            case 3:
+                break;
+            case 4:
+        }
+        return null;
     }
 
+    /**
+     * 新增采购装车实绩
+     * @param tmstrainLoadingResult
+     * @return
+     */
     @Override
     @Transactional
     public int addTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) {
@@ -64,14 +83,16 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         tmstrainLoadingResult.setInsertUpdateRemark("无");
         tmstrainLoadingResult.setDeleted(new BigDecimal(0));
 
-        Map<String, Object> map = new HashMap<>();
-        map.put("isClean",tmstrainLoadingResult.getResultIsclear());
-        map.put("resultTonnage", tmstrainLoadingResult.getResultBillableTonnage());
-        map.put("batchId", batchId);
-        //通过发站查询发站的所属港口
-        BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
-        map.put("portId", portId);
-        wmshBoundFeign.addResult(map);
+        if(tmstrainLoadingResult.getResultType().intValue() == 1){
+            Map<String, Object> map = new HashMap<>();
+            map.put("isClean",tmstrainLoadingResult.getResultIsclear());
+            map.put("resultTonnage", tmstrainLoadingResult.getResultBillableTonnage());
+            map.put("batchId", batchId);
+            //通过发站查询发站的所属港口
+            BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
+            map.put("portId", portId);
+//        wmshBoundFeign.addResult(map);
+        }
 
         return tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
     }
@@ -87,9 +108,15 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         return tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
     }
 
+    /**
+     * 删除装车作业
+     * @param resultId
+     * @return
+     */
     @Override
     public int deleteTmstrainLoadingResultByResultId(BigDecimal resultId) {
-        TmstrainLoadingResult tmstrainLoadingResult = tmstrainLoadingResultMapper.selectByPrimaryKey(resultId);
+        TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
+        tmstrainLoadingResult.setResultId(resultId);
         tmstrainLoadingResult.setDeleted(new BigDecimal(1));
         return tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
     }
@@ -144,7 +171,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     }
 
     @Override
-    public List<Map<String, Object>> getWagonNo() {
-        return tmstrainLoadingResultMapper.getWagonNo();
+    public List<Map<String, Object>> getWagonNo(Integer resultType) {
+        return tmstrainLoadingResultMapper.getWagonNo(resultType);
     }
 }

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

@@ -33,15 +33,47 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
 
 
     /**
-     * 查询所有未下发请车计划
+     * 查询所有请车计划
+     * 1采购进口矿（万州港-达州站/万州港-老区轨道衡） 2采购进口矿（海港-老区轨道衡） 3采购国产矿  4内转
      * @param mapValue
      * @return
      */
     @Override
     public List<Map<String, Object>> getAllWagonPlease(Map<String, Object> mapValue) {
-        return tmstrainPleaseApproveResultMapper.getAllWagonPlease(mapValue);
+        BigDecimal resultType = DataChange.dataToBigDecimal(mapValue.get("resultType"));
+        switch (resultType.intValue()){
+            case 1:
+                return tmstrainPleaseApproveResultMapper.getAllWagonPlease(mapValue);
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+        }
+        return null;
+    }
+
+    /**
+     * 查询所有批车作业
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllApproveWagonPlease(Map<String, Object> mapValue) {
+        BigDecimal resultType = DataChange.dataToBigDecimal(mapValue.get("resultType"));
+        switch (resultType.intValue()){
+            case 1:
+                return tmstrainPleaseApproveResultMapper.getAllApproveWagonPlease(mapValue);
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+        }
+        return null;
     }
 
+
     /**
      * 获取最大主键ID
      * @return
@@ -67,11 +99,11 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
         //生成请车计划号
         String resultPleasePlanNo;
         if(id >= 100){
-            resultPleasePlanNo = "WQCJH-" + id;
+            resultPleasePlanNo = "WQCJH" + id;
         }else if(id >= 10) {
-            resultPleasePlanNo = "WQCJH-0" + id;
+            resultPleasePlanNo = "WQCJH0" + id;
         }else {
-            resultPleasePlanNo = "WQCJH-00" + id;
+            resultPleasePlanNo = "WQCJH00" + id;
         }
         tmstrainPleaseApproveResult.setResultPleasePlanNo(resultPleasePlanNo);
         //生成请车日期
@@ -89,15 +121,6 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
         return tmstrainPleaseApproveResultMapper.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
     }
 
-    /**
-     * 查询所有批车作业
-     * @param mapValue
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllApproveWagonPlease(Map<String, Object> mapValue) {
-        return tmstrainPleaseApproveResultMapper.getAllApproveWagonPlease(mapValue);
-    }
 
     /**
      * 通过ID查询批车作业
@@ -136,11 +159,11 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
         //生成请车计划号
         String resultPleasePlanNo;
         if(id >= 100){
-            resultPleasePlanNo = "WQCJH-" + id;
+            resultPleasePlanNo = "WQCJH" + id;
         }else if(id >= 10) {
-            resultPleasePlanNo = "WQCJH-0" + id;
+            resultPleasePlanNo = "WQCJH0" + id;
         }else {
-            resultPleasePlanNo = "WQCJH-00" + id;
+            resultPleasePlanNo = "WQCJH00" + id;
         }
         tmstrainPleaseApproveResult.setResultPleasePlanNo(resultPleasePlanNo);
         //新增请车人

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

@@ -32,19 +32,67 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
     @Autowired
     private TmstrainWagonUnloadResultMapper tmstrainWagonUnloadResultMapper;
 
+    /**
+     * 查看所有卸车实绩
+     * 1采购进口矿（万州港-达州站/万州港-老区轨道衡） 2采购进口矿（海港-老区轨道衡） 3采购国产矿  4内转
+     * @param map
+     * @return
+     */
     @Override
     public List<Map<String, Object>> getTmstrainWagonUnLoad(Map<String, Object> map) {
-        return tmstrainWagonUnloadResultMapper.getTmsWagonUnLoadInfo(map);
+        BigDecimal resultType = DataChange.dataToBigDecimal(map.get("resultType"));
+        switch (resultType.intValue()){
+            case 1:
+            case 2:
+                return tmstrainWagonUnloadResultMapper.getTmsWagonUnLoadInfo(map);
+            case 3:
+                break;
+            case 4:
+        }
+        return null;
     }
 
+    /**
+     * 删除卸车实绩
+     * @param unloadingId
+     * @return
+     */
     @Override
     public int deleteTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId) {
-        TmstrainWagonUnloadResult tmstrainWagonUnloadResult = tmstrainWagonUnloadResultMapper.selectByPrimaryKey(unloadingId);
+        TmstrainWagonUnloadResult tmstrainWagonUnloadResult = new TmstrainWagonUnloadResult();
+        tmstrainWagonUnloadResult.setId(unloadingId);
         tmstrainWagonUnloadResult.setDeleted(new BigDecimal(1));
         return tmstrainWagonUnloadResultMapper.updateByPrimaryKeySelective(tmstrainWagonUnloadResult);
     }
 
-    @Override
+    /**
+     * 新增车皮卸车
+     * 1采购进口矿（万州港-达州站/万州港-老区轨道衡） 2采购进口矿（海港-老区轨道衡） 3采购国产矿  4内转
+     * @param tmstrainWagonUnloadResult
+     * @return
+     */
+    public int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult){
+        int i = 0;
+        BigDecimal resultType = tmstrainWagonUnloadResult.getResultType();
+        switch (resultType.intValue()){
+            case 1:
+            case 2:
+                i = addTmstrainWagonLoadResult(tmstrainWagonUnloadResult);
+                break;
+            case 3:
+                break;
+            case 4:
+                i = addTmstrainWagonLoadResultForConverted(tmstrainWagonUnloadResult);
+        }
+        return i;
+    }
+
+    /**
+     * 采购进口矿新增卸车实绩
+     * @param tmstrainWagonUnloadResult
+     * @return
+     */
+
     public int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
         //生成主键id
         tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
@@ -87,14 +135,22 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         return tmstrainWagonUnloadResultMapper.getUnloadingRouteName();
     }
 
+    /**
+     * 通过主键查询信息
+     * @param unloadingId
+     * @return
+     */
     @Override
     public List<Map<String, Object>> getTmstrainWagonUnLoadResultByUnLoadingId(BigDecimal unloadingId) {
         return tmstrainWagonUnloadResultMapper.selectByUnLoadingId(unloadingId);
     }
 
 
-    //内转物流新增卸车实绩
-    @Override
+    /**
+     * 内转物流新增卸车实绩
+     * @param tmstrainWagonUnloadResult
+     * @return
+     */
     public int addTmstrainWagonLoadResultForConverted(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
         //生成主键id
         tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
@@ -116,10 +172,6 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
         return tmstrainWagonUnloadResultMapper.selectWagonUnLoadResult(map);
     }
 
-    @Override
-    public List<Map<String, Object>> selectUnloadByLoadingId(BigDecimal UnloadingId) {
-        return tmstrainWagonUnloadResultMapper.selectUnloadByLoadingId(UnloadingId);
-    }
 
     /**
      * 内转物流展示火车卸货实绩

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.util;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.Map;
 
 public class DataChange {
 
+
     /**
      * 解析前端传来的日期字符串
      * @param vueDate
@@ -95,4 +97,65 @@ public class DataChange {
             }
         }
     }
+
+    /**
+     * 遍历列表使只显示两位小数
+     * @param list
+     * @param key
+     */
+    public static void dataTo2Number(List<Map<String, Object>> list, String ...key){
+        //遍历List
+        for (Map<String, Object> map : list) {
+            for (String s : key) {
+                //修改数据为带两位小数
+                BigDecimal oldDate = (BigDecimal) map.get(s);
+                DecimalFormat df =  new DecimalFormat("0.00");
+                String resultDeduction = df.format(oldDate.doubleValue());
+                map.put(s, resultDeduction);
+            }
+        }
+    }
+
+    /**
+     * 计算相差时间  日时分秒
+     * @param
+     * @return
+     */
+    public static String calculatedTimeDifference(Date time1, Date time2){
+        long t1 = time1.getTime();
+        long t2 = time2.getTime();
+        if(t1 > t2){
+            long temp = t1;
+            t1 = t2;
+            t2 = temp;
+        }
+        long between = t2 - t1;
+        long day = between / (24 * 60 * 60 * 1000);
+        long hour = (between / (60 * 60 * 1000) - day * 24);
+        long min = ((between / (60 * 1000)) - day * 24 * 60 - hour * 60);
+        long s = (between / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+        return day + "天"+  + hour+ "时" + min + "分"  + s + "秒";
+    }
+
+    /**
+     * 生成带时间的八位数顺序号
+     * @param start 前缀
+     * @param id 顺序号  主键Id
+     * @return
+     */
+    public static String generateEightDigitsNumber(String start, Integer id){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
+        sb.append(
+                id < 10
+                        ? "0000000" + id : id < 100
+                        ? "000000" + id : id < 1000
+                        ? "00000" + id : id < 10000
+                        ? "0000" + id : id < 100000
+                        ? "000" + id : id < 1000000
+                        ? "00" + id : id < 10000000
+                        ? "0" + id : id
+        );
+        return sb.toString();
+    }
 }

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

@@ -23,19 +23,21 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="SEND_STATION_ID" jdbcType="DECIMAL" property="sendStationId" />
     <result column="ARRIVAL_STATION_ID" jdbcType="DECIMAL" property="arrivalStationId" />
+    <result column="RESULT_TYPE" jdbcType="DECIMAL" property="resultType" />
   </resultMap>
   <sql id="columns">
     RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID, RESULT_WAGON_NO, RESULT_BILLABLE_TONNAGE, 
     RESULT_ISCLEAR, CAPACITY_ID, MATERIAL_ID, RESULT_MATERIAL_NUMBER, RESULT_MATERIAL_THEORYWEIGHT, 
     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
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID, 
+    RESULT_TYPE
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.PURCHASE_ORDER_RAIL_PLAN_ID, t.RESULT_WAGON_NO, t.RESULT_BILLABLE_TONNAGE, 
     t.RESULT_ISCLEAR, t.CAPACITY_ID, t.MATERIAL_ID, t.RESULT_MATERIAL_NUMBER, t.RESULT_MATERIAL_THEORYWEIGHT, 
     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.SEND_STATION_ID, t.ARRIVAL_STATION_ID, t.RESULT_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM TMSTRAIN_LOADING_RESULT
@@ -108,6 +110,9 @@
       <if test="arrivalStationId != null">
         and ARRIVAL_STATION_ID = #{arrivalStationId}
       </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -175,9 +180,12 @@
       <if test="arrivalStationId != null">
         and ARRIVAL_STATION_ID = #{arrivalStationId}
       </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from TMSTRAIN_LOADING_RESULT
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </delete>
@@ -244,6 +252,9 @@
     <if test="arrivalStationId != null">
       or ARRIVAL_STATION_ID = #{arrivalStationId}
     </if>
+    <if test="resultType != null">
+      or RESULT_TYPE = #{resultType}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT (RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID,
@@ -253,7 +264,7 @@
                                          RESULT_LOADING_DATE, RESULT_REMARKS, INSERT_USERNAME,
                                          INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                          INSERT_UPDATE_REMARK, DELETED, SEND_STATION_ID,
-                                         ARRIVAL_STATION_ID)
+                                         ARRIVAL_STATION_ID, RESULT_TYPE)
     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},
@@ -261,7 +272,7 @@
             #{resultLoadingDate,jdbcType=TIMESTAMP}, #{resultRemarks,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{sendStationId,jdbcType=DECIMAL},
-            #{arrivalStationId,jdbcType=DECIMAL})
+            #{arrivalStationId,jdbcType=DECIMAL}, #{resultType,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT
@@ -329,6 +340,9 @@
       <if test="arrivalStationId != null">
         ARRIVAL_STATION_ID,
       </if>
+      <if test="resultType != null">
+        RESULT_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -394,6 +408,9 @@
       <if test="arrivalStationId != null">
         #{arrivalStationId,jdbcType=DECIMAL},
       </if>
+      <if test="resultType != null">
+        #{resultType,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -417,7 +434,8 @@
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
         DELETED = #{deleted,jdbcType=DECIMAL},
         SEND_STATION_ID = #{sendStationId,jdbcType=DECIMAL},
-        ARRIVAL_STATION_ID = #{arrivalStationId,jdbcType=DECIMAL}
+        ARRIVAL_STATION_ID = #{arrivalStationId,jdbcType=DECIMAL},
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -483,10 +501,13 @@
       <if test="arrivalStationId != null">
         ARRIVAL_STATION_ID = #{arrivalStationId,jdbcType=DECIMAL},
       </if>
+      <if test="resultType != null">
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
     <include refid="select"/>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>
@@ -509,8 +530,8 @@
     RESULT_REMARKS, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID
-    )
+    DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID,
+    RESULT_TYPE)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -522,8 +543,8 @@
     #{item.resultRemarks,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.deleted,jdbcType=DECIMAL}, #{item.sendStationId,jdbcType=DECIMAL}, #{item.arrivalStationId,jdbcType=DECIMAL}
-    from dual
+    #{item.deleted,jdbcType=DECIMAL}, #{item.sendStationId,jdbcType=DECIMAL}, #{item.arrivalStationId,jdbcType=DECIMAL},
+    #{item.resultType,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -613,6 +634,10 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.arrivalStationId,jdbcType=DECIMAL}
     </foreach>
+    ,RESULT_TYPE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultType,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
       #{item.resultId,jdbcType=DECIMAL}
@@ -642,10 +667,13 @@
     t_load.RESULT_BILLABLE_TONNAGE "resultBillableTonnage",
     t_load.RESULT_ISCLEAR "resultIsclear",
     t_load.RESULT_REMARKS "resultRemarks",
+           RS.SUPPLIER_NAME "supplierName",
     t_load.INSERT_TIME "insertTime"
     from TMSTRAIN_LOADING_RESULT t_load
     left join AMS_PURCHASE_ORDER a_order
     on t_load.PURCHASE_ORDER_RAIL_PLAN_ID=a_order.PURCHASE_ORDER_ID
+    left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = a_order.SUPPLIER_UNIT_ID
     left join DIL_BATCH d_batch
     on t_load.BATCH_ID=d_batch.BATCH_ID
     left join RMS_MATERIAL r_material
@@ -654,7 +682,8 @@
     on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
     left join RMSTRAIN_ARRIVAL_SEND r_a_arrival
     on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
-    where t_load.DELETED=0 order by t_load.RESULT_LOADING_DATE desc
+    where t_load.DELETED = 0 and t_load.RESULT_TYPE = #{resultType}
+    order by t_load.RESULT_LOADING_DATE desc
     )
     <where>
       <if test="purchaseOrderNo != null">
@@ -788,7 +817,7 @@
     on RM.MATERIAL_ID = DB.MATERIAL_ID
   </select>
 
-  <select id="getWagonNo" resultType="java.util.LinkedHashMap">
+  <select id="getWagonNo" resultType="java.util.LinkedHashMap" parameterType="int">
     select
       t_load.RESULT_WAGON_NO "id",
       t_load.RESULT_WAGON_NO "value",
@@ -796,7 +825,7 @@
     from TMSTRAIN_LOADING_RESULT t_load
            left join TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
                      on t_load.RESULT_WAGON_NO = t_unload.RESULT_WAGON_NO
-    where t_load.RESULT_WAGON_NO not in (select RESULT_WAGON_NO from TMSTRAIN_WAGON_UNLOAD_RESULT) and t_load.DELETED = 0
+    where t_load.RESULT_WAGON_NO not in (select RESULT_WAGON_NO from TMSTRAIN_WAGON_UNLOAD_RESULT) and t_load.DELETED = 0 and t_load.RESULT_TYPE = #{resultType}
   </select>
 
   <select id="selectByResultId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">

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

@@ -20,24 +20,25 @@
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="STATUS" jdbcType="DECIMAL" property="status" />
+    <result column="RESULT_TYPE" jdbcType="DECIMAL" property="resultType" />
   </resultMap>
   <sql id="columns">
-    RESULT_ID, RAIL_PLAN_ID, RESULT_PLEASE_PLAN_NO, RESULT_PLAN_DATE, RESULT_CATEGORY,
-    SHIPPER_ID, SEND_STATION_ID, TO_THE_STATION_ID, RESULT_PLEASE_NUMBER, RESULT_PLEASE_DATE,
-    RESULT_APPROVE_NUMBER, RESULT_APPROVE_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS
+    RESULT_ID, RAIL_PLAN_ID, RESULT_PLEASE_PLAN_NO, RESULT_PLAN_DATE, RESULT_CATEGORY, 
+    SHIPPER_ID, SEND_STATION_ID, TO_THE_STATION_ID, RESULT_PLEASE_NUMBER, RESULT_PLEASE_DATE, 
+    RESULT_APPROVE_NUMBER, RESULT_APPROVE_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS, RESULT_TYPE
   </sql>
   <sql id="columns_alias">
-    t.RESULT_ID, t.RAIL_PLAN_ID, t.RESULT_PLEASE_PLAN_NO, t.RESULT_PLAN_DATE, t.RESULT_CATEGORY,
-    t.SHIPPER_ID, t.SEND_STATION_ID, t.TO_THE_STATION_ID, t.RESULT_PLEASE_NUMBER, t.RESULT_PLEASE_DATE,
-    t.RESULT_APPROVE_NUMBER, t.RESULT_APPROVE_DATE, t.INSERT_USERNAME, t.INSERT_TIME,
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.STATUS
+    t.RESULT_ID, t.RAIL_PLAN_ID, t.RESULT_PLEASE_PLAN_NO, t.RESULT_PLAN_DATE, t.RESULT_CATEGORY, 
+    t.SHIPPER_ID, t.SEND_STATION_ID, t.TO_THE_STATION_ID, t.RESULT_PLEASE_NUMBER, t.RESULT_PLEASE_DATE, 
+    t.RESULT_APPROVE_NUMBER, t.RESULT_APPROVE_DATE, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_TYPE
   </sql>
   <sql id="select">
-    SELECT <include refid="columns" /> FROM TMSTRAIN_PLEASE_APPROVE_RESULT
+    SELECT <include refid="columns"/> FROM TMSTRAIN_PLEASE_APPROVE_RESULT
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias" /> FROM TMSTRAIN_PLEASE_APPROVE_RESULT t
+    SELECT <include refid="columns_alias"/> FROM TMSTRAIN_PLEASE_APPROVE_RESULT t
   </sql>
   <sql id="where">
     <where>
@@ -95,6 +96,9 @@
       <if test="status != null">
         and STATUS = #{status}
       </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -153,9 +157,12 @@
       <if test="status != null">
         and STATUS = #{status}
       </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from TMSTRAIN_PLEASE_APPROVE_RESULT
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </delete>
@@ -213,6 +220,9 @@
     <if test="status != null">
       or STATUS = #{status}
     </if>
+    <if test="resultType != null">
+      or RESULT_TYPE = #{resultType}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainPleaseApproveResult">
     insert into TMSTRAIN_PLEASE_APPROVE_RESULT (RESULT_ID, RAIL_PLAN_ID, RESULT_PLEASE_PLAN_NO,
@@ -221,14 +231,14 @@
                                                 RESULT_PLEASE_DATE, RESULT_APPROVE_NUMBER,
                                                 RESULT_APPROVE_DATE, INSERT_USERNAME, INSERT_TIME,
                                                 UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-                                                STATUS)
+                                                STATUS, RESULT_TYPE)
     values (#{resultId,jdbcType=DECIMAL}, #{railPlanId,jdbcType=DECIMAL}, #{resultPleasePlanNo,jdbcType=VARCHAR},
             #{resultPlanDate,jdbcType=TIMESTAMP}, #{resultCategory,jdbcType=VARCHAR}, #{shipperId,jdbcType=DECIMAL},
             #{sendStationId,jdbcType=DECIMAL}, #{toTheStationId,jdbcType=DECIMAL}, #{resultPleaseNumber,jdbcType=DECIMAL},
             #{resultPleaseDate,jdbcType=TIMESTAMP}, #{resultApproveNumber,jdbcType=DECIMAL},
             #{resultApproveDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
             #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
-            #{status,jdbcType=DECIMAL})
+            #{status,jdbcType=DECIMAL}, #{resultType,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainPleaseApproveResult">
     insert into TMSTRAIN_PLEASE_APPROVE_RESULT
@@ -287,6 +297,9 @@
       <if test="status != null">
         STATUS,
       </if>
+      <if test="resultType != null">
+        RESULT_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -343,6 +356,9 @@
       <if test="status != null">
         #{status,jdbcType=DECIMAL},
       </if>
+      <if test="resultType != null">
+        #{resultType,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainPleaseApproveResult">
@@ -363,7 +379,8 @@
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-        STATUS = #{status,jdbcType=DECIMAL}
+        STATUS = #{status,jdbcType=DECIMAL},
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainPleaseApproveResult">
@@ -420,20 +437,23 @@
       <if test="status != null">
         STATUS = #{status,jdbcType=DECIMAL},
       </if>
+      <if test="resultType != null">
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select" />
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select"/>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="where" />
+    <include refid="select"/>
+    <include refid="where"/>
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
-    <include refid="whereLike" />
+    <include refid="select"/>
+    <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into TMSTRAIN_PLEASE_APPROVE_RESULT
@@ -445,7 +465,8 @@
     RESULT_APPROVE_NUMBER, RESULT_APPROVE_DATE,
     INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, STATUS)
+    INSERT_UPDATE_REMARK, STATUS, RESULT_TYPE
+    )
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -456,93 +477,98 @@
     #{item.resultApproveNumber,jdbcType=DECIMAL}, #{item.resultApproveDate,jdbcType=TIMESTAMP},
     #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.status,jdbcType=DECIMAL} from dual
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.status,jdbcType=DECIMAL}, #{item.resultType,jdbcType=DECIMAL}
+    from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
     update TMSTRAIN_PLEASE_APPROVE_RESULT
     set
     RESULT_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-      #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
     </foreach>
     ,RAIL_PLAN_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.railPlanId,jdbcType=DECIMAL}
     </foreach>
     ,RESULT_PLEASE_PLAN_NO=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPleasePlanNo,jdbcType=VARCHAR}
     </foreach>
     ,RESULT_PLAN_DATE=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPlanDate,jdbcType=TIMESTAMP}
     </foreach>
     ,RESULT_CATEGORY=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultCategory,jdbcType=VARCHAR}
     </foreach>
     ,SHIPPER_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
     </foreach>
     ,SEND_STATION_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.sendStationId,jdbcType=DECIMAL}
     </foreach>
     ,TO_THE_STATION_ID=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.toTheStationId,jdbcType=DECIMAL}
     </foreach>
     ,RESULT_PLEASE_NUMBER=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPleaseNumber,jdbcType=DECIMAL}
     </foreach>
     ,RESULT_PLEASE_DATE=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPleaseDate,jdbcType=TIMESTAMP}
     </foreach>
     ,RESULT_APPROVE_NUMBER=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultApproveNumber,jdbcType=DECIMAL}
     </foreach>
     ,RESULT_APPROVE_DATE=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.resultApproveDate,jdbcType=TIMESTAMP}
     </foreach>
     ,INSERT_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
     </foreach>
     ,INSERT_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
     </foreach>
     ,UPDATE_USERNAME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
     </foreach>
     ,UPDATE_TIME=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
     </foreach>
     ,INSERT_UPDATE_REMARK=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
     </foreach>
     ,STATUS=
-    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.status,jdbcType=DECIMAL}
     </foreach>
+    ,RESULT_TYPE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultType,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
-    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
       #{item.resultId,jdbcType=DECIMAL}
     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from TMSTRAIN_PLEASE_APPROVE_RESULT
     where RESULT_ID in
-    <foreach close=")" collection="list" item="id" open="(" separator=",">
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
@@ -569,7 +595,7 @@
     left join RMSTRAIN_ARRIVAL_SEND t4
     on t1.TO_THE_STATION_ID = t4.ARRIVAL_ID
 
-    where t1.STATUS = #{status}
+    where t1.STATUS = #{status} and t1.RESULT_TYPE = #{resultType}
     )
     <where>
       <if test="resultId != null">
@@ -683,7 +709,7 @@
     left join RMSTRAIN_ARRIVAL_SEND t4
     on t1.TO_THE_STATION_ID = t4.ARRIVAL_ID
 
-    where t1.STATUS = 2
+    where t1.STATUS = 2 and t1.RESULT_TYPE = #{resultType}
     )
     <where>
       <if test="resultId != null">

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

@@ -17,18 +17,19 @@
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="RESULT_TYPE" jdbcType="DECIMAL" property="resultType" />
   </resultMap>
   <sql id="columns">
     UNLOADING_ID, PURCHASE_ORDER_RAIL_PLAN_ID, RESULT_WAGON_NO, RESULT_ARRIVAL_DATE, 
     RESULT_UNLOAD_TIME, UNLOADING_POINT_ID, RESULT_BIG_TICKET_WEIGHT, RESULT_RAIL_HORIZONTAL_WEIGHT, 
     RESULT_REMARK, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    DELETED
+    DELETED, RESULT_TYPE
   </sql>
   <sql id="columns_alias">
     t.UNLOADING_ID, t.PURCHASE_ORDER_RAIL_PLAN_ID, t.RESULT_WAGON_NO, t.RESULT_ARRIVAL_DATE, 
     t.RESULT_UNLOAD_TIME, t.UNLOADING_POINT_ID, t.RESULT_BIG_TICKET_WEIGHT, t.RESULT_RAIL_HORIZONTAL_WEIGHT, 
     t.RESULT_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.RESULT_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM TMSTRAIN_WAGON_UNLOAD_RESULT
@@ -83,6 +84,9 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -132,9 +136,12 @@
       <if test="deleted != null">
         and DELETED = #{deleted}
       </if>
+      <if test="resultType != null">
+        and RESULT_TYPE = #{resultType}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from TMSTRAIN_WAGON_UNLOAD_RESULT
     where UNLOADING_ID = #{unloadingId,jdbcType=DECIMAL}
   </delete>
@@ -183,6 +190,9 @@
     <if test="deleted != null">
       or DELETED = #{deleted}
     </if>
+    <if test="resultType != null">
+      or RESULT_TYPE = #{resultType}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainWagonUnloadResult">
     insert into TMSTRAIN_WAGON_UNLOAD_RESULT (UNLOADING_ID, PURCHASE_ORDER_RAIL_PLAN_ID,
@@ -190,15 +200,15 @@
                                               UNLOADING_POINT_ID, RESULT_BIG_TICKET_WEIGHT,
                                               RESULT_RAIL_HORIZONTAL_WEIGHT, RESULT_REMARK,
                                               INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                              UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
-    )
+                                              UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+                                              RESULT_TYPE)
     values (#{unloadingId,jdbcType=DECIMAL}, #{purchaseOrderRailPlanId,jdbcType=DECIMAL},
             #{resultWagonNo,jdbcType=VARCHAR}, #{resultArrivalDate,jdbcType=TIMESTAMP}, #{resultUnloadTime,jdbcType=TIMESTAMP},
             #{unloadingPointId,jdbcType=DECIMAL}, #{resultBigTicketWeight,jdbcType=DECIMAL},
             #{resultRailHorizontalWeight,jdbcType=DECIMAL}, #{resultRemark,jdbcType=VARCHAR},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}
-           )
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+            #{resultType,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainWagonUnloadResult">
     insert into TMSTRAIN_WAGON_UNLOAD_RESULT
@@ -248,6 +258,9 @@
       <if test="deleted != null">
         DELETED,
       </if>
+      <if test="resultType != null">
+        RESULT_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="unloadingId != null">
@@ -295,6 +308,9 @@
       <if test="deleted != null">
         #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="resultType != null">
+        #{resultType,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainWagonUnloadResult">
@@ -312,7 +328,8 @@
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-        DELETED = #{deleted,jdbcType=DECIMAL}
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL}
     where UNLOADING_ID = #{unloadingId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainWagonUnloadResult">
@@ -360,10 +377,13 @@
       <if test="deleted != null">
         DELETED = #{deleted,jdbcType=DECIMAL},
       </if>
+      <if test="resultType != null">
+        RESULT_TYPE = #{resultType,jdbcType=DECIMAL},
+      </if>
     </set>
     where UNLOADING_ID = #{unloadingId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
     <include refid="select"/>
     where UNLOADING_ID = #{unloadingId,jdbcType=DECIMAL}
   </select>
@@ -384,7 +404,8 @@
     RESULT_RAIL_HORIZONTAL_WEIGHT, RESULT_REMARK,
     INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, DELETED)
+    INSERT_UPDATE_REMARK, DELETED,
+    RESULT_TYPE)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.unloadingId,jdbcType=DECIMAL},
@@ -394,7 +415,8 @@
     #{item.resultRailHorizontalWeight,jdbcType=DECIMAL}, #{item.resultRemark,jdbcType=VARCHAR},
     #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.resultType,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -460,6 +482,10 @@
     <foreach collection="list" item="item" index="index" separator=" " open="case UNLOADING_ID" close="end">
       when #{item.unloadingId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
     </foreach>
+    ,RESULT_TYPE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case UNLOADING_ID" close="end">
+      when #{item.unloadingId,jdbcType=DECIMAL} then #{item.resultType,jdbcType=DECIMAL}
+    </foreach>
     where UNLOADING_ID in
     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
       #{item.unloadingId,jdbcType=DECIMAL}
@@ -508,7 +534,7 @@
     left join TMSTRAIN_UNLOAD_POINT t_unload_point
     on t_unload_point.UNLOAD_POINT_ID=t_unload.UNLOADING_POINT_ID
     where t_unload.RESULT_WAGON_NO in (select RESULT_WAGON_NO from TMSTRAIN_WAGON_UNLOAD_RESULT)
-      and t_unload.DELETED = 0 and t_load.DELETED = 0
+      and t_unload.DELETED = 0 and t_load.DELETED = 0 and t_unload.RESULT_TYPE = #{resultType}
     order by t_unload.RESULT_UNLOAD_TIME desc)
     <where>
       <if test="purchaseOrderNo != null">
@@ -743,43 +769,47 @@
     from TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
     where t_unload.UNLOADING_ID = #{unloadingId}
   </select>
+
   <select id="selectWagonUnLoadResult" resultType="java.util.Map">
-SELECT AROD.DAYPLAN_NO "dayPlanNo",
-       TWUR.RESULT_WAGON_NO "wagonNo",
-       TWUR.RESULT_UNLOAD_TIME "unLoadTime",
-       RAS.ARRIVAL_NAME "arrivelName",
-       RS.SHIPPER_NAME "shipperName",
-       RC.CONSIGNEE_COMPANY_NAME "address",
-       AROD.DAYPLAN_DELIVERY_DATE "deliveryDate",
-       AROD.DAYPLAN_CONSIGNEE_NAME "consigneeName",
-       AROD.DAYPLAN_CONSIGNEE_TEL "tel",
-       RAS.DAYPLAN_DEDICATED_LINE "line",
-       RM.MATERIAL_NAME "materialName",
-       AROM.OFFSET_MATERIAL_WEIGHT "weight",
-       AROM.OFFSET_MATERIAL_NUMBER "number",
-       TWUR.RESULT_ARRIVAL_DATE "arrivaldate",
-       TWUR.INSERT_TIME "insertTime",
-       RW.WAREHOUSE_NAME "warehouseName",
-       TWUR.INSERT_UPDATE_REMARK "remark"
-FROM TMSTRAIN_WAGON_UNLOAD_RESULT TWUR
-LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
-ON AROD.DAYPLAN_ID=TWUR.PURCHASE_ORDER_RAIL_PLAN_ID
-LEFT JOIN  RMSTRAIN_ARRIVAL_SEND RAS
-ON  RAS.ARRIVAL_ID=AROD.DAYPLAN_TO_THE_STATION_ID
-LEFT JOIN RMS_SHIPPER RS
-ON RS.SHIPPER_ID=AROD.SHIPPER_ID
-LEFT JOIN RMS_CONSIGNEE RC
-ON  RC.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
-LEFT JOIN  AMS_RAIL_OFFSET_MATERIAL AROM
-ON  AROM.DAYPLAN_ID=AROD.DAYPLAN_ID
-LEFT JOIN RMS_MATERIAL RM
-ON RM.MATERIAL_ID=AROM.MATERIAL_ID
-LEFT JOIN RMS_WAREHOUSE RW
-ON TWUR.UNLOADING_POINT_ID=RW.WAREHOUSE_ID
-LEFT JOIN RMS_WAREHOUSE_TYPE RWT
-ON RW.WAREHOUSE_TYPE_ID=RWT.WAREHOUSE_TYPE_ID
-WHERE  RWT.WAREHOUSE_TYPE_ID=2
-<where>
+    select *
+    from (
+    SELECT AROD.DAYPLAN_NO "dayPlanNo",
+    TWUR.RESULT_WAGON_NO "wagonNo",
+    TWUR.RESULT_UNLOAD_TIME "unLoadTime",
+    RAS.ARRIVAL_NAME "arrivelName",
+    RS.SHIPPER_NAME "shipperName",
+    RC.CONSIGNEE_COMPANY_NAME "address",
+    AROD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+    AROD.DAYPLAN_CONSIGNEE_NAME "consigneeName",
+    AROD.DAYPLAN_CONSIGNEE_TEL "tel",
+    RAS.DAYPLAN_DEDICATED_LINE "line",
+    RM.MATERIAL_NAME "materialName",
+    AROM.OFFSET_MATERIAL_WEIGHT "weight",
+    AROM.OFFSET_MATERIAL_NUMBER "number",
+    TWUR.RESULT_ARRIVAL_DATE "arrivaldate",
+    TWUR.INSERT_TIME "insertTime",
+    RW.WAREHOUSE_NAME "warehouseName",
+    TWUR.INSERT_UPDATE_REMARK "remark"
+    FROM TMSTRAIN_WAGON_UNLOAD_RESULT TWUR
+    LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
+    ON AROD.DAYPLAN_ID=TWUR.PURCHASE_ORDER_RAIL_PLAN_ID
+    LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+    ON RAS.ARRIVAL_ID=AROD.DAYPLAN_TO_THE_STATION_ID
+    LEFT JOIN RMS_SHIPPER RS
+    ON RS.SHIPPER_ID=AROD.SHIPPER_ID
+    LEFT JOIN RMS_CONSIGNEE RC
+    ON RC.CONSIGNEE_ID=AROD.RECEIVING_UNIT_ID
+    LEFT JOIN AMS_RAIL_OFFSET_MATERIAL AROM
+    ON AROM.DAYPLAN_ID=AROD.DAYPLAN_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID=AROM.MATERIAL_ID
+    LEFT JOIN RMS_WAREHOUSE RW
+    ON TWUR.UNLOADING_POINT_ID=RW.WAREHOUSE_ID
+    LEFT JOIN RMS_WAREHOUSE_TYPE RWT
+    ON RW.WAREHOUSE_TYPE_ID=RWT.WAREHOUSE_TYPE_ID
+    WHERE RWT.WAREHOUSE_TYPE_ID=2
+    )
+    <where>
   <if test="dayPlanNo!= null">
     and
     <foreach collection="dayPlanNo" item="item" open="(" separator="or" close=")">
@@ -870,19 +900,7 @@ WHERE  RWT.WAREHOUSE_TYPE_ID=2
       order by "insertTime" desc
     </if>
 </select>
-<!--通过id渲染车皮卸车作业 -->
-  <select id="selectUnloadByLoadingId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
-    select
-      t_unload.RESULT_WAGON_NO "resultWagonNo",
-      t_unload.RESULT_ARRIVAL_DATE "resultArrivalDate",
-      t_unload.RESULT_UNLOAD_TIME "resultUnloadTime",
-      t_unload.UNLOADING_POINT_ID "unloadingPointId",
-      t_unload.RESULT_BIG_TICKET_WEIGHT "resultBigTicketWeight",
-      t_unload.RESULT_RAIL_HORIZONTAL_WEIGHT "resultRailHorizontalWeight",
-      t_unload.RESULT_REMARK "resultRemark"
-    from TMSTRAIN_WAGON_UNLOAD_RESULT t_unload
-    where t_unload.UNLOADING_ID = #{unloadingId}
-  </select>
+
 <!-- 火车卸货 -->
   <select id="getTrainResult" resultType="java.util.LinkedHashMap">
   select *