零星

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

@@ -242,6 +242,30 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation(value="查询零星内转统计报表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getLXInwardReport")
+    public RESTfulResult getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String startTime,
+                                            String endTime
+    ){
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getLXInwardReport(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        return success(pageList);
+    }
+
     @ApiOperation(value="查询内转统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -141,13 +141,19 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     })
     @PostMapping("/addSale2LoadResult")
     public RESTfulResult addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map){
-        int i = 0;
         try {
-            i = tmstruckLoadResultService.addXS2LoadResult(map);
+            int i = tmstruckLoadResultService.addXS2LoadResult(map);
+            if(i > 0){
+                return success("装货成功");
+            }else if(i == -2){
+                return failed("已装过此物资");
+            }else {
+                return failed("装货异常，请联系管理员！");
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            System.out.println(e.getMessage());
         }
-        return success(i);
+        return failed("装货异常，请联系管理员！");
     }
 
 

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

@@ -87,7 +87,13 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     @PostMapping("/updateUnloadResult")
     public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue){
         int i = tmstruckUnloadResultService.updateUnloadResult(mapValue);
-        return success(i);
+        if(i > 0){
+            return success("卸货成功！");
+        }else if(i == -2){
+            return failed("已卸过此物资");
+        }else {
+            return failed("卸货失败，请联系管理员！");
+        }
     }
 
 

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

@@ -40,4 +40,6 @@ public interface StatisticalReportMapper {
     List<Map<String, Object>> getLoading(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getUnLoading(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getLXReportResult(Map<String, Object> mapValue);
 }

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

@@ -123,4 +123,6 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //修改装货路段顺序号
     int updateSqe(@Param("orderId")BigDecimal orderId);
 
+    //查询这个物资是否已经装过了
+    Integer checkMaterialIdLoad(@Param("resultTotalId") BigDecimal resultTotalId,@Param("materialId") BigDecimal materialId);
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -55,4 +56,7 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     //根据总实绩ID查询是否有净重
     Integer getNetWeightByTotalId(BigDecimal totalId);
+
+    //查询这个物资是否已经卸过了
+    Integer checkMaterialIdUnload(@Param("resultTotalId") BigDecimal resultTotalId,@Param("materialId") BigDecimal materialId);
 }

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

@@ -35,6 +35,8 @@ public interface IStatisticalReportService {
 
     List<Map<String, Object>> getPurInwardReport(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getLXInwardReport( Map<String, Object> mapValue);
+
     //查看内转统计报表
     List<Map<String, Object>> getInwardReport(Map<String, Object> mapValue);
 

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

@@ -138,6 +138,23 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         return inwardReportResult;
     }
 
+    //采购内转统计报表
+    @Override
+    public List<Map<String, Object>> getLXInwardReport( Map<String, Object> mapValue) {
+        List<Map<String, Object>> lxReportResult = statisticalReportMapper.getLXReportResult(mapValue);
+        for (Map<String,Object>inwardReport:lxReportResult
+        ) {
+
+            BigDecimal netWeightSecond = DataChange.dataToBigDecimal(inwardReport.get("netWeightSecond"));
+            BigDecimal netWeightFirst = DataChange.dataToBigDecimal(inwardReport.get("netWeightFirst"));
+            BigDecimal netTract = netWeightSecond.subtract(netWeightFirst).divide(new BigDecimal(1), 2, 4);
+            //第二次净重减第一次净重
+            inwardReport.put("newTract",netTract);
+            calculateDifferenceTime(inwardReport);
+        }
+        return lxReportResult;
+    }
+
     @Override
     public List<Map<String, Object>> getInwardReport(Map<String, Object> mapValue) {
         return statisticalReportMapper.getInwardReport(mapValue);

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

@@ -121,9 +121,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 12:
             case 13:
             case 14:
-            case 15:
-            case 16:
-            case 19:
+            case 100:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:416
         }
         return null;

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

@@ -146,9 +146,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:
             case 13:
-            case 15:
-            case 16:
-            case 19:
+            case 14:
+            case 100:
                  return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);//apiId:421
         }
         return null;
@@ -241,14 +240,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 18:
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
-//                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
-                //采购出厂 通过feign调用新增详单
-//                try {
-//                    bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id
-//                    bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));  // 运单ID
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
                 break;
             case 10:
             case 20:
@@ -269,15 +260,12 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 break;
             case 12:
             case 13:
-            case 15:
-            case 16:
+            case 14:
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
                 //生成新的零星订单
                 omsFeign.pushMessageToDriver(map);
                 break;
-
-
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
         return i;

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

@@ -110,9 +110,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
             case 12:
             case 13:
-            case 15:
-            case 16:
-            case 19:
+            case 14:
+            case 100:
                  return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 430
         }
         return null;
