结算

pom.xml

@@ -151,12 +151,12 @@
                 <version>3.0</version>
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
-                    <user>dil</user>
-                    <password>Dil123789</password>
+                    <user>dagang</user>
+                    <password>root123</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TMSTRUCK_TARE_RETURN_RESULT</param>
+                        <param>TMSTRUCK_LOAD_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -306,6 +306,23 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
+    @ApiOperation("装载机所装车辆重量统计报表")
+    @PostMapping("/getLoaderResult")
+    public RESTfulResult getLoaderResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                    Integer apiId,//apiId:463
+                                    Integer pageNum,
+                                    Integer pageSize,
+                                    String startTime,
+                                    String endTime){
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getLoaderResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
+
     @ApiOperation("对内转车辆装卸货点进行统计")
     @PostMapping("/getUnLoading")
     public RESTfulResult getUnLoading(@RequestBody(required=false) Map<String,Object> mapValue,

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

@@ -147,6 +147,10 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return success("装货成功");
             }else if(i == -2){
                 return failed("已装过此物资");
+            }else if(i == -3) {
+                return failed("该订单没有装货作业");
+            }else if (i==-5){
+                return failed("请勿重复装车");
             }else {
                 return failed("装货异常，请联系管理员！");
             }

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

@@ -3,6 +3,7 @@ import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckTimeTaskResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +44,7 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     @ApiOperation(value="司机申请开始")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
@@ -59,9 +62,11 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
     @PostMapping("/addTimeTaskResult")
     public RESTfulResult addTimeTaskResult(@RequestBody(required=false) Map<String,Object> mapValue) throws Exception {
         int i=0;
+        if (i==-1){
+            return failed("生成账单失败");
+        }
         try {
             i=tmstruckTimeTaskResultService.addTimeTaskResult(mapValue);
-
         } catch (Exception e) {
             return failed(e.getMessage());
         }
@@ -205,8 +210,11 @@ public class TmstruckTimeTaskResultController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           String con,
-                                          String userId
+                                          String userId,
+                                          String startTime,
+                                          String endTime
     ){
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         if (con!=null&&!con.equals("undifined")&&!con.equals("")){
             mapValue.put("con","%" + con + "%");
         }

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

@@ -85,13 +85,15 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
     @PostMapping("/updateUnloadResult")
-    public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue){
+    public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue) throws Exception {
         int i = tmstruckUnloadResultService.updateUnloadResult(mapValue);
         if(i > 0){
             return success("卸货成功！");
         }else if(i == -2){
             return failed("已卸过此物资");
-        }else {
+        }else if(i == -3){
+            return failed("该订单没有卸货作业");
+        } else{
             return failed("卸货失败，请联系管理员！");
         }
     }

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

@@ -20,5 +20,5 @@ public interface BmsTruckFeign {
     public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
-    int addDetailsOrder(Map<String,Object> map);
+    Map<String,Object> addDetailsOrder(Map<String,Object> map);
 }

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

@@ -42,4 +42,7 @@ public interface StatisticalReportMapper {
     List<Map<String, Object>> getUnLoading(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getLXReportResult(Map<String, Object> mapValue);
+
+    //获取装机统计报表
+    List<Map<String,Object>> getLoaderResult(Map<String,Object> map);
 }

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

@@ -87,7 +87,7 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     TangXiaoFeng
      */
     //通过物资ID和总实绩Id查询唯一的装车实绩Id
-    Map<String, Object> getLoadResultIdByMIdAndTotalId(@Param("resultTotalId") Integer resultTotalId, @Param("materialId") Integer materialId);
+    Map<String, Object> getLoadResultIdByMIdAndTotalId(Map<String, Object> map);
 
     //通过物资ID和订单Id查询唯一的装车实绩Id
     Integer getLoadIdByOrderIdAndMId(Map<String, Object> map);

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

@@ -32,7 +32,7 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
     BigDecimal getResultIdByTotalId(BigDecimal totalId);
 
     //通过运输订单号查询 实绩Id 和总实绩Id
-    Map<String, Object> selectTotalIdByOrderNo(String orderNumber);
+    Map<String, Object> selectUnloadMesByOrderNo(Map<String, Object> map);
 
     //通过卸货地点查询仓库Id
     BigDecimal getWarehouseIdByWName(String warehouseName);

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

@@ -62,7 +62,6 @@ public interface UtilsMapper {
     BigDecimal getTotalIdByOrderNumber(String orderNumber);
 
 
-
     //通过总实绩ID查找订单类型
     Map<String, Object> getOrderTypeByTotalId(BigDecimal resultTotalId);
 
@@ -120,7 +119,16 @@ public interface UtilsMapper {
    //通过运输订单id查找计时是否开始
     BigDecimal getTime(BigDecimal orderId);
 
+    //通过运输订单id查找计时开始时间
     BigDecimal getInwardStartTime(BigDecimal orderId);
 
+    //通过运输订单id查找计时结束时间
     BigDecimal getInwardEndTime(BigDecimal orderId);
+
+    //通过userId查找运力名字
+    String getCapacityNameBySsoId(String userId);
+
+    //通过车牌号和运输订单号去寻找装车实绩
+    BigDecimal getLoadResultId(Map<String,Object> map);
+
 }

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

@@ -147,6 +147,12 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="集装箱箱号",required=false)
     private String caseNumber;
 
+    @ApiModelProperty(value="集装箱箱号2",required=false)
+    private String caseNumbertwo;
+
+    @ApiModelProperty(value="车型备注",required=false)
+    private String capacityRemark;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -175,6 +181,14 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         this.resultTotalId = resultTotalId;
     }
 
+    public String getCaseNumbertwo() {
+        return caseNumbertwo;
+    }
+
+    public void setCaseNumbertwo(String caseNumbertwo) {
+        this.caseNumbertwo = caseNumbertwo;
+    }
+
     public Date getResultLoadStartTime() {
         return resultLoadStartTime;
     }
@@ -343,37 +357,42 @@ public class TmstruckLoadResult implements IBasePO<BigDecimal> {
         this.caseNumber = caseNumber == null ? null : caseNumber.trim();
     }
 
+    public String getCapacityRemark() {
+        return capacityRemark;
+    }
+
+    public void setCapacityRemark(String capacityRemark) {
+        this.capacityRemark = capacityRemark;
+    }
+
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", resultId=").append(resultId);
-        sb.append(", resultTotalId=").append(resultTotalId);
-        sb.append(", resultLoadStartTime=").append(resultLoadStartTime);
-        sb.append(", resultLoadEndTime=").append(resultLoadEndTime);
-        sb.append(", resultLoadDuration=").append(resultLoadDuration);
-        sb.append(", loadStandardTimeId=").append(loadStandardTimeId);
-        sb.append(", loaderId=").append(loaderId);
-        sb.append(", resultIsclear=").append(resultIsclear);
-        sb.append(", deleteName=").append(deleteName);
-        sb.append(", deleteTime=").append(deleteTime);
-        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(", status=").append(status);
-        sb.append(", resultMeasuredTonnage=").append(resultMeasuredTonnage);
-        sb.append(", loadingId=").append(loadingId);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", loadingSequence=").append(loadingSequence);
-        sb.append(", isdeduct=").append(isdeduct);
-        sb.append(", segmentSqe=").append(segmentSqe);
-        sb.append(", caseNumber=").append(caseNumber);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+        return "TmstruckLoadResult{" +
+                "resultId=" + resultId +
+                ", resultTotalId=" + resultTotalId +
+                ", resultLoadStartTime=" + resultLoadStartTime +
+                ", resultLoadEndTime=" + resultLoadEndTime +
+                ", resultLoadDuration=" + resultLoadDuration +
+                ", loadStandardTimeId=" + loadStandardTimeId +
+                ", loaderId=" + loaderId +
+                ", resultIsclear='" + resultIsclear + '\'' +
+                ", deleteName='" + deleteName + '\'' +
+                ", deleteTime=" + deleteTime +
+                ", insertUsername='" + insertUsername + '\'' +
+                ", insertTime=" + insertTime +
+                ", updateUsername='" + updateUsername + '\'' +
+                ", updateTime=" + updateTime +
+                ", insertUpdateRemark='" + insertUpdateRemark + '\'' +
+                ", status=" + status +
+                ", resultMeasuredTonnage=" + resultMeasuredTonnage +
+                ", loadingId=" + loadingId +
+                ", materialId=" + materialId +
+                ", loadingSequence=" + loadingSequence +
+                ", isdeduct=" + isdeduct +
+                ", segmentSqe=" + segmentSqe +
+                ", caseNumber='" + caseNumber + '\'' +
+                ", caseNumbertwo='" + caseNumbertwo + '\'' +
+                ", capacityRemark='" + capacityRemark + '\'' +
+                '}';
     }
 }

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

