Merge branch 'dev'

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                         <table>TMSTRAIN_PLEASE_APPROVE_RESULT</table>
+                         <table>TMSTRAIN_TOTAL_RESULT</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -1,101 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.model.AmsPurchaseOrder;
-import com.steerinfo.dil.service.IAmsPurchaseOrderService;
-import com.steerinfo.dil.service.impl.AmsPurchaseOrderServiceImpl;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageList;
-import com.steerinfo.framework.utils.collection.ListUtils;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * AmsPurchaseOrder RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-08-19 09:22
- * 类描述
- * 修订历史：
- * 日期：2021-08-19
- * 作者：generator
- * 参考：
- * 描述：AmsPurchaseOrder RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/amspurchaseorders")
-public class AmsPurchaseOrderController extends BaseRESTfulController {
-
-    @Autowired
-    AmsPurchaseOrderServiceImpl amsPurchaseOrderService;
-
-    /**
-     * 采购订单生成
-     * @param amsPurchaseOrder
-     * @return
-     */
-    @ApiOperation(value="添加采购订单")
-    @ApiImplicitParams({
-        @ApiImplicitParam(name = "amsPurchaseOrder", value = "采购订单", required = false, dataType = "AmsPurchaseOrder")
-    })
-    @PostMapping(value = "/insertAmsPurchaseOrder")
-    public RESTfulResult insertAmsPurchaseOrder(@RequestBody AmsPurchaseOrder amsPurchaseOrder){
-        System.out.println(amsPurchaseOrder);
-        int i = amsPurchaseOrderService.insertAmsPurchaseOrder(amsPurchaseOrder);
-        return success(i);
-    }
-
-    /**
-     * 通过主键删除采购订单
-     * @param purchaseOrderId
-     * @return
-     */
-    @ApiOperation(value="通过主键删除采购订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "purchaseOrderId", value = "采购订单号", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/deleteAmsPurchaseOrderByPurchaseOrderId")
-    public RESTfulResult deleteAmsPurchaseOrderByPurchaseOrderId(@RequestParam BigDecimal purchaseOrderId){
-        int i = amsPurchaseOrderService.deleteAmsPurchaseOrderByPurchaseOrderId(purchaseOrderId);
-        return success(i);
-    }
-
-    /**
-     * 通过主键修改采购订单
-     * @param amsPurchaseOrder
-     * @return
-     */
-    @ApiOperation(value="通过主键修改采购订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amsPurchaseOrder", value = "采购订单", required = false, dataType = "AmsPurchaseOrder")
-    })
-    @PostMapping(value = "/updateAmsPurchaseOrderByPurchaseOrderId")
-    public RESTfulResult updateAmsPurchaseOrderByPurchaseOrderId(@RequestBody AmsPurchaseOrder amsPurchaseOrder){
-        int i = amsPurchaseOrderService.updateAmsPurchaseOrderByPurchaseOrderId(amsPurchaseOrder);
-        return success(i);
-    }
-
-    /**
-     * 通过主键查询采购订单
-     * @param purchaseOrderId
-     * @return
-     */
-    @ApiOperation(value="通过主键查询采购订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "purchaseOrderId", value = "采购订单号", required = false, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/getAmsPurchaseOrderByPurchaseOrderId")
-    public RESTfulResult getAmsPurchaseOrderByPurchaseOrderId(@RequestParam BigDecimal purchaseOrderId){
-        AmsPurchaseOrder amsPurchaseOrder = amsPurchaseOrderService.getAmsPurchaseOrderByPurchaseOrderId(purchaseOrderId);
-        return success(amsPurchaseOrder);
-    }
-}

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

@@ -99,7 +99,6 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     @PostMapping(value = "/getTmstrainLoadingResultByResultId/{resultId}")
     public RESTfulResult getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId) {
         List<Map<String, Object>> loadingResultByResultId = tmstrainLoadingResultService.getTmstrainLoadingResultByResultId(resultId);
-        System.out.println(loadingResultByResultId);
         return success(loadingResultByResultId);
     }
 

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

@@ -65,9 +65,11 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
                                                 Integer pageSize,
                                                 Integer resultType,
                                                 String con) {
+        if(resultType!= null)
+            mapValue.put("resultType", resultType);
         PageHelper.startPage(pageNum, pageSize);
-        List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, tmstrainWagonUnLoad1);
+        List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, tmstrainWagonUnLoad);
         return success(pageList);
     }
 

src/main/java/com/steerinfo/dil/feign/WmshBoundFeign.java

@@ -22,5 +22,5 @@ public interface WmshBoundFeign {
     RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String,Object> wmshInboundResult);
 
     @PostMapping("api/v1/wmsh/wmshoutboundresults/addResult")