@@ -205,9 +204,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //通过订单号查询订单类型 及总实绩Id
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
         String capacityNumber = (String) mesMap.get("capacityNumber");
-        BigDecimal orderType = DataChange.dataToBigDecimal(mesMap.get("orderType"));
+        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
-        if(orderType.intValue() == 11){
+        if(orderType == 11){
             int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;
             map.put("resultId",tmstruckLoadResultMapper.selectMaxId());
@@ -221,6 +220,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
             return i;
         }
+        //如果是零星多拼订单 需要查询这个物资是否已经装过了
+        if(orderType == 12 || orderType == 13){
+            Integer checkMaterial = tmstruckLoadResultMapper.checkMaterialIdLoad(resultTotalId, DataChange.dataToBigDecimal(map.get("materialId")));
+            if(checkMaterial != null){
+                return -2;
+            }
+        }
         //查询装车实绩ID
         map.putAll(tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), null));
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
@@ -246,20 +252,20 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         //更新路段顺序号
-        int i = utilsService.updateOrderLineSequence(map);
+        utilsService.updateOrderLineSequence(map);
         //判断是否为未装货
         if (map.get("insertUpdateRemark")!=null) {
             String insertUpdateRemark = (String) map.get("insertUpdateRemark");
-            if("未装货".equals(insertUpdateRemark) && orderType.intValue() != 11){
+            if("未装货".equals(insertUpdateRemark)){
                 loadJudge(mesMap);
             }
             tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
         }
         tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
-        i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket
         utilsService.pushMesToWebsocket(capacityNumber, "装货");
-        return i;
+        return 1;
     }
 
     //内转添加装货实绩

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

@@ -337,10 +337,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         if(measureCommission != null)
             map.put("materialId", measureCommission.get("materialId"));
         addMeasureCommission(map); // 添加计量委托
-        System.out.println(measureCommission);
-        return 1;
+//        System.out.println(measureCommission);
+//        return 1;
         /*访问接口发送数据*/
-//        return sendMesToMeasure(measureCommission);
+        return sendMesToMeasure(measureCommission);
 
     }
 
@@ -417,10 +417,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         if(measureCommission != null)
             map.put("materialId", measureCommission.get("item"));
         addMeasureCommission(map); // 添加计量委托
-        System.out.println(measureCommission);
-        return 1;
+//        System.out.println(measureCommission);
+//        return 1;
         /*访问接口发送数据*/