@@ -43,5 +43,7 @@ public interface IStatisticalReportService {
     List<Map<String, Object>> getLoading(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getUnLoading(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getLoaderResult(Map<String, Object> mapValue);
 }
 

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

@@ -47,6 +47,9 @@ public interface ITmstruckLoadResultService{
     //修改装车作业作业点
     int updateLoadingIds(List<Map<String, Object>> map);
 
+    //新增装车备注
+    int addCapacityRemark(Map<String,Object> map);
+
     //销售查询所有的装车实绩
     List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
 

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

@@ -59,6 +59,9 @@ public interface ITmstruckTimeTaskResultService {
 
     int JudgeTimeTaskPause(Map<String, Object> mapValue) throws Exception;
 
+    //生成账单
+    int genernateInwardTime(Map<String,Object> map);
+
 
     //修改计时作业
 //    int updateTimeTaskResult(Map<String,Object> map);

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

@@ -27,7 +27,7 @@ public interface ITmstruckUnloadResultService{
     int addUnloadResult(Map<String, Object> map);
 
     // 修改实绩内容
-    int updateUnloadResult(Map<String, Object> map);
+    int updateUnloadResult(Map<String, Object> map) throws Exception;
 
     //新增卸货实绩
     int addUnloadresultForconverted(Map<String,Object> map);

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

@@ -169,4 +169,9 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         return statisticalReportMapper.getUnLoading(mapValue);
     }
 
+    @Override
+    public List<Map<String, Object>> getLoaderResult(Map<String, Object> mapValue) {
+        return statisticalReportMapper.getLoaderResult(mapValue);
+    }
+
 }

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

@@ -159,15 +159,16 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         if(orderType == 11){//内转计时调用方法
             return orderType11Use(map, mesMap, capacityNumber, resultTotalId);
-        } else if (orderType == 21){//调用计时作业方法
-            return orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(map.get("orderId")));
+        }
+        else if (orderType == 21){//调用计时作业方法
+            return orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
         }
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber);
         if(selectMap == null){
             throw new Exception("该车已进厂！！");
         }else{
             BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
-            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(selectMap.get("orderSegmentSqe"));
+            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
             //如果当前路段顺序号 +1 不等于进厂路段顺序号 则不允许进厂 （针对同一路线多次进厂情况）
             if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
                 throw  new Exception("作业环节未到进厂！");

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

@@ -184,7 +184,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             throw new Exception("该车已出厂！！");
         }else{
             BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));
-            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(selectMap.get("orderSegmentSqe"));
+            BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
             //如果当前路段顺序号 +1 不等于出厂路段顺序号 则不允许出厂
             if(segmentSqe.intValue() != (orderSegmentSqe.intValue() + 1)){
                 throw  new Exception("该车作业环节未全部完成！");

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

@@ -38,6 +38,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
+    @Autowired
+    private TmstruckTimeTaskResultServiceImpl tmstruckTimeTaskResultService;
+
     @Autowired
     private TmstruckReturnResultMapper tmstruckReturnResultMapper;
 
@@ -47,6 +50,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
 
+    @Autowired
+    private TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
+
     @Autowired
     private WmshBoundFeign wmshBoundFeign;
 
@@ -153,7 +159,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         BigDecimal resultTotalId = (BigDecimal) orderMap.get("resultTotalId");
         map.put("resultTotalId", resultTotalId.intValue());
         //通过总实绩ID与物资ID查找 装车实绩主键ID
-        Map<String, Object> resultIdMap = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), materialId.intValue());
+        Map<String, Object> resultIdMap = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(null);
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         tmstruckLoadResult.setStatus(new BigDecimal(0)); // 添加状态0:正常
         //编辑装车实绩主键ID对应的各个字段