-    RESTfulResult addResult(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> addResult(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -1,13 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.AmsPurchaseOrder;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.math.BigDecimal;
-
-@Mapper
-public interface AmsPurchaseOrderMapper extends IBaseMapper<AmsPurchaseOrder, BigDecimal> {
-    //查询主键最大值
-    BigDecimal selectMaxId();
-}

src/main/java/com/steerinfo/dil/model/AmsPurchaseOrder.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 AmsPurchaseOrder implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(PURCHASE_ORDER_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal purchaseOrderId;
-
-    /**
-     * 采购订单号(PURCHASE_ORDER_NO,VARCHAR,30)
-     */
-    @ApiModelProperty(value="采购订单号",required=false)
-    private String purchaseOrderNo;
-
-    /**
-     * 外轮船名(PURCHASE_FOREIGN_SHIP_NAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="外轮船名",required=false)
-    private String purchaseForeignShipName;
-
-    /**
-     * 订单日期(PURCHASE_ORDER_DATE,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="订单日期",required=false)
-    private Date purchaseOrderDate;
-
-    /**
-     * 供应商ID(SUPPLIER_UNIT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="供应商ID",required=false)
-    private BigDecimal supplierUnitId;
-
-    /**
-     * 采购组织ID(PURCHASING_ORGANIZATION_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="采购组织ID",required=false)
-    private BigDecimal purchasingOrganizationId;
-
-    /**
-     * 采购员(PURCHASE_ORDER_BUYER,VARCHAR,20)
-     */
-    @ApiModelProperty(value="采购员",required=false)
-    private String purchaseOrderBuyer;
-
-    /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
-
-    /**
-     * 订货数量(PUCHASE_ORDER_MATERIAL_NUMBER,DECIMAL,0)
-     */
-    @ApiModelProperty(value="订货数量",required=false)
-    private Short puchaseOrderMaterialNumber;
-
-    /**
-     * 收货单位(RECEIVE_UNIT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="收货单位",required=false)
-    private BigDecimal receiveUnitId;
-
-    /**
-     * 交货日期(PUCHASE_ORDER_DELIVERY_DATE,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="交货日期",required=false)
-    private Date puchaseOrderDeliveryDate;
-
-    /**
-     * 记录创建人(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;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.purchaseOrderId;
-    }
-
-    @Override
-    public void setId(BigDecimal purchaseOrderId) {
-        this.purchaseOrderId = purchaseOrderId;
-    }
-
-    public BigDecimal getPurchaseOrderId() {
-        return purchaseOrderId;
-    }
-
-    public void setPurchaseOrderId(BigDecimal purchaseOrderId) {
-        this.purchaseOrderId = purchaseOrderId;
-    }
-
-    public String getPurchaseOrderNo() {
-        return purchaseOrderNo;
-    }
-
-    public void setPurchaseOrderNo(String purchaseOrderNo) {
-        this.purchaseOrderNo = purchaseOrderNo == null ? null : purchaseOrderNo.trim();
-    }
-
-    public String getPurchaseForeignShipName() {
-        return purchaseForeignShipName;
-    }
-
-    public void setPurchaseForeignShipName(String purchaseForeignShipName) {
-        this.purchaseForeignShipName = purchaseForeignShipName == null ? null : purchaseForeignShipName.trim();
-    }
-
-    public Date getPurchaseOrderDate() {
-        return purchaseOrderDate;
-    }
-
-    public void setPurchaseOrderDate(Date purchaseOrderDate) {
-        this.purchaseOrderDate = purchaseOrderDate;
-    }
-
-    public BigDecimal getSupplierUnitId() {
-        return supplierUnitId;
-    }
-
-    public void setSupplierUnitId(BigDecimal supplierUnitId) {
-        this.supplierUnitId = supplierUnitId;
-    }
-
-    public BigDecimal getPurchasingOrganizationId() {
-        return purchasingOrganizationId;
-    }
-
-    public void setPurchasingOrganizationId(BigDecimal purchasingOrganizationId) {
-        this.purchasingOrganizationId = purchasingOrganizationId;
-    }
-
-    public String getPurchaseOrderBuyer() {
-        return purchaseOrderBuyer;
-    }
-
-    public void setPurchaseOrderBuyer(String purchaseOrderBuyer) {
-        this.purchaseOrderBuyer = purchaseOrderBuyer == null ? null : purchaseOrderBuyer.trim();
-    }
-
-    public BigDecimal getMaterialId() {
-        return materialId;
-    }
-
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
-    }
-
-    public Short getPuchaseOrderMaterialNumber() {
-        return puchaseOrderMaterialNumber;
-    }
-
-    public void setPuchaseOrderMaterialNumber(Short puchaseOrderMaterialNumber) {
-        this.puchaseOrderMaterialNumber = puchaseOrderMaterialNumber;
-    }
-
-    public BigDecimal getReceiveUnitId() {
-        return receiveUnitId;
-    }
-
-    public void setReceiveUnitId(BigDecimal receiveUnitId) {
-        this.receiveUnitId = receiveUnitId;
-    }
-
-    public Date getPuchaseOrderDeliveryDate() {
-        return puchaseOrderDeliveryDate;
-    }
-
-    public void setPuchaseOrderDeliveryDate(Date puchaseOrderDeliveryDate) {
-        this.puchaseOrderDeliveryDate = puchaseOrderDeliveryDate;
-    }
-
-    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();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", purchaseOrderId=").append(purchaseOrderId);
-        sb.append(", purchaseOrderNo=").append(purchaseOrderNo);
-        sb.append(", purchaseForeignShipName=").append(purchaseForeignShipName);
-        sb.append(", purchaseOrderDate=").append(purchaseOrderDate);
-        sb.append(", supplierUnitId=").append(supplierUnitId);
-        sb.append(", purchasingOrganizationId=").append(purchasingOrganizationId);
-        sb.append(", purchaseOrderBuyer=").append(purchaseOrderBuyer);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", puchaseOrderMaterialNumber=").append(puchaseOrderMaterialNumber);
-        sb.append(", receiveUnitId=").append(receiveUnitId);
-        sb.append(", puchaseOrderDeliveryDate=").append(puchaseOrderDeliveryDate);
-        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(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -161,18 +161,16 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="发货单位ID",required=false)
     private BigDecimal sendUnitId;
 
+    /**
+     * 是否需要发送委托 为空则或0：不需要 1：需要发送 2：已发送(SEND_REQUEST,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否需要发送委托 为空则或0：不需要 1：需要发送 2：已发送",required=false)
+    private BigDecimal sendRequest;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "车皮号列表")
     private List<String> wagonNoList;
 
-    public List<String> getWagonNoList() {
-        return wagonNoList;
-    }
-
-    public void setWagonNoList(List<String> wagonNoList) {
-        this.wagonNoList = wagonNoList;
-    }
-
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -385,6 +383,14 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         this.sendUnitId = sendUnitId;
     }
 
+    public BigDecimal getSendRequest() {
+        return sendRequest;
+    }
+
+    public void setSendRequest(BigDecimal sendRequest) {
+        this.sendRequest = sendRequest;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -416,8 +422,17 @@ public class TmstrainLoadingResult implements IBasePO<BigDecimal> {
         sb.append(", trainCalculateId=").append(trainCalculateId);
         sb.append(", unloadingPointId=").append(unloadingPointId);
         sb.append(", sendUnitId=").append(sendUnitId);
+        sb.append(", sendRequest=").append(sendRequest);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
+
+    public List<String> getWagonNoList() {
+        return wagonNoList;
+    }
+
+    public void setWagonNoList(List<String> wagonNoList) {
+        this.wagonNoList = wagonNoList;
+    }
 }

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

@@ -10,19 +10,19 @@ import java.util.Date;
 @ApiModel(value="火运总实绩")
 public class TmstrainTotalResult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(TOTAL_RESULT_ID,DECIMAL,38)
+     * 主键ID(TOTAL_RESULT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal totalResultId;
 
     /**
-     * 火运装车实绩ID(LOADING_ID,DECIMAL,38)
+     * 火运装车实绩ID(LOADING_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="火运装车实绩ID",required=false)
     private BigDecimal loadingId;
 
     /**
-     * 火运卸车实绩ID(UNLOADING_ID,DECIMAL,38)
+     * 火运卸车实绩ID(UNLOADING_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="火运卸车实绩ID",required=false)
     private BigDecimal unloadingId;
@@ -31,19 +31,19 @@ public class TmstrainTotalResult implements IBasePO<BigDecimal> {
      * 厂内滞留总时长=驶离时间-抵达时间(RESULT_TOTAL_STAY_DURATION,DECIMAL,0)
      */
     @ApiModelProperty(value="厂内滞留总时长=驶离时间-抵达时间",required=false)
-    private Short resultTotalStayDuration;
+    private BigDecimal resultTotalStayDuration;
 
     /**
-     * 运输标准时长(STANDARD_DATA_ID,DECIMAL,38)
+     * 运输标准时长(STANDARD_DATA_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="运输标准时长",required=true)
+    @ApiModelProperty(value="运输标准时长",required=false)
     private BigDecimal standardDataId;
 
     /**
      * 运输时长异常值(RESULT_OUTLIER,DECIMAL,0)
      */
     @ApiModelProperty(value="运输时长异常值",required=false)
-    private Short resultOutlier;
+    private BigDecimal resultOutlier;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -75,6 +75,12 @@ public class TmstrainTotalResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 火车运输订单号(TRANSPORT_NUM,VARCHAR,20)
+     */
+    @ApiModelProperty(value="火车运输订单号",required=false)
+    private String transportNum;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -111,11 +117,11 @@ public class TmstrainTotalResult implements IBasePO<BigDecimal> {
         this.unloadingId = unloadingId;
     }
 
-    public Short getResultTotalStayDuration() {
+    public BigDecimal getResultTotalStayDuration() {
         return resultTotalStayDuration;
     }
 
-    public void setResultTotalStayDuration(Short resultTotalStayDuration) {
+    public void setResultTotalStayDuration(BigDecimal resultTotalStayDuration) {
         this.resultTotalStayDuration = resultTotalStayDuration;
     }
 
@@ -127,11 +133,11 @@ public class TmstrainTotalResult implements IBasePO<BigDecimal> {
         this.standardDataId = standardDataId;
     }
 
-    public Short getResultOutlier() {
+    public BigDecimal getResultOutlier() {
         return resultOutlier;
     }
 
-    public void setResultOutlier(Short resultOutlier) {
+    public void setResultOutlier(BigDecimal resultOutlier) {
         this.resultOutlier = resultOutlier;
     }
 
@@ -175,6 +181,14 @@ public class TmstrainTotalResult implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public String getTransportNum() {
+        return transportNum;
+    }
+
+    public void setTransportNum(String transportNum) {
+        this.transportNum = transportNum == null ? null : transportNum.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -192,6 +206,7 @@ public class TmstrainTotalResult implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", transportNum=").append(transportNum);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -114,6 +114,7 @@ public class TmstrainWagonUnloadResult implements IBasePO<BigDecimal> {
     @TableField(exist = false)
     @ApiModelProperty(value = "车皮号列表")
     private List<Map<String, Object>> wagonNoList;
+
     private static final long serialVersionUID = 1L;
 
     @Override

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

@@ -1,30 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.AmsPurchaseOrder;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
-
-/**
- * AmsPurchaseOrder服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-08-19 09:22
- * 类描述
- * 修订历史：
- * 日期：2021-08-19
- * 作者：generator
- * 参考：
- * 描述：AmsPurchaseOrder服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAmsPurchaseOrderService{
-    //添加采购订单
-    int insertAmsPurchaseOrder(AmsPurchaseOrder amsPurchaseOrder);
-    //通过主键删除采购订单
-    int deleteAmsPurchaseOrderByPurchaseOrderId(BigDecimal purchaseOrderId);
-    //通过主键修改采购订单
-    int updateAmsPurchaseOrderByPurchaseOrderId(AmsPurchaseOrder amsPurchaseOrder);
-    //通过主键查询采购订单
-    AmsPurchaseOrder getAmsPurchaseOrderByPurchaseOrderId(BigDecimal purchaseOrderId);
-}

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

@@ -22,7 +22,7 @@ public interface ITmstrainMeasureCommissionService{
     Map<String, Object> getTrainMeasureCommission(Map<String, Object> map);
 
     //添加火车计量委托
-    int addTrainMeasureCommission(Integer resultId);
+    int addTrainMeasureCommission(Map<String, Object> map);
 
     //查询没有发送过计量委托的车皮装车实绩并且到站是新区轨道衡和老区轨道衡的车皮装车实绩（不是补录）
     List<Map<String, Object>> getLoadResultToSendMC(Map<String, Object> map);

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

@@ -1,120 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmsPurchaseOrderMapper;
-import com.steerinfo.dil.model.AmsPurchaseOrder;
-import com.steerinfo.dil.service.IAmsPurchaseOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * AmsPurchaseOrder服务实现：
- * @author zouzhd
- * @version 1.0-SNAPSHORT 2021-08-19 09:22
- * 类描述
- * 修订历史：
- * 日期：2021-08-19
- * 作者：generator
- * 参考：
- * 描述：AmsPurchaseOrder服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service
-public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService{
-
-    @Autowired
-    private AmsPurchaseOrderMapper amsPurchaseOrderMapper;
-
-    /**
-     * 采购订单生成
-     * @param amsPurchaseOrder
-     * @return
-     */
-    @Override
-    public int insertAmsPurchaseOrder(AmsPurchaseOrder amsPurchaseOrder) {
-        long id;
-        if(amsPurchaseOrderMapper.selectMaxId()==null){
-            id = 1;
-        }else {
-            id = amsPurchaseOrderMapper.selectMaxId().longValue()+1;
-        }
-        amsPurchaseOrder.setPurchaseOrderId(new BigDecimal(id));
-        //WCGDD-年月日-8位数的顺序号
-        Calendar now = Calendar.getInstance();
-        String number = "WCGDD-" +  now.get(Calendar.YEAR);
-        if (now.get(Calendar.MONTH)+1 < 10) {
-            number = number + "0" + (now.get(Calendar.MONTH)+1);
-        }
-        else {
-            number = number + now.get(Calendar.MONTH)+1;
-        }
-        number = number + now.get(now.DAY_OF_MONTH)+"-";
-        switch ((new BigDecimal(id).toString()).length()) {
-            case 1:
-                number = number + "0000000" + id;
-                break;
-            case 2:
-                number = number + "000000" + id;
-                break;
-            case 3:
-                number = number + "00000" + id;
-                break;
-            case 4:
-                number = number + "0000" + id;
-                break;
-            case 5:
-                number = number + "000" + id;
-                break;
-            case 6:
-                number = number + "00" + id;
-                break;
-            case 7:
-                number = number + "0" + id;
-                break;
-            default:number = number + id;
-        }
-        amsPurchaseOrder.setPurchaseOrderNo(number);
-        amsPurchaseOrder.setPurchaseOrderDate(new Date());
-        amsPurchaseOrder.setInsertUsername("admin");
-        amsPurchaseOrder.setInsertTime(new Date());
-        amsPurchaseOrder.setUpdateUsername("admin");
-        amsPurchaseOrder.setUpdateTime(new Date());
-        amsPurchaseOrder.setInsertUpdateRemark("无");
-        System.out.println(amsPurchaseOrder);
-        return amsPurchaseOrderMapper.insert(amsPurchaseOrder);
-    }
-
-    /**
-     * 通过主键删除采购订单
-     * @param purchaseOrderId
-     * @return
-     */
-    @Override
-    public int deleteAmsPurchaseOrderByPurchaseOrderId(BigDecimal purchaseOrderId) {
-        return amsPurchaseOrderMapper.deleteByPrimaryKey(purchaseOrderId);
-    }
-
-    /**
-     * 通过主键修改采购订单
-     * @param amsPurchaseOrder
-     * @return
-     */
-    @Override
-    public int updateAmsPurchaseOrderByPurchaseOrderId(AmsPurchaseOrder amsPurchaseOrder) {
-        return amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);
-    }
-
-    /**
-     * 通过主键查询采购订单
-     * @param purchaseOrderId
-     * @return
-     */
-    @Override
-    public AmsPurchaseOrder getAmsPurchaseOrderByPurchaseOrderId(BigDecimal purchaseOrderId) {
-        return amsPurchaseOrderMapper.selectByPrimaryKey(purchaseOrderId);
-    }
-}

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

@@ -9,7 +9,6 @@ import com.steerinfo.dil.model.TmstrainTotalResult;
 import com.steerinfo.dil.model.TmstrainTruckTotalResult;
 import com.steerinfo.dil.service.ITmstrainLoadingResultService;
 import com.steerinfo.dil.util.DataChange;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,7 +59,16 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             case 1:
             case 2:
             case 3:
-                return tmstrainLoadingResultMapper.getTmsWagonLoadInfo(map); // apiId = 58  - 209
+                List<Map<String, Object>> tmsWagonLoadInfo = tmstrainLoadingResultMapper.getTmsWagonLoadInfo(map);// apiId = 58  - 209
+                for (Map<String, Object> obj : tmsWagonLoadInfo) {
+                    Integer deleted = DataChange.dataToBigDecimal(obj.get("deleted")).intValue();
+                    if(deleted == 0){
+                        obj.put("isUnload", "已装车");
+                    }else {
+                        obj.put("isUnload", "已卸车");
+                    }
+                }
+                return tmsWagonLoadInfo;
             case 4:
                 return tmstrainLoadingResultMapper.selectLoadedForConverted(map); //apiId = 203
             case 10:
@@ -70,6 +78,22 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         return null;
     }
 
+    /**
+     * 添加火运总实绩
+     * @param loadingId
+     * @return
+     */
+    public int addTotalResult(BigDecimal loadingId){
+        TmstrainTotalResult tmstrainTotalResult = new TmstrainTotalResult();
+        BigDecimal maxId = tmstrainTotalResultMapper.selectMaxId();
+        tmstrainTotalResult.setId(maxId); //获取添加火运总实绩主键ID
+        //生成火运单号
+        tmstrainTotalResult.setTransportNum(DataChange.generateEightDigitsNumber("TRAIN", maxId.intValue()));
+        //添加火运装车实绩ID
+        tmstrainTotalResult.setLoadingId(loadingId);
+        return tmstrainTotalResultMapper.insertSelective(tmstrainTotalResult);
+    }
+
     /**
      * 进口矿新增装车实绩
      * @param tmstrainLoadingResult
@@ -81,12 +105,15 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         List<String> wagonNoList = tmstrainLoadingResult.getWagonNoList();
         //通过采购订单号获得批次ID
         BigDecimal purchaseOrderId = tmstrainLoadingResult.getPurchaseOrderRailPlanId();
+        BigDecimal arrivalStationId = tmstrainLoadingResult.getArrivalStationId();
+        if(arrivalStationId.intValue() == 1){
+            tmstrainLoadingResult.setSendRequest(new BigDecimal(1));
+        }
         BigDecimal batchId = tmstrainLoadingResultMapper.getBatchIdByPurOrderId(purchaseOrderId);
         tmstrainLoadingResult.setBatchId(batchId);
         //添加常规字段
         addRegularField(tmstrainLoadingResult);
         int count = 0;
-        Double totalWeight = 0.0;
         for (String wagonNo : wagonNoList) {
             tmstrainLoadingResult.setResultWagonNo(wagonNo);
             BigDecimal maxId = tmstrainLoadingResultMapper.selectMaxId();
@@ -96,19 +123,8 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             int wagonWeight = calculateWagonWeight(tmstrainLoadingResult.getResultWagonNo());
             tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(wagonWeight));
             count += tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
-            totalWeight += tmstrainLoadingResult.getResultBillableTonnage().doubleValue();
             //添加火运总实绩
-            TmstrainTotalResult tmstrainTotalResult = new TmstrainTotalResult();
-            tmstrainTotalResult.setId(tmstrainTotalResultMapper.selectMaxId()); //获取添加火运总实绩主键ID
-            //添加火运装车实绩ID
-            tmstrainTotalResult.setLoadingId(maxId);
-            count += tmstrainTotalResultMapper.insertSelective(tmstrainTotalResult);
-        }
-
-        //如果订单类型为采购进口矿火运（万州港---达州 || 万州港--老区轨道衡） 添加总车皮标重传输给港存库
-        if(tmstrainLoadingResult.getResultType().intValue() == 1){
-            tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(totalWeight.toString()));
-//            addOutWarehouse(tmstrainLoadingResult, batchId);
+            count += addTotalResult(maxId);
         }
         return count;
     }
@@ -123,12 +139,9 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         //通过到站ID匹配计量衡 如果是老区轨道衡或者是新区轨道衡 则匹配轨道衡
         BigDecimal arrivalStationId = tmstrainLoadingResult.getArrivalStationId();
         //如果到站ID是老区轨道衡
-        if(arrivalStationId.intValue() == 3){
+        if(arrivalStationId.intValue() == 1){
             tmstrainLoadingResult.setTrainCalculateId(new BigDecimal(13)); //设置计量衡为 铁专线（老区）
-        }
-        //如果到站Id是新区轨道衡
-        if(arrivalStationId.intValue() == 4){
-            tmstrainLoadingResult.setTrainCalculateId(new BigDecimal(14));//设置计量衡为 新区轨道衡 （新区）
+            tmstrainLoadingResult.setSendRequest(new BigDecimal(1));
         }
         //添加常规字段
         addRegularField(tmstrainLoadingResult);
@@ -149,11 +162,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(wagonWeight));
             count += tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
             //添加火运总实绩
-            TmstrainTotalResult tmstrainTotalResult = new TmstrainTotalResult();
-            tmstrainTotalResult.setId(tmstrainTotalResultMapper.selectMaxId()); //获取添加火运总实绩主键ID
-            //添加火运装车实绩ID
-            tmstrainTotalResult.setLoadingId(maxId);
-            count += tmstrainTotalResultMapper.insertSelective(tmstrainTotalResult);
+            count += addTotalResult(maxId);
         }
         return count;
     }
@@ -228,7 +237,8 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         map.put("batchId", batchId);
         //通过发站查询发站的所属港口
         BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
-        map.put("portId", portId);
+        map.put("downSwimPortId", portId);
+        map.put("port", portId);
         wmshBoundFeign.addResult(map);
     }
 

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

@@ -2,13 +2,16 @@ package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.mapper.TmstrainLoadingResultMapper;
 import com.steerinfo.dil.mapper.TmstrainMeasureCommissionMapper;
+import com.steerinfo.dil.model.TmstrainLoadingResult;
 import com.steerinfo.dil.model.TmstrainMeasureCommission;
 import com.steerinfo.dil.service.ITmstrainMeasureCommissionService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -36,15 +39,18 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
     @Autowired
     private TmstrainMeasureCommissionMapper tmstrainMeasureCommissionMapper;
 
+    @Autowired
+    private TmstrainLoadingResultMapper tmstrainLoadingResultMapper;
+
     /**
      * 批量发送计量委托
      * @return
      */
     public int batchSendMeasureCommission(Map<String, Object> map){
-        List<Integer> resultIdList = (List<Integer>) map.get("resultIdList");
+        List<Map<String, Object>> resultIdList = (List<Map<String, Object>>) map.get("resultIdList");
         int count = 0;
-        for (Integer resultId : resultIdList) {
-            count += addTrainMeasureCommission(resultId);
+        for (Map<String, Object> objectMap : resultIdList) {
+            count += addTrainMeasureCommission(objectMap);
         }
         return count;
     }
@@ -55,11 +61,11 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
      *   resultId    装车实绩ID
      * @return
      */
-    public int addTrainMeasureCommission(Integer resultId){
-        Map<String, Object> map = new HashMap<>();
-        map.put("resultId", resultId);
+    public int addTrainMeasureCommission(Map<String, Object> map){
         //查询计量委托
         Map<String, Object> measureCommission = getTrainMeasureCommission(map);
+        measureCommission.put("steelyardNum", "铁专线");
+        measureCommission.put("transportNum", map.get("transportNum"));
         measureCommission.put("isRelationEAS", true);
         measureCommission.put("flowTo", "进厂");
         measureCommission.put("isDel", false);
@@ -67,20 +73,34 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
         measureCommission.put("IsAssembly", false);
         measureCommission.put("deliveryMethod", "磅重交货");
         measureCommission.put("packagesNum", 0);
-        //获取计量衡ID
-        map.put("calculateId", measureCommission.get("calculateId"));
-        measureCommission.remove("calculateId");
         map.put("materialId", measureCommission.get("materialId"));
         map.put("resultTotalId", measureCommission.get("resultTotalId"));
         measureCommission.remove("resultTotalId");
-        //添加计量委托实绩
-        int i = addMeasureCommission(map);
         //添加计量委托其他数据
-        System.out.println(measureCommission);
-//        i += sendMesToMeasure(measureCommission);
+//        int i = sendMesToMeasure(measureCommission);
+        int i = 1;
+        if(i == 1){
+            //添加计量委托实绩
+            addMeasureCommission(map);
+            updateTrainLoadResult(map);
+        }
         return i;
     }
 
+
+    /**
+     * 更新火车装车实绩
+     * @param map
+     * @return
+     */
+    public void updateTrainLoadResult(Map<String, Object> map){
+        TmstrainLoadingResult tmstrainLoadingResult = new TmstrainLoadingResult();
+        tmstrainLoadingResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        tmstrainLoadingResult.setSendRequest(new BigDecimal(2)); //更新委托已发送过
+        tmstrainLoadingResultMapper.updateByPrimaryKeySelective(tmstrainLoadingResult);
+    }
+
+
     /**
      * 查询没有发送过计量委托的车皮装车实绩并且到站是新区轨道衡和老区轨道衡的车皮装车实绩
      * @param map
@@ -102,7 +122,7 @@ public class TmstrainMeasureCommissionServiceImpl  implements ITmstrainMeasureCo
     public int addMeasureCommission(Map<String, Object> map){
         TmstrainMeasureCommission tmstrainMeasureCommission = new TmstrainMeasureCommission();
         tmstrainMeasureCommission.setId(tmstrainMeasureCommissionMapper.selectMaxId());
-        tmstrainMeasureCommission.setCalculateId(DataChange.dataToBigDecimal(map.get("calculateId")));
+        tmstrainMeasureCommission.setCalculateId(new BigDecimal(13));
         tmstrainMeasureCommission.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         tmstrainMeasureCommission.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         return tmstrainMeasureCommissionMapper.insertSelective(tmstrainMeasureCommission);

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

@@ -89,6 +89,7 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      * @param tmstrainWagonUnloadResult
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public int insertTmstrainWagonUnLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult){
         int i = 0;
         BigDecimal resultType = tmstrainWagonUnloadResult.getResultType();
@@ -107,7 +108,6 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
      * @param tmstrainWagonUnloadResult
      * @return
      */
-
     public int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
         //常规字段插入
         tmstrainWagonUnloadResult.setInsertUsername("admin");

src/main/resources/application-dev.yml

@@ -10,9 +10,9 @@ spring:
 openfeign:
   #测试环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8013}
 
 server:
 #测试环境

src/main/resources/bootstrap.yml

@@ -17,6 +17,9 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.dil.mapper.AmsPurchaseOrderMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsPurchaseOrder">
-    <id column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId" />
-    <result column="PURCHASE_ORDER_NO" jdbcType="VARCHAR" property="purchaseOrderNo" />
-    <result column="PURCHASE_FOREIGN_SHIP_NAME" jdbcType="VARCHAR" property="purchaseForeignShipName" />
-    <result column="PURCHASE_ORDER_DATE" jdbcType="TIMESTAMP" property="purchaseOrderDate" />
-    <result column="SUPPLIER_UNIT_ID" jdbcType="DECIMAL" property="supplierUnitId" />
-    <result column="PURCHASING_ORGANIZATION_ID" jdbcType="DECIMAL" property="purchasingOrganizationId" />
-    <result column="PURCHASE_ORDER_BUYER" jdbcType="VARCHAR" property="purchaseOrderBuyer" />
-    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
-    <result column="PUCHASE_ORDER_MATERIAL_NUMBER" jdbcType="DECIMAL" property="puchaseOrderMaterialNumber" />
-    <result column="RECEIVE_UNIT_ID" jdbcType="DECIMAL" property="receiveUnitId" />
-    <result column="PUCHASE_ORDER_DELIVERY_DATE" jdbcType="TIMESTAMP" property="puchaseOrderDeliveryDate" />
-    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-  </resultMap>
-  <sql id="columns">
-    PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, PURCHASE_FOREIGN_SHIP_NAME, PURCHASE_ORDER_DATE, 
-    SUPPLIER_UNIT_ID, PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER, MATERIAL_ID, 
-    PUCHASE_ORDER_MATERIAL_NUMBER, RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="columns_alias">
-    t.PURCHASE_ORDER_ID, t.PURCHASE_ORDER_NO, t.PURCHASE_FOREIGN_SHIP_NAME, t.PURCHASE_ORDER_DATE, 
-    t.SUPPLIER_UNIT_ID, t.PURCHASING_ORGANIZATION_ID, t.PURCHASE_ORDER_BUYER, t.MATERIAL_ID, 
-    t.PUCHASE_ORDER_MATERIAL_NUMBER, t.RECEIVE_UNIT_ID, t.PUCHASE_ORDER_DELIVERY_DATE, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM AMS_PURCHASE_ORDER
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM AMS_PURCHASE_ORDER t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="purchaseOrderId != null">
-        and PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
-        and PURCHASE_ORDER_NO = #{purchaseOrderNo}
-      </if>
-      <if test="purchaseForeignShipName != null and purchaseForeignShipName != ''">
-        and PURCHASE_FOREIGN_SHIP_NAME = #{purchaseForeignShipName}
-      </if>
-      <if test="purchaseOrderDate != null">
-        and TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = #{purchaseOrderDate}
-      </if>
-      <if test="supplierUnitId != null">
-        and SUPPLIER_UNIT_ID = #{supplierUnitId}
-      </if>
-      <if test="purchasingOrganizationId != null">
-        and PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
-      </if>
-      <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
-        and PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="puchaseOrderMaterialNumber != null">
-        and PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
-      </if>
-      <if test="receiveUnitId != null">
-        and RECEIVE_UNIT_ID = #{receiveUnitId}
-      </if>
-      <if test="puchaseOrderDeliveryDate != null">
-        and TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = #{puchaseOrderDeliveryDate}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="purchaseOrderId != null">
-        and PURCHASE_ORDER_ID = #{purchaseOrderId}
-      </if>
-      <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
-        and PURCHASE_ORDER_NO LIKE '%${purchaseOrderNo}%'
-      </if>
-      <if test="purchaseForeignShipName != null and purchaseForeignShipName != ''">
-        and PURCHASE_FOREIGN_SHIP_NAME LIKE '%${purchaseForeignShipName}%'
-      </if>
-      <if test="purchaseOrderDate != null">
-        and TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = #{purchaseOrderDate}
-      </if>
-      <if test="supplierUnitId != null">
-        and SUPPLIER_UNIT_ID = #{supplierUnitId}
-      </if>
-      <if test="purchasingOrganizationId != null">
-        and PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
-      </if>
-      <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
-        and PURCHASE_ORDER_BUYER LIKE '%${purchaseOrderBuyer}%'
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="puchaseOrderMaterialNumber != null">
-        and PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
-      </if>
-      <if test="receiveUnitId != null">
-        and RECEIVE_UNIT_ID = #{receiveUnitId}
-      </if>
-      <if test="puchaseOrderDeliveryDate != null">
-        and TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = #{puchaseOrderDeliveryDate}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        and INSERT_USERNAME LIKE '%${insertUsername}%'
-      </if>
-      <if test="insertTime != null">
-        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        and UPDATE_USERNAME LIKE '%${updateUsername}%'
-      </if>
-      <if test="updateTime != null">
-        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from AMS_PURCHASE_ORDER
-    where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from AMS_PURCHASE_ORDER
-    where 1!=1
-    <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
-      or PURCHASE_ORDER_NO = #{purchaseOrderNo}
-    </if>
-    <if test="purchaseForeignShipName != null and purchaseForeignShipName != ''">
-      or PURCHASE_FOREIGN_SHIP_NAME = #{purchaseForeignShipName}
-    </if>
-    <if test="purchaseOrderDate != null">
-      or TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = '#{purchaseOrderDate}'
-    </if>
-    <if test="supplierUnitId != null">
-      or SUPPLIER_UNIT_ID = #{supplierUnitId}
-    </if>
-    <if test="purchasingOrganizationId != null">
-      or PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
-    </if>
-    <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
-      or PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer}
-    </if>
-    <if test="materialId != null">
-      or MATERIAL_ID = #{materialId}
-    </if>
-    <if test="puchaseOrderMaterialNumber != null">
-      or PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
-    </if>
-    <if test="receiveUnitId != null">
-      or RECEIVE_UNIT_ID = #{receiveUnitId}
-    </if>
-    <if test="puchaseOrderDeliveryDate != null">
-      or TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = '#{puchaseOrderDeliveryDate}'
-    </if>
-    <if test="insertUsername != null and insertUsername != ''">
-      or INSERT_USERNAME = #{insertUsername}
-    </if>
-    <if test="insertTime != null">
-      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-    </if>
-    <if test="updateUsername != null and updateUsername != ''">
-      or UPDATE_USERNAME = #{updateUsername}
-    </if>
-    <if test="updateTime != null">
-      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-    </if>
-    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
-    insert into AMS_PURCHASE_ORDER (PURCHASE_ORDER_ID, PURCHASE_ORDER_NO,
-                                    PURCHASE_FOREIGN_SHIP_NAME, PURCHASE_ORDER_DATE,
-                                    SUPPLIER_UNIT_ID, PURCHASING_ORGANIZATION_ID,
-                                    PURCHASE_ORDER_BUYER, MATERIAL_ID, PUCHASE_ORDER_MATERIAL_NUMBER,
-                                    RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE,
-                                    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                    UPDATE_TIME, INSERT_UPDATE_REMARK)
-    values (#{purchaseOrderId,jdbcType=DECIMAL}, #{purchaseOrderNo,jdbcType=VARCHAR},
-            #{purchaseForeignShipName,jdbcType=VARCHAR}, #{purchaseOrderDate,jdbcType=TIMESTAMP},
-            #{supplierUnitId,jdbcType=DECIMAL}, #{purchasingOrganizationId,jdbcType=DECIMAL},
-            #{purchaseOrderBuyer,jdbcType=VARCHAR}, #{materialId,jdbcType=DECIMAL}, #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-            #{receiveUnitId,jdbcType=DECIMAL}, #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
-    insert into AMS_PURCHASE_ORDER
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="purchaseOrderId != null">
-        PURCHASE_ORDER_ID,
-      </if>
-      <if test="purchaseOrderNo != null">
-        PURCHASE_ORDER_NO,
-      </if>
-      <if test="purchaseForeignShipName != null">
-        PURCHASE_FOREIGN_SHIP_NAME,
-      </if>
-      <if test="purchaseOrderDate != null">
-        PURCHASE_ORDER_DATE,
-      </if>
-      <if test="supplierUnitId != null">
-        SUPPLIER_UNIT_ID,
-      </if>
-      <if test="purchasingOrganizationId != null">
-        PURCHASING_ORGANIZATION_ID,
-      </if>
-      <if test="purchaseOrderBuyer != null">
-        PURCHASE_ORDER_BUYER,
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID,
-      </if>
-      <if test="puchaseOrderMaterialNumber != null">
-        PUCHASE_ORDER_MATERIAL_NUMBER,
-      </if>
-      <if test="receiveUnitId != null">
-        RECEIVE_UNIT_ID,
-      </if>
-      <if test="puchaseOrderDeliveryDate != null">
-        PUCHASE_ORDER_DELIVERY_DATE,
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME,
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME,
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME,
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME,
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="purchaseOrderId != null">
-        #{purchaseOrderId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseOrderNo != null">
-        #{purchaseOrderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseForeignShipName != null">
-        #{purchaseForeignShipName,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseOrderDate != null">
-        #{purchaseOrderDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="supplierUnitId != null">
-        #{supplierUnitId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchasingOrganizationId != null">
-        #{purchasingOrganizationId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseOrderBuyer != null">
-        #{purchaseOrderBuyer,jdbcType=VARCHAR},
-      </if>
-      <if test="materialId != null">
-        #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="puchaseOrderMaterialNumber != null">
-        #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="receiveUnitId != null">
-        #{receiveUnitId,jdbcType=DECIMAL},
-      </if>
-      <if test="puchaseOrderDeliveryDate != null">
-        #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
-    update AMS_PURCHASE_ORDER
-    set PURCHASE_ORDER_NO = #{purchaseOrderNo,jdbcType=VARCHAR},
-        PURCHASE_FOREIGN_SHIP_NAME = #{purchaseForeignShipName,jdbcType=VARCHAR},
-        PURCHASE_ORDER_DATE = #{purchaseOrderDate,jdbcType=TIMESTAMP},
-        SUPPLIER_UNIT_ID = #{supplierUnitId,jdbcType=DECIMAL},
-        PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId,jdbcType=DECIMAL},
-        PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer,jdbcType=VARCHAR},
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-        PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-        RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
-        PUCHASE_ORDER_DELIVERY_DATE = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
-    where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
-    update AMS_PURCHASE_ORDER
-    <set>
-      <if test="purchaseOrderNo != null">
-        PURCHASE_ORDER_NO = #{purchaseOrderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseForeignShipName != null">
-        PURCHASE_FOREIGN_SHIP_NAME = #{purchaseForeignShipName,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseOrderDate != null">
-        PURCHASE_ORDER_DATE = #{purchaseOrderDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="supplierUnitId != null">
-        SUPPLIER_UNIT_ID = #{supplierUnitId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchasingOrganizationId != null">
-        PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId,jdbcType=DECIMAL},
-      </if>
-      <if test="purchaseOrderBuyer != null">
-        PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer,jdbcType=VARCHAR},
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="puchaseOrderMaterialNumber != null">
-        PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="receiveUnitId != null">
-        RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
-      </if>
-      <if test="puchaseOrderDeliveryDate != null">
-        PUCHASE_ORDER_DELIVERY_DATE = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUsername != null">
-        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="insertTime != null">
-        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUsername != null">
-        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="insertUpdateRemark != null">
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
-  </select>
-  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
-  </select>
-  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
-  </select>
-  <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMS_PURCHASE_ORDER
-    (PURCHASE_ORDER_ID,
-    PURCHASE_ORDER_NO, PURCHASE_FOREIGN_SHIP_NAME,
-    PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
-    PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER,
-    MATERIAL_ID, PUCHASE_ORDER_MATERIAL_NUMBER,
-    RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE,
-    INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.purchaseOrderId,jdbcType=DECIMAL},
-    #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.purchaseForeignShipName,jdbcType=VARCHAR},
-    #{item.purchaseOrderDate,jdbcType=TIMESTAMP}, #{item.supplierUnitId,jdbcType=DECIMAL},
-    #{item.purchasingOrganizationId,jdbcType=DECIMAL}, #{item.purchaseOrderBuyer,jdbcType=VARCHAR},
-    #{item.materialId,jdbcType=DECIMAL}, #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-    #{item.receiveUnitId,jdbcType=DECIMAL}, #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update AMS_PURCHASE_ORDER
-    set
-    PURCHASE_ORDER_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
-    </foreach>
-    ,PURCHASE_ORDER_NO=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderNo,jdbcType=VARCHAR}
-    </foreach>
-    ,PURCHASE_FOREIGN_SHIP_NAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseForeignShipName,jdbcType=VARCHAR}
-    </foreach>
-    ,PURCHASE_ORDER_DATE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderDate,jdbcType=TIMESTAMP}
-    </foreach>
-    ,SUPPLIER_UNIT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.supplierUnitId,jdbcType=DECIMAL}
-    </foreach>
-    ,PURCHASING_ORGANIZATION_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchasingOrganizationId,jdbcType=DECIMAL}
-    </foreach>
-    ,PURCHASE_ORDER_BUYER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderBuyer,jdbcType=VARCHAR}
-    </foreach>
-    ,MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-    </foreach>
-    ,PUCHASE_ORDER_MATERIAL_NUMBER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL}
-    </foreach>
-    ,RECEIVE_UNIT_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.receiveUnitId,jdbcType=DECIMAL}
-    </foreach>
-    ,PUCHASE_ORDER_DELIVERY_DATE=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
-      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    where PURCHASE_ORDER_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.purchaseOrderId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from AMS_PURCHASE_ORDER
-    where PURCHASE_ORDER_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
-      #{id}
-    </foreach>
-  </delete>
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <sql id="orderBy">
-    <if test="orderField != null and orderField != ''">
-      order by  "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
-    </if>
-  </sql>
-  <select id="selectMaxId"  resultType="java.math.BigDecimal">
-    select max(PURCHASE_ORDER_ID) from AMS_PURCHASE_ORDER
-  </select>
-</mapper>

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