-//        return sendMesToDXMeasure(measureCommission);
+        return sendMesToDXMeasure(measureCommission);
     }
 
     /**

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

@@ -120,9 +120,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
             case 12:
             case 13:
-            case 15:
-            case 16:
-            case 19:
+            case 14:
+            case 100:
                 return  tmstruckUnloadResultMapper.getSporadicSuppliesUnloadResult(map);//apiId:389
         }
         return null;
@@ -136,14 +135,13 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     @Override
     @Transactional
     public int updateUnloadResult(Map<String, Object> map) {
-        int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
-        BigDecimal orderType = DataChange.dataToBigDecimal(mesMap.get("orderType"));
+        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //判断是不是内转
-        if(orderType.intValue() == 11){
+        if(orderType == 11){
             //如果是内转新增卸货实绩
             Integer sqe = utilsMapper.getLineSequenceByOrderNumber((String) map.get("orderNumber"));
             sqe = sqe == null ? 1 : sqe +1;
@@ -152,7 +150,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("Sqe",sqe);
             map.put("totalId",totalId);
             TmstruckUnloadResult tmstruckUnloadResult = generateUnload(map);
-            i += tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+            tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
             //查询是否有净重 如果没有净重更新路段顺序号需要继续回皮 有就结束订单
@@ -165,13 +163,20 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             }
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
-            return i;
+            return 1;
+        }
+        //如果是零星多拼订单 需要查询这个物资是否已经卸过了
+        if(orderType == 12 || orderType == 13){
+            Integer checkMaterial = tmstruckUnloadResultMapper.checkMaterialIdUnload(DataChange.dataToBigDecimal(mesMap.get("totalId")), DataChange.dataToBigDecimal(map.get("materialId")));
+            if(checkMaterial != null){
+                return -2;
+            }
         }
         map.putAll(tmstruckUnloadResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
-        i += updateUnloadResultBy(map); //更新卸货实绩
+        updateUnloadResultBy(map); //更新卸货实绩
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
-        switch (orderType.intValue()){
+        utilsService.updateOrderLineSequence(map);
+        switch (orderType){
             case 5:
             case 6:
             case 7:
@@ -182,12 +187,12 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 17:
             case 18:
             case 20:
-                i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
+                tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
         }
         //卸货成功后推送消息给websocket
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
-        return i;
+        return 1;
     }
 
     /*

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

@@ -135,9 +135,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
             case 12:
             case 13:
-            case 15:
-            case 16:
-            case 19:
+            case 14:
+            case 100:
                 return tmstruckWeightResultMapper.getSporadicSuppliesJiMiaoResult(map); //apiId:405
 
         }
@@ -173,13 +172,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 11:
                 break;
             case 12:
-//                return tmstruckWeightResultMapper.getSporadicSuppliesJiPiResult(map);//apiId:392
             case 13:
-//                return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
-            case 15:
+            case 14:
+            case 100:
             case 20:
-            case 16:
-            case 19:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
         }
         return null;

src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:192.168.1.116:8016}
+    url: ${OMSFEIGN_URL:192.168.1.113:8016}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:

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

@@ -1077,10 +1077,14 @@
             TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
             TWR.RESULT_TARE_WEIGHT      "resultTareWeight",
             TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-            TWR.RESULT_GROSS_WEIGHT     "resultGrossWeight"
+            TWR.RESULT_GROSS_WEIGHT     "resultGrossWeight",
+            PI.TRUCK_CALCULATE_NUMBER   "piTruckCalculateNumber",
+            MAO.TRUCK_CALCULATE_NUMBER  "maoTruckCalculateNumber"
             from OMSTRUCK_ORDER OO
             left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
             left join TMSTRUCK_WEIGHT_RESULT  TWR  on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+            left join RMS_TRUCK_CALCULATE PI on TWR.RESULT_TARE_PLACE_ID = PI.TRUCK_CALCULATE_ID
+            left join RMS_TRUCK_CALCULATE MAO on TWR.RESULT_GROSS_PLACE_ID = MAO.TRUCK_CALCULATE_ID
             left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
             left join AMSTRUCK_INWARD_PLAN AIP on AIP.PLAN_ID = OO.ORDER_PLAN_ID
             left join AMSTRUCK_REQUIREMENT_PLAN ARP on AIP.PLAN_ID = ARP.PLAN_ID
@@ -1297,4 +1301,132 @@
             </if>
         </where>
     </select>
+
+
+    <select id="getLXReportResult" parameterType="map" resultType="java.util.LinkedHashMap">
+        SELECT
+               *
+        FROM (
+        SELECT
+        OO.ORDER_ID                   "orderId",
+        RM.MATERIAL_NAME              "materialName",
+        RC.CAPACITY_NUMBER            "capacityNo",
+        RS.SUPPLIER_NAME              "supplierName",
+        OO.ORDER_NUMBER               "orderNumber",
+        RCE.CONSIGNEE_COMPANY_NAME    "consigneeName",
+        TTR.RESULT_TOTAL_ID           "totalResultId",
+        TER1.RESULT_ENTRY_MODE        "entryModeFirst",
+        TER1.RESULT_ENTRY_GATE_TIME   "entryGateTimeFirst",
+        RG1.GATEPOST_NAME             "entryGatepostNameFirst",
+        TWR1.RESULT_TARE_WEIGHT       "tareWeightFirst",
+        TWR1.RESULT_TARE_WEIGHT_TIME  "tareWeightTimeFirst",
+        RTC1.TRUCK_CALCULATE_NUMBER   "tareTruckCalculateFirst",
+        TLR.RESULT_LOAD_END_TIME      "loadTime",
+        RW.WAREHOUSE_NAME             "loadPoint",
+        TWR2.RESULT_GROSS_WEIGHT      "grossWeightFirst",
+        TWR2.RESULT_GROSS_WEIGHT_TIME "grossWeigtTimeFirst",
+        RTC2.TRUCK_CALCULATE_NUMBER   "grossTruckCalculateFirst",
+        TWR2.RESULT_NET_WEIGHT        "netWeightFirst",
+        TLFR1.RESULT_OUT_GATE_TIME    "outGatepostTimeFirst",
+        TLFR1.RESULT_OUT_MODE         "outModeFirst",
+        RG2.GATEPOST_NAME            "gatepostNameFirst",
+        TER2.RESULT_ENTRY_MODE        "entryModeSecond",
+        TER2.RESULT_ENTRY_GATE_TIME   "resultEntryGateTime",
+        TER2.RESULT_ENTRY_GATE_TIME   "entryGateTimeSecond",
+        RG3.GATEPOST_NAME             "entryGatepostNameSecond",
+        TWR3.RESULT_GROSS_WEIGHT      "grossWeightSecond",
+        TWR3.RESULT_GROSS_WEIGHT_TIME "grossWeigtTimeSecond",
+        RTC3.TRUCK_CALCULATE_NUMBER   "grossTruckCalculateSecond",
+        TUR.RESULT_END_TIME           "unloadTime",
+        RW2.WAREHOUSE_NAME            "unloadPoint",
+        TWR4.RESULT_TARE_WEIGHT       "tareWeightSecond",
+        TWR4.RESULT_TARE_WEIGHT_TIME  "tareWeightTimeSecond",
+        TWR4.RESULT_NET_WEIGHT        "netWeightSecond",
+        RTC4.TRUCK_CALCULATE_NUMBER   "tareTruckCalculateSecond",
+        TLFR2.RESULT_OUT_GATE_TIME    "outGatepostTimeSecond",
+        TLFR2.RESULT_OUT_GATE_TIME    "resultOutGateTime",
+        TLFR2.RESULT_OUT_MODE         "outModeSecond",
+        RG4.GATEPOST_NAME             "gatepostNameSecond"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_SUPPLIER RS ON RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.SPORADIC_ORDER_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER1  ON TER1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RG1 ON RG1.GATEPOST_ID = TER1.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR1  ON TWR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC1  ON RTC1.TRUCK_CALCULATE_ID = TWR1.RESULT_TARE_PLACE_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR  ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = TLR.LOADING_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR2 ON TWR2.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC2 ON RTC2.TRUCK_CALCULATE_ID = TWR2.RESULT_GROSS_PLACE_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1  ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RG2 ON TLFR1.GATEPOST_ID = RG2.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER2 ON TER2.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RG3  ON RG3.GATEPOST_ID = TER2.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR3  ON TWR3.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC3 ON RTC3.TRUCK_CALCULATE_ID = TWR3.RESULT_GROSS_PLACE_ID
+        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR  ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW2 ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR4 ON TWR4.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC4  ON RTC4.TRUCK_CALCULATE_ID = TWR4.RESULT_TARE_PLACE_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR2  ON TLFR2.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RG4  ON TLFR2.GATEPOST_ID = RG4.GATEPOST_ID
+        WHERE OO.ORDER_TYPE = 14
+        AND TER1.SEGMEN_SQE = 1
+        AND TWR1.TARE_SEGMENT_SQE = 2
+        AND TLR.SEGMENT_SQE = 3
+        AND TWR2.GROSS_SEGMENT_SQE = 4
+        AND TLFR1.SEGMENT_SQE = 5
+        AND TER2.SEGMEN_SQE = 6
+        AND TWR3.GROSS_SEGMENT_SQE = 7
+        AND TUR.SEGMENT_SQE = 8
+        AND TWR4.TARE_SEGMENT_SQE = 9
+        AND TLFR2.SEGMENT_SQE = 10
+        AND TWR2.RESULT_GROSS_WEIGHT_TIME IS NOT NULL
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR4.RESULT_TARE_WEIGHT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR4.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR4.RESULT_TARE_WEIGHT_TIME
+        </if>
+        )
+        <where>
+            <if test="consigneeName != null">
+                <foreach collection="consigneeName" item="item" open="(" separator="or" close=")">
+                    "consigneeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNo != null">
+                and
+                <foreach collection="capacityNo" item="item" open="(" separator="or" close=")">
+                    "capacityNo" like '%${item}%'
+                </foreach>
+            </if>
+        </where><include refid="orderBy"></include>
+        <if test="orderField == null">
+            order by "outGatepostTimeFirst" desc, "entryGateTimeFirst" desc
+        </if>
+    </select>
 </mapper>

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

@@ -1224,7 +1224,7 @@
         left join OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID=OO.ORDER_ID
         left join RMS_MATERIAL RM
-        ON RM.MATERIAL_ID=OOM.MATERIAL_ID
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO
         on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
         left join AMSTRUCK_SPORADIC_MATERIAL ASM
@@ -1233,7 +1233,13 @@
         on RG.GATEPOST_ID = TER.GATEPOST_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
-        WHERE OO.ORDER_TYPE = #{orderTypee} and TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
+        WHERE TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
+            <if test="orderTypee != 100">
+                AND OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="orderTypee == 100">
+                AND OO.ORDER_TYPE in (12, 13 ,14)
+            </if>
             <if test="oneDate != null">
                 and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
             </if>

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

@@ -1153,7 +1153,12 @@
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TLFR.GATEPOST_ID
         where RESULT_OUT_GATE_TIME is not null
-        and OO.ORDER_TYPE = #{orderTypee}
+            <if test="orderTypee != 100">
+            AND OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="orderTypee == 100">
+            AND OO.ORDER_TYPE in (12, 13 ,14)
+            </if>
             <if test="userId!=null">
              AND ASO.INSERT_USERNAME=#{userId}
             </if>

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

@@ -1124,9 +1124,6 @@
     TLR.SEGMENT_SQE "segmentSqe"
     from TMSTRUCK_LOAD_RESULT TLR
     where TLR.RESULT_TOTAL_ID = #{resultTotalId} and TLR.RESULT_LOAD_END_TIME is null
-      <if test="materialId != null">
-        and TLR.MATERIAL_ID = #{materialId}
-      </if>
      order by TLR.SEGMENT_SQE
     )
     where rownum = 1
@@ -1545,8 +1542,14 @@
     on OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
     left join RMS_CAPACITY RC
     on RC.CAPACITY_ID = OO.CAPACITY_ID
-    where TLR.STATUS = #{status} and OO.ORDER_TYPE = #{orderTypee}
-    and TLR.RESULT_LOAD_START_TIME IS NOT NULL
+    where TLR.STATUS = #{status}
+          and TLR.RESULT_LOAD_START_TIME IS NOT NULL
+    <if test="orderTypee != 100">
+      AND OO.ORDER_TYPE = #{orderTypee}
+    </if>
+    <if test="orderTypee == 100">
+      AND OO.ORDER_TYPE in (12, 13 ,14)
+    </if>
     <if test="userId!=null">
       AND  ASO.INSERT_USERNAME=#{userId}
     </if>
@@ -1656,4 +1659,12 @@
         ) - 1
     where OO.ORDER_ID = #{orderId}
   </update>
+
+  <select id="checkMaterialIdLoad" resultType="java.lang.Integer">
+    select TLR.RESULT_ID
+    from TMSTRUCK_LOAD_RESULT TLR
+    where TLR.RESULT_TOTAL_ID = #{resultTotalId}
+        and  TLR.MATERIAL_ID = #{materialId}
+  </select>
+
 </mapper>

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

@@ -987,7 +987,12 @@
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
-        AND OO.ORDER_TYPE = #{orderTypee}
+        <if test="orderTypee != 100">
+            AND OO.ORDER_TYPE = #{orderTypee}
+        </if>
+        <if test="orderTypee == 100">
+            AND OO.ORDER_TYPE in (12, 13 ,14)
+        </if>
          <if test="userId != null">
              and ASO.INSERT_USERNAME=#{userId}
          </if>
@@ -1070,4 +1075,11 @@
         select COUNT(TWR.RESULT_NET_WEIGHT) from TMSTRUCK_WEIGHT_RESULT TWR  where TWR.RESULT_TOTAL_ID = #{totalId}
     </select>
 
+    <select id="checkMaterialIdUnload" resultType="java.lang.Integer">
+        select TUR.RESULT_ID
+        from TMSTRUCK_UNLOAD_RESULT TUR
+        where TUR.RESULT_TOTAL_ID = #{resultTotalId}
+          and  TUR.MATERIAL_ID = #{materialId}
+    </select>
+
 </mapper>

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

@@ -2198,8 +2198,13 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
-        where RESULT_GROSS_WEIGHT_TIME is not null and
-        OO.ORDER_TYPE = #{orderTypee}
+        where RESULT_GROSS_WEIGHT_TIME is not null
+        <if test="orderTypee != 100">
+            AND OO.ORDER_TYPE = #{orderTypee}
+        </if>
+        <if test="orderTypee == 100">
+            AND OO.ORDER_TYPE in (12, 13 ,14)
+        </if>
             <if test="userId!=null">
                 and ASO.INSERT_USERNAME=#{userId}
             </if>
@@ -2393,7 +2398,12 @@
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where RESULT_TARE_WEIGHT_TIME is not null
-              and OO.ORDER_TYPE = #{orderTypee}
+        <if test="orderTypee != 100">
+            AND OO.ORDER_TYPE = #{orderTypee}
+        </if>
+        <if test="orderTypee == 100">
+            AND OO.ORDER_TYPE in (12, 13 ,14)
+        </if>
         <if test="userId!=null">
             and ASO.INSERT_USERNAME=#{userId}
         </if>