@@ -199,7 +205,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      */
     @Transactional
     public int addXS2LoadResult(Map<String, Object> map) throws Exception {
-
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
@@ -219,18 +225,38 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             utilsService.updateOrderLineSqeByOrderNumber(mesMap);
             //推送消息到websocket
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
+            BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
+            int i1 = addCapacityRemark(map);
+            if (i1==-5){
+                return -5;
+            }
+            //根据运输订单查找需求备注
+            Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
+            String remark =(String) remarkMap.get("remark");
+            if (remark.contains("计时")){
+                //判断计时是否开始
+                BigDecimal startTime = utilsMapper.getTime(DataChange.dataToBigDecimal(orderId));
+                if (startTime==null){
+                    map.put("inwardTypes",1);
+                    tmstruckTimeTaskResultService.addTimeTaskResult(map);
+                }
+            }
             return i;
         }
         //如果是零星多拼订单 需要查询这个物资是否已经装过了
         if(orderType == 12 || orderType == 13){
+            mesMap.put("updateUnloadResult", 1);
             Integer checkMaterial = tmstruckLoadResultMapper.checkMaterialIdLoad(resultTotalId, DataChange.dataToBigDecimal(map.get("materialId")));
             if(checkMaterial != null){
-                return -2;
+                return -2; //已装过此物资
             }
         }
+        Map<String, Object> dataMap = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(mesMap);
+        if(dataMap == null){
+            return -3; //该订单没有装车作业
+        }
         //查询装车实绩ID
-        map.putAll(tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), null));
-        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        map.putAll(dataMap);
         tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         tmstruckLoadResult.setStatus(new BigDecimal(0));
         tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
@@ -249,6 +275,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             if(personnelId != null){
                 tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
             }
+
         }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
@@ -262,6 +289,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             }
             tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
         }
+        addCapacityRemark(map);
         tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
         tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket
@@ -401,6 +429,26 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return i;
     }
 
+    @Override
+    public int addCapacityRemark(Map<String, Object> map) {
+        int i=0;
+        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId") );
+        if (capacityName!=null) {
+            //通过车牌去寻找装货实绩,减少多次装货
+            map.put("capacityName", capacityName);
+            BigDecimal loadResultId = utilsMapper.getLoadResultId(map);
+            if (loadResultId == null) {
+                tmstruckLoadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+                tmstruckLoadResult.setCapacityRemark(capacityName);
+                i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+            }else {
+                i=-5;
+            }
+        }
+        return i;
+    }
+
     /**
      * 查询销售合同装车实绩
      * @param map
@@ -419,7 +467,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //设置主键id
         tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-
         //获取开始时间
         Date startTime = (Date) map.get("startTime");
         //获取运输订单号

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

@@ -343,6 +343,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         addMeasureCommission(map); // 添加计量委托
         /*访问接口发送数据*/
         return sendMesToMeasure(measureCommission);
+//        return 1;
 
     }
 
@@ -406,6 +407,12 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
                 if(measureCommission == null)
                     return 0;
+                if(orderType.intValue() == 14){
+                    Integer weightResultCount14 = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+                    if(weightResultCount14 == 1){
+                        measureCommission.put("item", measureCommission.get("item") + ",1");
+                    }
+                }
                 measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "2");
@@ -530,6 +537,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                     }
                 }
                 i+=sendMeasureCommissionByGatepost(map);
+                break;
+            case 14:
+
                 break;
             case 15:
             case 20:

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

@@ -70,11 +70,10 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
 
     /**
      * 新增一条虚拟收货实绩
-     * @param map {resultTotalId：总实绩ID}
+     * @param  {resultTotalId：总实绩ID}
      * @return
      */
-    public int addReceiptResult(Map<String, Object> map){
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+    public int addReceiptResult(BigDecimal resultTotalId){
         //根据总实绩ID查询收货实绩查看是否已收货
         Integer receiptResult = tmstruckReceiptResultMapper.getReceiptResult(resultTotalId);
         if(receiptResult != null){

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

@@ -285,7 +285,6 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
         if (countEndTimeNum >= 1) {
             throw new Exception("请勿重复计时");
         }
-
         tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResultMapper.selectMaxId());
         tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(resultTotalId));
         //获取计时开始的订单类型
@@ -318,29 +317,37 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
                     tmstruckTimeTaskResult.setUpdateUsername(personnelSsoId);
                 }
                 i += tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
-            }
-            pushOrderForPause(map);
-            BigDecimal orderId1 = DataChange.dataToBigDecimal(map.get("orderId"));
-            Map<String,Object>mapInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId1);
-            Map<String,Object>mapPrice = null;
-            try {
-                mapPrice = amsFeign.getInwardPriceBy(mapInfo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            if(mapPrice != null){
-                mapPrice.put("orderId",orderId1);
-                try {
-                    i += bmsTruckFeign.addDetailsOrder(mapPrice);
-                } catch (Exception e) {
-                    e.printStackTrace();
+                map.put("Time1",Time1);
+                genernateInwardTime(map);
+            } else {
+                Map<String, Object> timeMaps = utilsMapper.FristTimeTask(map);
+                Date resultTime2 = (Date) timeMaps.get("resultTime");
+                Map<String, Object> timeStatus = utilsMapper.getTimeStatus(map);
+                Date resultTime1 = (Date) timeStatus.get("resultTime");
+                long dateTime1 = resultTime2.getTime() - resultTime1.getTime();
+                BigDecimal dateTime3 = new BigDecimal(dateTime1 / (1000 * 60));
+                tmstruckTimeTaskResult.setTimeTaskResultId(tmstruckTimeTaskResult.getTimeTaskResultId());
+                tmstruckTimeTaskResult.setResultValue(dateTime3);
+                tmstruckTimeTaskResult.setResultUomId(new BigDecimal(900));
+                if (personnelSsoId != null) {
+                    tmstruckTimeTaskResult.setUpdateUsername(personnelSsoId);
                 }
+                i += tmstruckTimeTaskResultMapper.updateByPrimaryKeySelective(tmstruckTimeTaskResult);
+                map.put("Time1",dateTime3);
+                 genernateInwardTime(map);
             }
-
-        }
+            Map<String, Object> orderMes = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
+            BigDecimal orderType =DataChange.dataToBigDecimal(orderMes.get("orderType"));
+            if (orderType.intValue()==21) {
+                pushOrderForPause(map);
+            }
+         }
             return i;
         }
 