@@ -27,13 +27,14 @@
     <result column="TRAIN_CALCULATE_ID" jdbcType="DECIMAL" property="trainCalculateId" />
     <result column="UNLOADING_POINT_ID" jdbcType="DECIMAL" property="unloadingPointId" />
     <result column="SEND_UNIT_ID" jdbcType="DECIMAL" property="sendUnitId" />
+    <result column="SEND_REQUEST" jdbcType="DECIMAL" property="sendRequest" />
   </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, 
-    RESULT_TYPE, TRAIN_CALCULATE_ID, UNLOADING_POINT_ID, SEND_UNIT_ID
+    RESULT_TYPE, TRAIN_CALCULATE_ID, UNLOADING_POINT_ID, SEND_UNIT_ID, SEND_REQUEST
   </sql>
   <sql id="columns_alias">
     t.RESULT_ID, t.PURCHASE_ORDER_RAIL_PLAN_ID, t.RESULT_WAGON_NO, t.RESULT_BILLABLE_TONNAGE, 
@@ -41,7 +42,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_UNIT_ID, t.SEND_REQUEST
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRAIN_LOADING_RESULT
@@ -126,6 +127,9 @@
       <if test="sendUnitId != null">
         and SEND_UNIT_ID = #{sendUnitId}
       </if>
+      <if test="sendRequest != null">
+        and SEND_REQUEST = #{sendRequest}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -205,6 +209,9 @@
       <if test="sendUnitId != null">
         and SEND_UNIT_ID = #{sendUnitId}
       </if>
+      <if test="sendRequest != null">
+        and SEND_REQUEST = #{sendRequest}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -286,6 +293,9 @@
     <if test="sendUnitId != null">
       or SEND_UNIT_ID = #{sendUnitId}
     </if>
+    <if test="sendRequest != null">
+      or SEND_REQUEST = #{sendRequest}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT (RESULT_ID, PURCHASE_ORDER_RAIL_PLAN_ID,
@@ -296,7 +306,8 @@
                                          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)
+                                         UNLOADING_POINT_ID, SEND_UNIT_ID, SEND_REQUEST
+    )
     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},
@@ -305,7 +316,8 @@
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{sendStationId,jdbcType=DECIMAL},
             #{arrivalStationId,jdbcType=DECIMAL}, #{resultType,jdbcType=DECIMAL}, #{trainCalculateId,jdbcType=DECIMAL},
-            #{unloadingPointId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL})
+            #{unloadingPointId,jdbcType=DECIMAL}, #{sendUnitId,jdbcType=DECIMAL}, #{sendRequest,jdbcType=DECIMAL}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
     insert into TMSTRAIN_LOADING_RESULT