+
+
+
    //通过运输订单号判断计时是否开始
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -378,4 +385,30 @@ public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResul
        }
         return i;
     }
+
+    @Override
+    public int genernateInwardTime(Map<String, Object> map) {
+        int i=0;
+        BigDecimal orderId1 = DataChange.dataToBigDecimal(map.get("orderId"));
+        Map<String,Object>mapInfo = tmstruckTimeTaskResultMapper.getRequirementInfo(orderId1);
+        Map<String,Object>mapPrice = null;
+        try {
+            mapPrice = amsFeign.getInwardPriceBy(mapInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if(mapPrice != null){
+            mapPrice.put("orderId",orderId1);
+            try {
+                mapPrice.putAll(map);
+                Map<String, Object> stringObjectMap = bmsTruckFeign.addDetailsOrder(mapPrice);
+                if (stringObjectMap==null){
+                   throw new Exception("生成账单失败");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return i;
+    }
 }

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

@@ -58,6 +58,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
     @Autowired
     TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
+    @Autowired
+    TmstruckTimeTaskResultServiceImpl tmstruckTimeTaskResultService;
+    @Autowired
+    TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
 
     @Autowired
     private RulesServiceImpl rulesService;
@@ -135,7 +139,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
      */
     @Override
     @Transactional
-    public int updateUnloadResult(Map<String, Object> map) {
+    public int updateUnloadResult(Map<String, Object> map) throws Exception {
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
@@ -163,19 +167,33 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe);
             }
             //卸货成功后推送消息给websocket
-            utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
+            utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
+            //根据运输订单查找需求备注
+            BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
+            Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
+            String remark =(String) remarkMap.get("remark");
+            if (remark.contains("计时")){
+                 map.put("inwardTypes",3);
+                 tmstruckTimeTaskResultService.addTimeTaskResult(map);
+            }
             return 1;
         }
         //如果是零星多拼订单 需要查询这个物资是否已经卸过了
         if(orderType == 12 || orderType == 13){
+            map.put("updateLoadResult", 1); //需要路段顺序号查询
             Integer checkMaterial = tmstruckUnloadResultMapper.checkMaterialIdUnload(DataChange.dataToBigDecimal(mesMap.get("totalId")), DataChange.dataToBigDecimal(map.get("materialId")));
             if(checkMaterial != null){
-                return -2;
+                return -2;  //已卸过此物资
             }
         }
-        map.putAll(tmstruckUnloadResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
+        Map<String, Object> dataMap = tmstruckUnloadResultMapper.selectUnloadMesByOrderNo(mesMap);
+        if(dataMap == null){
+            return -3;  //该订单没有卸货作业
+        }
+        map.putAll(dataMap);
         updateUnloadResultBy(map); //更新卸货实绩
         //路段顺序号 + 1
+        map.put("orderId", mesMap.get("orderId"));
         utilsService.updateOrderLineSequence(map);
         switch (orderType){
             case 5:
@@ -188,11 +206,11 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 17:
             case 18:
             case 20:
-                tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
+                tmstruckReceiptResultService.addReceiptResult(DataChange.dataToBigDecimal(map.get("resultTotalId"))); //新增完卸车实绩后新增一条收货实绩
                 break;
         }
         //卸货成功后推送消息给websocket
-        utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
+        utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
         return 1;
     }
 

src/main/resources/application-prod.yml

@@ -32,7 +32,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:

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

@@ -1443,4 +1443,51 @@
             order by "outGatepostTimeFirst" desc, "entryGateTimeFirst" desc
         </if>
     </select>
+     <!-- 查询装机统计报表-->
+    <select id="getLoaderResult" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from(select
+        COUNT(RC.CAPACITY_NUMBER) "number",
+        sum(TWR.RESULT_NET_WEIGHT) "netWeight",
+        TLR.CAPACITY_REMARK "LoaderCapacityNumber"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID=OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        where TLR.CAPACITY_REMARK IS NOT NULL
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TLR.RESULT_LOAD_END_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TLR.RESULT_LOAD_END_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TLR.RESULT_LOAD_END_TIME
+        </if>
+        GROUP BY TLR.CAPACITY_REMARK
+        )
+        <where>
+        <if test="number != null">
+            and
+            <foreach collection="number" item="item" open="(" separator="or" close=")">
+                "number" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="netWeight != null">
+            and
+            <foreach collection="netWeight" item="item" open="(" separator="or" close=")">
+                "netWeight" like '%${item}%'
+            </foreach>
+        </if>
+        <if test="LoaderCapacityNumber != null">
+            and
+            <foreach collection="LoaderCapacityNumber" item="item" open="(" separator="or" close=")">
+                "LoaderCapacityNumber" like '%${item}%'
+            </foreach>
+        </if>
+        </where>
+    </select>
 </mapper>

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

@@ -25,19 +25,22 @@
     <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
     <result column="SEGMENT_SQE" jdbcType="DECIMAL" property="segmentSqe" />
     <result column="CASE_NUMBER" jdbcType="VARCHAR" property="caseNumber" />
+    <result column="CASE_NUMBERTWO" jdbcType="VARCHAR" property="caseNumbertwo" />
+    <result column="CAPACITY_REMARK" jdbcType="VARCHAR" property="capacityRemark" />
   </resultMap>
   <sql id="columns">
-    RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION, 
-    LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE, 
-    LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE, ISDEDUCT, SEGMENT_SQE, CASE_NUMBER
+    RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION,
+    LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
+    LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE, ISDEDUCT, SEGMENT_SQE, CASE_NUMBER, CASE_NUMBERTWO,
+    CAPACITY_REMARK
   </sql>
   <sql id="columns_alias">
-    t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_LOAD_START_TIME, t.RESULT_LOAD_END_TIME, 
-    t.RESULT_LOAD_DURATION, t.LOAD_STANDARD_TIME_ID, t.LOADER_ID, t.RESULT_ISCLEAR, t.DELETE_NAME, 
-    t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_MEASURED_TONNAGE, t.LOADING_ID, t.MATERIAL_ID, 
-    t.LOADING_SEQUENCE, t.ISDEDUCT, t.SEGMENT_SQE, t.CASE_NUMBER
+    t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_LOAD_START_TIME, t.RESULT_LOAD_END_TIME,
+    t.RESULT_LOAD_DURATION, t.LOAD_STANDARD_TIME_ID, t.LOADER_ID, t.RESULT_ISCLEAR, t.DELETE_NAME,
+    t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.STATUS, t.RESULT_MEASURED_TONNAGE, t.LOADING_ID, t.MATERIAL_ID,
+    t.LOADING_SEQUENCE, t.ISDEDUCT, t.SEGMENT_SQE, t.CASE_NUMBER, t.CASE_NUMBERTWO, t.CAPACITY_REMARK
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM TMSTRUCK_LOAD_RESULT
@@ -46,7 +49,7 @@
     SELECT <include refid="columns_alias" /> FROM TMSTRUCK_LOAD_RESULT t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="resultId != null">
         and RESULT_ID = #{resultId}
       </if>
@@ -116,10 +119,16 @@
       <if test="caseNumber != null and caseNumber != ''">
         and CASE_NUMBER = #{caseNumber}
       </if>
+      <if test="caseNumbertwo != null and caseNumbertwo != ''">
+        and CASE_NUMBERTWO = #{caseNumbertwo}
+      </if>
+      <if test="capacityRemark != null and capacityRemark != ''">
+        and CAPACITY_REMARK = #{capacityRemark}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="resultId != null">
         and RESULT_ID = #{resultId}
       </if>
@@ -189,6 +198,12 @@
       <if test="caseNumber != null and caseNumber != ''">
         and CASE_NUMBER LIKE '%${caseNumber}%'
       </if>
+      <if test="caseNumbertwo != null and caseNumbertwo != ''">
+        and CASE_NUMBERTWO LIKE '%${caseNumbertwo}%'
+      </if>
+      <if test="capacityRemark != null and capacityRemark != ''">
+        and CAPACITY_REMARK LIKE '%${capacityRemark}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -197,93 +212,99 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from TMSTRUCK_LOAD_RESULT
-    where 1!=1 
-      <if test="resultTotalId != null">
-        or RESULT_TOTAL_ID = #{resultTotalId}
-      </if>
-      <if test="resultLoadStartTime != null">
-        or TO_CHAR(RESULT_LOAD_START_TIME,'yyyy-MM-dd') = '#{resultLoadStartTime}'
-      </if>
-      <if test="resultLoadEndTime != null">
-        or TO_CHAR(RESULT_LOAD_END_TIME,'yyyy-MM-dd') = '#{resultLoadEndTime}'
-      </if>
-      <if test="resultLoadDuration != null">
-        or RESULT_LOAD_DURATION = #{resultLoadDuration}
-      </if>
-      <if test="loadStandardTimeId != null">
-        or LOAD_STANDARD_TIME_ID = #{loadStandardTimeId}
-      </if>
-      <if test="loaderId != null">
-        or LOADER_ID = #{loaderId}
-      </if>
-      <if test="resultIsclear != null and resultIsclear != ''">
-        or RESULT_ISCLEAR = #{resultIsclear}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        or DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null">
-        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
-      </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>
-      <if test="status != null">
-        or STATUS = #{status}
-      </if>
-      <if test="resultMeasuredTonnage != null">
-        or RESULT_MEASURED_TONNAGE = #{resultMeasuredTonnage}
-      </if>
-      <if test="loadingId != null">
-        or LOADING_ID = #{loadingId}
-      </if>
-      <if test="materialId != null">
-        or MATERIAL_ID = #{materialId}
-      </if>
-      <if test="loadingSequence != null">
-        or LOADING_SEQUENCE = #{loadingSequence}
-      </if>
-      <if test="isdeduct != null">
-        or ISDEDUCT = #{isdeduct}
-      </if>
-      <if test="segmentSqe != null">
-        or SEGMENT_SQE = #{segmentSqe}
-      </if>
-      <if test="caseNumber != null and caseNumber != ''">
-        or CASE_NUMBER = #{caseNumber}
-      </if>
+    where 1!=1
+    <if test="resultTotalId != null">
+      or RESULT_TOTAL_ID = #{resultTotalId}
+    </if>
+    <if test="resultLoadStartTime != null">
+      or TO_CHAR(RESULT_LOAD_START_TIME,'yyyy-MM-dd') = '#{resultLoadStartTime}'
+    </if>
+    <if test="resultLoadEndTime != null">
+      or TO_CHAR(RESULT_LOAD_END_TIME,'yyyy-MM-dd') = '#{resultLoadEndTime}'
+    </if>
+    <if test="resultLoadDuration != null">
+      or RESULT_LOAD_DURATION = #{resultLoadDuration}
+    </if>
+    <if test="loadStandardTimeId != null">
+      or LOAD_STANDARD_TIME_ID = #{loadStandardTimeId}
+    </if>
+    <if test="loaderId != null">
+      or LOADER_ID = #{loaderId}
+    </if>
+    <if test="resultIsclear != null and resultIsclear != ''">
+      or RESULT_ISCLEAR = #{resultIsclear}
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null">
+      or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+    </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>
+    <if test="status != null">
+      or STATUS = #{status}
+    </if>
+    <if test="resultMeasuredTonnage != null">
+      or RESULT_MEASURED_TONNAGE = #{resultMeasuredTonnage}
+    </if>
+    <if test="loadingId != null">
+      or LOADING_ID = #{loadingId}
+    </if>
+    <if test="materialId != null">
+      or MATERIAL_ID = #{materialId}
+    </if>
+    <if test="loadingSequence != null">
+      or LOADING_SEQUENCE = #{loadingSequence}
+    </if>
+    <if test="isdeduct != null">
+      or ISDEDUCT = #{isdeduct}
+    </if>
+    <if test="segmentSqe != null">
+      or SEGMENT_SQE = #{segmentSqe}
+    </if>
+    <if test="caseNumber != null and caseNumber != ''">
+      or CASE_NUMBER = #{caseNumber}
+    </if>
+    <if test="caseNumbertwo != null and caseNumbertwo != ''">
+      or CASE_NUMBERTWO = #{caseNumbertwo}
+    </if>
+    <if test="capacityRemark != null and capacityRemark != ''">
+      or CAPACITY_REMARK = #{capacityRemark}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
-    insert into TMSTRUCK_LOAD_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, 
-      RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION, 
-      LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR, 
-      DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE, 
-      LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE, 
-      ISDEDUCT, SEGMENT_SQE, CASE_NUMBER
-      )
-    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultLoadStartTime,jdbcType=TIMESTAMP}, 
-      #{resultLoadEndTime,jdbcType=TIMESTAMP}, #{resultLoadDuration,jdbcType=DECIMAL}, 
-      #{loadStandardTimeId,jdbcType=DECIMAL}, #{loaderId,jdbcType=DECIMAL}, #{resultIsclear,jdbcType=VARCHAR}, 
-      #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL}, #{resultMeasuredTonnage,jdbcType=DECIMAL}, 
-      #{loadingId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{loadingSequence,jdbcType=DECIMAL}, 
-      #{isdeduct,jdbcType=DECIMAL}, #{segmentSqe,jdbcType=DECIMAL}, #{caseNumber,jdbcType=VARCHAR}
-      )
+    insert into TMSTRUCK_LOAD_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_LOAD_START_TIME,
+                                      RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION,
+                                      LOAD_STANDARD_TIME_ID, LOADER_ID, RESULT_ISCLEAR,
+                                      DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+                                      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                      INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
+                                      LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE,
+                                      ISDEDUCT, SEGMENT_SQE, CASE_NUMBER,
+                                      CASE_NUMBERTWO, CAPACITY_REMARK)
+    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultLoadStartTime,jdbcType=TIMESTAMP},
+            #{resultLoadEndTime,jdbcType=TIMESTAMP}, #{resultLoadDuration,jdbcType=DECIMAL},
+            #{loadStandardTimeId,jdbcType=DECIMAL}, #{loaderId,jdbcType=DECIMAL}, #{resultIsclear,jdbcType=VARCHAR},
+            #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL}, #{resultMeasuredTonnage,jdbcType=DECIMAL},
+            #{loadingId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{loadingSequence,jdbcType=DECIMAL},
+            #{isdeduct,jdbcType=DECIMAL}, #{segmentSqe,jdbcType=DECIMAL}, #{caseNumber,jdbcType=VARCHAR},
+            #{caseNumbertwo,jdbcType=VARCHAR}, #{capacityRemark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
     insert into TMSTRUCK_LOAD_RESULT
@@ -357,6 +378,12 @@
       <if test="caseNumber != null">
         CASE_NUMBER,
       </if>
+      <if test="caseNumbertwo != null">
+        CASE_NUMBERTWO,
+      </if>
+      <if test="capacityRemark != null">
+        CAPACITY_REMARK,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resultId != null">
@@ -428,32 +455,40 @@
       <if test="caseNumber != null">
         #{caseNumber,jdbcType=VARCHAR},
       </if>
+      <if test="caseNumbertwo != null">
+        #{caseNumbertwo,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityRemark != null">
+        #{capacityRemark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
     update TMSTRUCK_LOAD_RESULT
     set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
-      RESULT_LOAD_START_TIME = #{resultLoadStartTime,jdbcType=TIMESTAMP},
-      RESULT_LOAD_END_TIME = #{resultLoadEndTime,jdbcType=TIMESTAMP},
-      RESULT_LOAD_DURATION = #{resultLoadDuration,jdbcType=DECIMAL},
-      LOAD_STANDARD_TIME_ID = #{loadStandardTimeId,jdbcType=DECIMAL},
-      LOADER_ID = #{loaderId,jdbcType=DECIMAL},
-      RESULT_ISCLEAR = #{resultIsclear,jdbcType=VARCHAR},
-      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,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},
-      STATUS = #{status,jdbcType=DECIMAL},
-      RESULT_MEASURED_TONNAGE = #{resultMeasuredTonnage,jdbcType=DECIMAL},
-      LOADING_ID = #{loadingId,jdbcType=DECIMAL},
-      MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      LOADING_SEQUENCE = #{loadingSequence,jdbcType=DECIMAL},
-      ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
-      SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
-      CASE_NUMBER = #{caseNumber,jdbcType=VARCHAR}
+        RESULT_LOAD_START_TIME = #{resultLoadStartTime,jdbcType=TIMESTAMP},
+        RESULT_LOAD_END_TIME = #{resultLoadEndTime,jdbcType=TIMESTAMP},
+        RESULT_LOAD_DURATION = #{resultLoadDuration,jdbcType=DECIMAL},
+        LOAD_STANDARD_TIME_ID = #{loadStandardTimeId,jdbcType=DECIMAL},
+        LOADER_ID = #{loaderId,jdbcType=DECIMAL},
+        RESULT_ISCLEAR = #{resultIsclear,jdbcType=VARCHAR},
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+        DELETE_TIME = #{deleteTime,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},
+        STATUS = #{status,jdbcType=DECIMAL},
+        RESULT_MEASURED_TONNAGE = #{resultMeasuredTonnage,jdbcType=DECIMAL},
+        LOADING_ID = #{loadingId,jdbcType=DECIMAL},
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+        LOADING_SEQUENCE = #{loadingSequence,jdbcType=DECIMAL},
+        ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+        SEGMENT_SQE = #{segmentSqe,jdbcType=DECIMAL},
+        CASE_NUMBER = #{caseNumber,jdbcType=VARCHAR},
+        CASE_NUMBERTWO = #{caseNumbertwo,jdbcType=VARCHAR},
+        CAPACITY_REMARK = #{capacityRemark,jdbcType=VARCHAR}
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckLoadResult">
@@ -525,6 +560,12 @@
       <if test="caseNumber != null">
         CASE_NUMBER = #{caseNumber,jdbcType=VARCHAR},
       </if>