@@ -385,6 +397,9 @@
       <if test="sendUnitId != null">
         SEND_UNIT_ID,
       </if>
+      <if test="sendRequest != null">
+        SEND_REQUEST,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -462,6 +477,9 @@
       <if test="sendUnitId != null">
         #{sendUnitId,jdbcType=DECIMAL},
       </if>
+      <if test="sendRequest != null">
+        #{sendRequest,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -489,7 +507,8 @@
         RESULT_TYPE = #{resultType,jdbcType=DECIMAL},
         TRAIN_CALCULATE_ID = #{trainCalculateId,jdbcType=DECIMAL},
         UNLOADING_POINT_ID = #{unloadingPointId,jdbcType=DECIMAL},
-        SEND_UNIT_ID = #{sendUnitId,jdbcType=DECIMAL}
+        SEND_UNIT_ID = #{sendUnitId,jdbcType=DECIMAL},
+        SEND_REQUEST = #{sendRequest,jdbcType=DECIMAL}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainLoadingResult">
@@ -567,6 +586,9 @@
       <if test="sendUnitId != null">
         SEND_UNIT_ID = #{sendUnitId,jdbcType=DECIMAL},
       </if>
+      <if test="sendRequest != null">
+        SEND_REQUEST = #{sendRequest,jdbcType=DECIMAL},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -595,7 +617,8 @@
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED, SEND_STATION_ID, ARRIVAL_STATION_ID,
     RESULT_TYPE, TRAIN_CALCULATE_ID,
-    UNLOADING_POINT_ID, SEND_UNIT_ID)
+    UNLOADING_POINT_ID, SEND_UNIT_ID,
+    SEND_REQUEST)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.resultId,jdbcType=DECIMAL},
@@ -609,7 +632,8 @@
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.deleted,jdbcType=DECIMAL}, #{item.sendStationId,jdbcType=DECIMAL}, #{item.arrivalStationId,jdbcType=DECIMAL},
     #{item.resultType,jdbcType=DECIMAL}, #{item.trainCalculateId,jdbcType=DECIMAL},
-    #{item.unloadingPointId,jdbcType=DECIMAL}, #{item.sendUnitId,jdbcType=DECIMAL} from dual
+    #{item.unloadingPointId,jdbcType=DECIMAL}, #{item.sendUnitId,jdbcType=DECIMAL},
+    #{item.sendRequest,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -715,6 +739,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
       when #{item.resultId,jdbcType=DECIMAL} then #{item.sendUnitId,jdbcType=DECIMAL}
     </foreach>
+    ,SEND_REQUEST=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.sendRequest,jdbcType=DECIMAL}
+    </foreach>
     where RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.resultId,jdbcType=DECIMAL}
@@ -743,22 +771,26 @@
             r_a_arrival.ARRIVAL_NAME "arrivalStationName",
             t_load.RESULT_BILLABLE_TONNAGE "resultBillableTonnage",
             t_load.RESULT_ISCLEAR "resultIsclear",