+      <if test="caseNumbertwo != null">
+        CASE_NUMBERTWO = #{caseNumbertwo,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityRemark != null">
+        CAPACITY_REMARK = #{capacityRemark,jdbcType=VARCHAR},
+      </if>
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
@@ -541,136 +582,146 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into TMSTRUCK_LOAD_RESULT 
-      (RESULT_ID, 
-      RESULT_TOTAL_ID, RESULT_LOAD_START_TIME, 
-      RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION, 
-      LOAD_STANDARD_TIME_ID, LOADER_ID, 
-      RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE, 
-      LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE, 
-      ISDEDUCT, SEGMENT_SQE, CASE_NUMBER
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.resultId,jdbcType=DECIMAL}, 
-      #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultLoadStartTime,jdbcType=TIMESTAMP}, 
-      #{item.resultLoadEndTime,jdbcType=TIMESTAMP}, #{item.resultLoadDuration,jdbcType=DECIMAL}, 
-      #{item.loadStandardTimeId,jdbcType=DECIMAL}, #{item.loaderId,jdbcType=DECIMAL}, 
-      #{item.resultIsclear,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,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}, #{item.resultMeasuredTonnage,jdbcType=DECIMAL}, 
-      #{item.loadingId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.loadingSequence,jdbcType=DECIMAL}, 
-      #{item.isdeduct,jdbcType=DECIMAL}, #{item.segmentSqe,jdbcType=DECIMAL}, #{item.caseNumber,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
+    insert into TMSTRUCK_LOAD_RESULT
+    (RESULT_ID,
+    RESULT_TOTAL_ID, RESULT_LOAD_START_TIME,
+    RESULT_LOAD_END_TIME, RESULT_LOAD_DURATION,
+    LOAD_STANDARD_TIME_ID, LOADER_ID,
+    RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, STATUS, RESULT_MEASURED_TONNAGE,
+    LOADING_ID, MATERIAL_ID, LOADING_SEQUENCE,
+    ISDEDUCT, SEGMENT_SQE, CASE_NUMBER,
+    CASE_NUMBERTWO, CAPACITY_REMARK
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.resultId,jdbcType=DECIMAL},
+    #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultLoadStartTime,jdbcType=TIMESTAMP},
+    #{item.resultLoadEndTime,jdbcType=TIMESTAMP}, #{item.resultLoadDuration,jdbcType=DECIMAL},
+    #{item.loadStandardTimeId,jdbcType=DECIMAL}, #{item.loaderId,jdbcType=DECIMAL},
+    #{item.resultIsclear,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,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}, #{item.resultMeasuredTonnage,jdbcType=DECIMAL},
+    #{item.loadingId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.loadingSequence,jdbcType=DECIMAL},
+    #{item.isdeduct,jdbcType=DECIMAL}, #{item.segmentSqe,jdbcType=DECIMAL}, #{item.caseNumber,jdbcType=VARCHAR},
+    #{item.caseNumbertwo,jdbcType=VARCHAR}, #{item.capacityRemark,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update TMSTRUCK_LOAD_RESULT
-     set
-       RESULT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_TOTAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_LOAD_START_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadStartTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,RESULT_LOAD_END_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadEndTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,RESULT_LOAD_DURATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadDuration,jdbcType=DECIMAL}
-       </foreach>
-       ,LOAD_STANDARD_TIME_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.loadStandardTimeId,jdbcType=DECIMAL}
-       </foreach>
-       ,LOADER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.loaderId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_ISCLEAR=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultIsclear,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          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=" ">
-          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=" ">
-          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=" ">
-          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=" ">
-          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=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.status,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_MEASURED_TONNAGE=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMeasuredTonnage,jdbcType=DECIMAL}
-       </foreach>
-       ,LOADING_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingId,jdbcType=DECIMAL}
-       </foreach>
-       ,MATERIAL_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-       </foreach>
-       ,LOADING_SEQUENCE=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingSequence,jdbcType=DECIMAL}
-       </foreach>
-       ,ISDEDUCT=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
-       </foreach>
-       ,SEGMENT_SQE=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
-       </foreach>
-       ,CASE_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
-          when #{item.resultId,jdbcType=DECIMAL} then #{item.caseNumber,jdbcType=VARCHAR}
-       </foreach>
-     where RESULT_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.resultId,jdbcType=DECIMAL}
-     </foreach> 
+    update TMSTRUCK_LOAD_RESULT
+    set
+    RESULT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_TOTAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_LOAD_START_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadStartTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,RESULT_LOAD_END_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadEndTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,RESULT_LOAD_DURATION=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadDuration,jdbcType=DECIMAL}
+    </foreach>
+    ,LOAD_STANDARD_TIME_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.loadStandardTimeId,jdbcType=DECIMAL}
+    </foreach>
+    ,LOADER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.loaderId,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_ISCLEAR=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultIsclear,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      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=" ">
+      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=" ">
+      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=" ">
+      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=" ">
+      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=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.status,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_MEASURED_TONNAGE=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMeasuredTonnage,jdbcType=DECIMAL}
+    </foreach>
+    ,LOADING_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingId,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+    </foreach>
+    ,LOADING_SEQUENCE=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.loadingSequence,jdbcType=DECIMAL}
+    </foreach>
+    ,ISDEDUCT=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
+    </foreach>
+    ,SEGMENT_SQE=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.segmentSqe,jdbcType=DECIMAL}
+    </foreach>
+    ,CASE_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.caseNumber,jdbcType=VARCHAR}
+    </foreach>
+    ,CASE_NUMBERTWO=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.caseNumbertwo,jdbcType=VARCHAR}
+    </foreach>
+    ,CAPACITY_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+      when #{item.resultId,jdbcType=DECIMAL} then #{item.capacityRemark,jdbcType=VARCHAR}
+    </foreach>
+    where RESULT_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.resultId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from TMSTRUCK_LOAD_RESULT
-    where RESULT_ID in 
+    where RESULT_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -1116,15 +1167,18 @@
   </select>
 
   <!--  通过物资ID和总实绩Id查询唯一的装车实绩Id  -->
-  <select id="getLoadResultIdByMIdAndTotalId" parameterType="int" resultType="java.util.Map">
+  <select id="getLoadResultIdByMIdAndTotalId" parameterType="java.util.Map" resultType="java.util.Map">
     select
     *
     from(
     select TLR.RESULT_ID "resultId",
     TLR.SEGMENT_SQE "segmentSqe"
     from TMSTRUCK_LOAD_RESULT TLR
-    where TLR.RESULT_TOTAL_ID = #{resultTotalId} and TLR.RESULT_LOAD_END_TIME is null
-     order by TLR.SEGMENT_SQE
+    where TLR.RESULT_TOTAL_ID = #{resultTotalId}
+    <if test="updateUnloadResult != null">
+      and TLR.RESULT_LOAD_END_TIME is null
+    </if>
+    order by TLR.SEGMENT_SQE
     )
     where rownum = 1
   </select>
@@ -1440,7 +1494,7 @@
     LEFT JOIN RMS_WAREHOUSE RW
     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
     WHERE OO.ORDER_TYPE = #{orderTypee}
-  AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+    AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
     )
     <where>
       <if test="resultLoadEndTime != null">
@@ -1543,7 +1597,7 @@
     left join RMS_CAPACITY RC
     on RC.CAPACITY_ID = OO.CAPACITY_ID
     where TLR.STATUS = #{status}