+            t_load.DELETED  "deleted",
             t_load.RESULT_REMARKS "resultRemarks",
             RS.SUPPLIER_NAME "supplierName",
-            t_load.INSERT_TIME "insertTime"
+            t_load.INSERT_TIME "insertTime",
+            TTR.TRANSPORT_NUM   "transportNum"
     from TMSTRAIN_LOADING_RESULT t_load
+    left join TMSTRAIN_TOTAL_RESULT TTR
+        on TTR.LOADING_ID = t_load.RESULT_ID
     left join AMS_PURCHASE_ORDER a_order
-    on t_load.PURCHASE_ORDER_RAIL_PLAN_ID=a_order.PURCHASE_ORDER_ID
+        on t_load.PURCHASE_ORDER_RAIL_PLAN_ID=a_order.PURCHASE_ORDER_ID
     left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = t_load.SEND_UNIT_ID
     left join DIL_BATCH d_batch
         on t_load.BATCH_ID=d_batch.BATCH_ID
     left join RMS_MATERIAL r_material
-    on t_load.MATERIAL_ID = r_material.MATERIAL_ID
+        on t_load.MATERIAL_ID = r_material.MATERIAL_ID
     left join RMSTRAIN_ARRIVAL_SEND r_s_arrival
-    on r_s_arrival.ARRIVAL_ID=t_load.SEND_STATION_ID
+        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
+        on r_a_arrival.ARRIVAL_ID=t_load.ARRIVAL_STATION_ID
     where t_load.DELETED in (0, 2) and t_load.RESULT_TYPE = #{resultType}
     )
     <where>
@@ -960,10 +992,16 @@
       t_load.RESULT_LOADING_DATE "resultLoadingDate",
       t_load.BATCH_ID "batchId",
       t_load.RESULT_REMARKS "resultRemarks",
-      t_load.RESULT_WAGON_NO "resultWagonNo"
+      t_load.RESULT_WAGON_NO "resultWagonNo",
+      RASARR.ARRIVAL_NAME   "arrivalName",
+      RASSEND.ARRIVAL_NAME  "sendName"
     from TMSTRAIN_LOADING_RESULT t_load
     left join AMS_PURCHASE_ORDER APO
     on APO.PURCHASE_ORDER_ID = t_load.PURCHASE_ORDER_RAIL_PLAN_ID
+    left join RMSTRAIN_ARRIVAL_SEND RASARR
+    on t_load.ARRIVAL_STATION_ID = RASARR.ARRIVAL_ID
+    left join RMSTRAIN_ARRIVAL_SEND RASSEND
+    on t_load.SEND_STATION_ID = RASSEND.ARRIVAL_ID
     where t_load.RESULT_ID = #{resultId}
   </select>
 

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

@@ -345,9 +345,7 @@
   <select id="getTrainMeasureCommission" parameterType="map" resultType="java.util.Map">
     select
       APO.PURCHASE_ORDER_NO   "purchaseOrder",
-      TLR.RESULT_WAGON_NO         "transportNum",
       TLR.RESULT_WAGON_NO      "carNum",
-      RTC.TRUCK_CALCULATE_NUMBER "steelyardNum",
       RS.SUPPLIER_NAME            "sendUnit",
       RSH.SHIPPER_NAME            "ReceivUnit",
       RM.MATERIAL_NAME            "materiaName",
@@ -357,8 +355,7 @@
       TLR.INSERT_UPDATE_REMARK    "demo",
       DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
       TLR.UNLOADING_POINT_ID "unloadPointId",
-      TTR.TOTAL_RESULT_ID          "resultTotalId",
-      TLR.TRAIN_CALCULATE_ID        "calculateId"
+      TTR.TOTAL_RESULT_ID          "resultTotalId"
     from TMSTRAIN_LOADING_RESULT TLR
            left join AMS_PURCHASE_ORDER APO
                      on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
@@ -370,8 +367,6 @@
                      on RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
            left join RMS_MATERIAL RM
                      on RM.MATERIAL_ID = DB.MATERIAL_ID
-           left join RMS_TRUCK_CALCULATE RTC
-                     on RTC.TRUCK_CALCULATE_ID = TLR.TRAIN_CALCULATE_ID
            left join RMS_WAREHOUSE RW
                      on RW.WAREHOUSE_ID = TLR.UNLOADING_POINT_ID
            left join TMSTRAIN_TOTAL_RESULT TTR