-          and TLR.RESULT_LOAD_START_TIME IS NOT NULL
+    and TLR.RESULT_LOAD_START_TIME IS NOT NULL
     <if test="orderTypee != 100">
       AND OO.ORDER_TYPE = #{orderTypee}
     </if>
@@ -1628,10 +1682,10 @@
     select OO.LINE_ID "lineId",
            OO.ORDER_ID "orderId"
     from OMSTRUCK_ORDER OO
-    left join TMSTRUCK_TOTAL_RESULT TTR
-    on TTR.ORDER_ID=OO.ORDER_ID
-    left join TMSTRUCK_LOAD_RESULT TLR
-    on  TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+           left join TMSTRUCK_TOTAL_RESULT TTR
+                     on TTR.ORDER_ID=OO.ORDER_ID
+           left join TMSTRUCK_LOAD_RESULT TLR
+                     on  TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
     where TTR.RESULT_TOTAL_ID=#{resultTotalId}
   </select>
 
@@ -1648,15 +1702,15 @@
   <update id="updateSqe" parameterType="java.util.Map">
     update OMSTRUCK_ORDER OO
     set OO.ORDER_LINE_SEQUENCE =
-        (
-          select MAX(RLS.SEGMENT_SQE)
-          from OMSTRUCK_ORDER OO
-                 left join RMS_LINE RL
-                           on OO.LINE_ID = RL.LINE_ID
-                 left join RMS_LINE_SEGEMNT RLS
-                           on RL.LINE_ID = RLS.LINE_ID
-          where OO.ORDER_ID = #{orderId}
-        ) - 1
+            (
+              select MAX(RLS.SEGMENT_SQE)
+              from OMSTRUCK_ORDER OO
+                     left join RMS_LINE RL
+                               on OO.LINE_ID = RL.LINE_ID
+                     left join RMS_LINE_SEGEMNT RLS
+                               on RL.LINE_ID = RLS.LINE_ID
+              where OO.ORDER_ID = #{orderId}
+            ) - 1
     where OO.ORDER_ID = #{orderId}
   </update>
 
@@ -1664,7 +1718,8 @@
     select TLR.RESULT_ID
     from TMSTRUCK_LOAD_RESULT TLR
     where TLR.RESULT_TOTAL_ID = #{resultTotalId}
-        and  TLR.MATERIAL_ID = #{materialId}
+      and  TLR.MATERIAL_ID = #{materialId}
   </select>
 
+
 </mapper>

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

@@ -730,6 +730,13 @@
     <if test="userId!=null">
       AND oo.INSERT_USERNAME LIKE #{userId}
     </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TTTR.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TTTR.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TTTR.INSERT_TIME
+    </if>
     <where>
       <if test="orderNumber != null">
         <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -808,7 +815,8 @@
   </select>
 
     <select id="selectInwardDueTimeByOrderId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-      select AIR.DUE_DATE  "dueTime"
+      select AIR.DUE_DATE  "dueTime",
+             AIR.INSERT_UPDATE_REMARK "remark"
       from OMSTRUCK_ORDER OO
       left join AMSTRUCK_INWARD_PLAN AIP
                        on AIP.PLAN_ID=OO.ORDER_PLAN_ID

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

@@ -655,25 +655,18 @@
     </select>
 
     <!--  通过运输订单号 查询实绩Id、总实绩ID -->
-    <select id="selectTotalIdByOrderNo" parameterType="java.lang.String" resultType="java.util.Map">
+    <select id="selectUnloadMesByOrderNo" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-                 select OO.ORDER_ID         "orderId",
-                        OO.ORDER_TYPE       "orderTypee",
+                 select
                         TUR.RESULT_ID       "resultId",
-                        TTR.RESULT_TOTAL_ID "resultTotalId",
-                        RC.CAPACITY_NUMBER  "capacityNumber",
-                        TUR.SEGMENT_SQE     "segmentSqe"
-
-                 from OMSTRUCK_ORDER OO
-                          left join TMSTRUCK_TOTAL_RESULT TTR
-                                    on OO.ORDER_ID = TTR.ORDER_ID
-                          left join TMSTRUCK_UNLOAD_RESULT TUR
-                                    on TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
-                 where OO.ORDER_NUMBER = #{orderNumber}
-                   and TUR.RESULT_END_TIME is null
+                        TUR.SEGMENT_SQE     "segmentSqe",
+                        TUR.RESULT_TOTAL_ID "resultTotalId"
+                 from TMSTRUCK_UNLOAD_RESULT TUR
+                 where TUR.RESULT_TOTAL_ID = #{resultTotalId}
+                   <if test="updateLoadResult != null">
+                       and TUR.RESULT_END_TIME is null
+                   </if>
                  order by TUR.SEGMENT_SQE
              )
         where rownum = 1

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

@@ -203,7 +203,8 @@
                OO.ORDER_ID      "orderId",
                OO.ORDER_LINE_SEQUENCE "Sqe",
                OO.LINE_ID           "lineId",
-               RC.CAPACITY_NUMBER   "capacityNumber"
+               RC.CAPACITY_NUMBER   "capacityNumber",
+               OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
@@ -328,7 +329,7 @@
         select sum(TTTR.RESULT_VALUE) "resultPauseTime"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID=TTR.ORDER_ID
+        ON TTR.ORDER_ID=OO.ORDER_ID
         LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
         ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE= #{type}
@@ -352,4 +353,19 @@
         on  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_ID=#{orderId} and TTTR.RESULT_TIME_TYPE  = 7
     </select>
+    <select id="getCapacityNameBySsoId" resultType="java.lang.String" parameterType="java.lang.String">
+        select
+               RC.CAPACITY_NUMBER "capacityNumber"
+        from RMS_CAPACITY RC
+        where RC.CAPACITY_SSO_ID = #{userId}
+    </select>
+    <select id="getLoadResultId" resultType="java.math.BigDecimal" parameterType="java.util.Map">
+        select TLR.RESULT_ID "resultId"
+        from OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID=TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_NUMBER=#{orderNumber} and TLR.CAPACITY_REMARK =#{capacityName}
+    </select>
 </mapper>