@@ -398,7 +393,8 @@
                   TLR.RESULT_ISCLEAR                             "resultIsclear",
                   TLR.RESULT_REMARKS                             "resultRemarks",
                   RS.SUPPLIER_NAME                               "supplierName",
-                  TLR.INSERT_TIME                                "insertTime"
+                  TLR.INSERT_TIME                                "insertTime",
+                  TTR.TRANSPORT_NUM                              "transportNum"
            from TMSTRAIN_LOADING_RESULT TLR
                   left join AMS_PURCHASE_ORDER APO
                             on TLR.PURCHASE_ORDER_RAIL_PLAN_ID = APO.PURCHASE_ORDER_ID
@@ -416,10 +412,8 @@
                             on TTR.LOADING_ID = TLR.RESULT_ID
            where TLR.DELETED = 0
              and TLR.RESULT_TYPE = #{resultType}
-             and TLR.ARRIVAL_STATION_ID in (3, 4) --新区轨道衡和老区轨道衡的ID
-             and not exists ( select TMC.COMMSSION_ID
-                             from TMSTRAIN_MEASURE_COMMISSION TMC
-                             where TMC.RESULT_TOTAL_ID = TTR.TOTAL_RESULT_ID)
+             and TLR.SEND_REQUEST = 1
+             and APO.PURCHASE_ORDER_NO IS NOT NULL
          )
 
     <where>

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

@@ -602,12 +602,7 @@
         on t1.TO_THE_STATION_ID = t4.ARRIVAL_ID
 
         where  t1.RESULT_TYPE = #{resultType}
-        <if  test="status == 0">
-            and t1.STATUS = 0
-        </if>
-        <if  test="resultType == 1">
-            and t1.RESULT_TYPE in (1, 2)
-        </if>
+                and t1.status = #{status}
         )
         <where>
             <if test="resultId != null">
@@ -712,7 +707,9 @@
         t2.SUPPLIER_NAME "shipperName",
         t1.RESULT_CATEGORY "resultCategory",
         t3.ARRIVAL_NAME "forwardName",
-        t4.ARRIVAL_NAME "arrivalName"
+        t4.ARRIVAL_NAME "arrivalName",
+        TO_CHAR(t1.RESULT_PLEASE_DATE, 'yyyy-mm-dd')   "resultPleaseDate",
+        t1.RESULT_PLEASE_NUMBER "resultPleaseNumber"
         from TMSTRAIN_PLEASE_APPROVE_RESULT t1
         left join RMS_SUPPLIER t2
         on t1.SUPPLIER_ID = t2.SUPPLIER_ID
@@ -800,9 +797,15 @@
                APAR.RAIL_PLAN_ID          "railPlanId",
                APAR.RESULT_PLEASE_DATE    "resultPleaseDate",
                APAR.RESULT_APPROVE_DATE   "resultApproveDate",
-               APAR.RESULT_APPROVE_NUMBER "resultApproveNumber"
+               APAR.RESULT_APPROVE_NUMBER "resultApproveNumber",
+               RASARR.ARRIVAL_NAME   "arrivalName",
+               RASSEND.ARRIVAL_NAME  "sendName"
         from TMSTRAIN_PLEASE_APPROVE_RESULT APAR
         left join RMS_SUPPLIER RS on RS.SUPPLIER_ID = APAR.SUPPLIER_ID
+        left join RMSTRAIN_ARRIVAL_SEND RASARR
+                  on APAR.TO_THE_STATION_ID = RASARR.ARRIVAL_ID
+        left join RMSTRAIN_ARRIVAL_SEND RASSEND
+                  on APAR.SEND_STATION_ID = RASSEND.ARRIVAL_ID
         where RESULT_ID = #{resultId}
     </select>
 

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

@@ -13,15 +13,17 @@
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="TRANSPORT_NUM" jdbcType="VARCHAR" property="transportNum" />
   </resultMap>
   <sql id="columns">
     TOTAL_RESULT_ID, LOADING_ID, UNLOADING_ID, RESULT_TOTAL_STAY_DURATION, STANDARD_DATA_ID, 
-    RESULT_OUTLIER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    RESULT_OUTLIER, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    TRANSPORT_NUM
   </sql>
   <sql id="columns_alias">
     t.TOTAL_RESULT_ID, t.LOADING_ID, t.UNLOADING_ID, t.RESULT_TOTAL_STAY_DURATION, t.STANDARD_DATA_ID, 
     t.RESULT_OUTLIER, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK
+    t.INSERT_UPDATE_REMARK, t.TRANSPORT_NUM
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRAIN_TOTAL_RESULT
@@ -64,6 +66,9 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
       </if>
+      <if test="transportNum != null and transportNum != ''">
+        and TRANSPORT_NUM = #{transportNum}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -101,9 +106,12 @@
       <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
         and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
       </if>
+      <if test="transportNum != null and transportNum != ''">
+        and TRANSPORT_NUM LIKE '%${transportNum}%'
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from TMSTRAIN_TOTAL_RESULT
     where TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL}
   </delete>
@@ -140,18 +148,21 @@
     <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
       or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
     </if>
+    <if test="transportNum != null and transportNum != ''">
+      or TRANSPORT_NUM = #{transportNum}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainTotalResult">
     insert into TMSTRAIN_TOTAL_RESULT (TOTAL_RESULT_ID, LOADING_ID, UNLOADING_ID,
                                        RESULT_TOTAL_STAY_DURATION, STANDARD_DATA_ID,
                                        RESULT_OUTLIER, INSERT_USERNAME, INSERT_TIME,
-                                       UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-    )
+                                       UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                       TRANSPORT_NUM)
     values (#{totalResultId,jdbcType=DECIMAL}, #{loadingId,jdbcType=DECIMAL}, #{unloadingId,jdbcType=DECIMAL},
             #{resultTotalStayDuration,jdbcType=DECIMAL}, #{standardDataId,jdbcType=DECIMAL},
             #{resultOutlier,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}
-           )
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+            #{transportNum,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainTotalResult">
     insert into TMSTRAIN_TOTAL_RESULT
@@ -189,6 +200,9 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK,
       </if>
+      <if test="transportNum != null">
+        TRANSPORT_NUM,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="totalResultId != null">
@@ -224,6 +238,9 @@
       <if test="insertUpdateRemark != null">
         #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="transportNum != null">
+        #{transportNum,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainTotalResult">
@@ -237,7 +254,8 @@
         INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        TRANSPORT_NUM = #{transportNum,jdbcType=VARCHAR}
     where TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainTotalResult">
@@ -273,10 +291,13 @@
       <if test="insertUpdateRemark != null">
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       </if>
+      <if test="transportNum != null">
+        TRANSPORT_NUM = #{transportNum,jdbcType=VARCHAR},
+      </if>
     </set>
     where TOTAL_RESULT_ID = #{totalResultId,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 TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL}
   </select>
@@ -288,7 +309,6 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
-
   <insert id="batchInsert" parameterType="java.util.List">
     insert into TMSTRAIN_TOTAL_RESULT
     (TOTAL_RESULT_ID,
@@ -296,7 +316,8 @@
     STANDARD_DATA_ID, RESULT_OUTLIER,
     INSERT_USERNAME, INSERT_TIME,
     UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK)
+    INSERT_UPDATE_REMARK, TRANSPORT_NUM
+    )
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.totalResultId,jdbcType=DECIMAL},
@@ -304,7 +325,8 @@
     #{item.standardDataId,jdbcType=DECIMAL}, #{item.resultOutlier,jdbcType=DECIMAL},
     #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
     #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-    #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.transportNum,jdbcType=VARCHAR}
+    from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -354,6 +376,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case TOTAL_RESULT_ID" separator=" ">
       when #{item.totalResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
     </foreach>
+    ,TRANSPORT_NUM=
+    <foreach close="end" collection="list" index="index" item="item" open="case TOTAL_RESULT_ID" separator=" ">
+      when #{item.totalResultId,jdbcType=DECIMAL} then #{item.transportNum,jdbcType=VARCHAR}
+    </foreach>
     where TOTAL_RESULT_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.totalResultId,jdbcType=DECIMAL}