采购辅料

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

@@ -53,13 +53,14 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                          Integer status ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
+                                        Integer status,
+                                        @RequestParam("orderType") Integer orderType){
         if(status != null){
             mapValue.put("status", status);
         }
+        if(orderType != null){
+            mapValue.put("orderTypee", orderType);
+        }
         //不分页筛选数据
         List<Map<String, Object>> allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -70,13 +71,13 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="新增汽车装车实绩")
+    @ApiOperation(value="新增CG汽车装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
-    @PostMapping("/addLoadResult")
-    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = tmstruckLoadResultService.addLoadResult(mapValue);
+    @PostMapping("/addCGLoadResult")
+    public RESTfulResult addCGLoadResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckLoadResultService.addCGLoadResult(mapValue);
         return success(i);
     }
 
@@ -112,7 +113,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         tmstruckLoadResult.setDeleteName("admin");
         tmstruckLoadResult.setDeleteTime(new Date());
         tmstruckLoadResult.setResultId(new BigDecimal(resultId));
-        tmstruckLoadResult.setStatus(new BigDecimal(1));
+        tmstruckLoadResult.setStatus(new BigDecimal(1)); 
         int i = tmstruckLoadResultService.updateLoadResult(tmstruckLoadResult);
         return success(i);
     }

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

@@ -10,6 +10,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.Put;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,8 +53,10 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     public RESTfulResult getUnloadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
-                                           Integer pageSize
+                                           Integer pageSize,
+                                           Integer orderType
     ){
+        mapValue.put("orderTypee", orderType);
         //不分页筛选数据
         List<Map<String, Object>> allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -74,7 +77,7 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="新增卸货实绩 ")
+    @ApiOperation(value="新增卸货实绩：远程调用")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "总实绩ID、卸货点", required = false, dataType = "Map"),
     })

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

@@ -66,12 +66,9 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                                Integer pageSize,
                                                Integer orderType
     ){
-        if (mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
-        }
+
+        mapValue.put("orderTypee", orderType);
+
         //不分页筛选数据
         List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -96,12 +93,8 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                            Integer pageSize,
                                            Integer orderType
     ){
-        if (mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
-        }
+
+        mapValue.put("orderTypee", orderType);
         //不分页筛选数据
         List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);

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

@@ -15,8 +15,8 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     @Select("select seq_tmstruck_leavefactory.nextval from dual")
     BigDecimal selectMaxId();
 
-    //查询所有的出厂实绩、
-    List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map);
+    //查询采购所有的出厂实绩、
+    List<Map<String, Object>> getCGLeaveFactoryResult(Map<String, Object> map);
 
     //查询运输路线是否为出厂
     Integer selectTransportRoute(String orderNumber);

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

@@ -22,5 +22,5 @@ public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceipt
     int updateByTotalResultId(TmstruckReceiptResult tmstruckReceiptResult);
 
     //查询所有收货实绩
-    List<Map<String, Object>> getReceiptResult(Map<String, Object> map);
+    List<Map<String, Object>> getCGReceiptResult(Map<String, Object> map);
 }

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

@@ -11,8 +11,8 @@ import java.util.Map;
 
 @Mapper
 public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadResult, BigDecimal> {
-    //查询卸货实绩
-    List<Map<String, Object>> getUnloadResult(Map<String, Object> map);
+    //查询采购卸货实绩
+    List<Map<String, Object>> getCGUnloadResult(Map<String, Object> map);
 
     //查询最大ID值
     @Select("select seq_tmstruck_unload_result.nextval from dual")

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

@@ -22,11 +22,11 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //通过汽车衡编号查询汽车衡ID
     Integer selectTruckCalculateId(String truckCalculateNumber);
 
-    //查询所有计毛实绩
-    List<Map<String, Object>> getAllJiMaoResult(Map<String, Object> map);
+    //查询采购所有计毛实绩
+    List<Map<String, Object>> getCGAllJiMaoResult(Map<String, Object> map);
 
     //查询所有计皮实绩
-    List<Map<String, Object>> getAllJiPiResult(Map<String, Object> map);
+    List<Map<String, Object>> getCGAllJiPiResult(Map<String, Object> map);
 
     //查询订单下所有的物资件数和物资理重
     List<Map<String, Object>> getMaterialMes(Integer orderId);

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

@@ -24,7 +24,7 @@ public interface ITmstruckLoadResultService{
     List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
 
     //新增装车实绩
-    int addLoadResult(Map<String, Object> map);
+    int addCGLoadResult(Map<String, Object> map);
 
     //新增虚拟装车实绩
     int addSaleLoadResult(Map<String, Object> map);

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

@@ -91,14 +91,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
 
                 break;
             case 5:
-
-                break;
             case 6:
-
-                break;
             case 7:
-
-                break;
             case 8:
                 return tmstruckEnfactoryResultMapper.getCGJKEnFactoryResult(map);
             case 9:

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

@@ -104,13 +104,10 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 
                 break;
             case 5:
-                break;
             case 6:
-                break;
             case 7:
-                break;
             case 8:
-                return tmstruckLeaveFactoryResultMapper.getLeaveFactoryResult(map);
+                return tmstruckLeaveFactoryResultMapper.getCGLeaveFactoryResult(map);
             case 9:
                 break;
             case 10:
@@ -152,7 +149,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 8:
                 i += updateLeaveResultByPDA(map); //更新出厂实绩
                 i += utilsService.updateOrderStatus(map, 2); // 修改运输订单状态 2：已结束
-                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
+//                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
                 //采购出厂 通过feign调用新增详单
                 try {
                     bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id

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

@@ -100,12 +100,49 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
 
     /**
-     * 添加装货实绩
+     * 添加CG装货实绩
      * @param map
      * @return
      */
-    public int addLoadResult(Map<String, Object> map){
-        return 0;
+    @Transactional
+    public int addCGLoadResult(Map<String, Object> map){
+        //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
+        Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
+        // 新增装车实绩
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //添加主键Id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //新增计量吨位 装车所装的重量
+        BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
+        tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
+        tmstruckLoadResult.setStatus(new BigDecimal(0));
+        tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
+        String resultIsclear = (String) (map.get("resultIsclear"));
+        tmstruckLoadResult.setResultIsclear(resultIsclear);
+        tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
+        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+
+        //修改订单状态为执行中 1
+        int i1 = utilsService.updateOrderStatus(map, 1);
+
+        //修改运力状态为执行中 1
+//        int i2 = utilsService.updateCapacityStatus(map, 1);
+
+//        //新增港存库出库实绩 并修改实时库存
+//        BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
+//        if(portId != null){
+//            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+//            if(batchId != null){
+//                Map<String, Object> hashMap = new HashMap<>();
+//                hashMap.put("batchId", batchId);
+//                hashMap.put("portId", portId);
+//                hashMap.put("resultTonnage",resultMeasuredTonnage);
+//                hashMap.put("isClean", resultIsclear);
+//                wmshBoundFeign.addResult(hashMap);
+//            }
+//        }
+        return i + i1;
     }
 
 

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

@@ -53,16 +53,10 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
 
                 break;
             case 5:
-
-                break;
             case 6:
-
-                break;
             case 7:
-
-                break;
             case 8:
-                return tmstruckReceiptResultMapper.getReceiptResult(map);
+                return tmstruckReceiptResultMapper.getCGReceiptResult(map);
             case 9:
                 break;
             case 10:

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

@@ -90,16 +90,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
                 break;
             case 5:
-
-                break;
             case 6:
-
-                break;
             case 7:
-
-                break;
             case 8:
-                return tmstruckUnloadResultMapper.getUnloadResult(map);
+                return tmstruckUnloadResultMapper.getCGUnloadResult(map);
             case 9:
                 break;
             case 10:

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

@@ -64,16 +64,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
 
                 break;
             case 5:
-
-                break;
             case 6:
-
-                break;
             case 7:
-
-                break;
             case 8:
-                return tmstruckWeightResultMapper.getAllJiMaoResult(map);
+                return tmstruckWeightResultMapper.getCGAllJiMaoResult(map);
             case 9:
                 break;
             case 10:
@@ -107,16 +101,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
 
                 break;
             case 5:
-
-                break;
             case 6:
-
-                break;
             case 7:
-
-                break;
             case 8:
-                return tmstruckWeightResultMapper.getAllJiPiResult(map);
+                return tmstruckWeightResultMapper.getCGAllJiPiResult(map);
             case 9:
                 break;
             case 10:
@@ -178,9 +166,19 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         DecimalFormat df =  new DecimalFormat("0.00");
         String resultGrossWeight = df.format((double) map.get("resultGrossWeight"));
         tmstruckWeightResult.setResultGrossWeight(new BigDecimal(resultGrossWeight));
+        //添加毛重时间
+        long resultGrossWeightTime = (long) map.get("resultGrossWeightTime");
+        tmstruckWeightResult.setResultGrossWeightTime(new Date(resultGrossWeightTime));
+
+        //通过汽车衡编号查询汽车衡ID
+        Integer calculateId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("truckCalculateNumber"));
+        //添加计毛汽车衡
+        if(calculateId != null){
+            tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(calculateId));
+        }
         Integer lineSequence = null; //路段顺序号
-        Integer orderType = (Integer) map.get("orderTypee");
-        switch (orderType){
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
             //如果订单类型为销售订单 则执行销售订单计皮规则 resultTareWeight
             case 1:
                 //计算净重  从map中获取皮重 tareWeight
@@ -190,23 +188,27 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 addUpdateRegularField(tmstruckWeightResult); //插入第二次计重时间
                 lineSequence = 5; //设置路段顺序号为5：出厂
                 break;
-            //采购订单记录计毛为第一次计重
+            case 2:
+                break;
             case 3:
-                addInsertRegularField(tmstruckWeightResult); //插入第一次计重时间
-                lineSequence = 5; //设置路段顺序号为5：出厂
-        }
-
-        //通过汽车衡编号查询汽车衡ID
-        Integer calculateId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("truckCalculateNumber"));
-        //添加计毛汽车衡
-        if(calculateId != null){
-            tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(calculateId));
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8: //采购订单记录计毛为第一次计重 添加磅单号
+                tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
+                addInsertRegularField(tmstruckWeightResult); //插入第一次计重时间常规字段
+                lineSequence = 5; //设置路段顺序号为3：卸货
+                break;
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+                break;
         }
-        //添加磅单号
-        tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
-        //添加毛重时间
-        long resultGrossWeightTime = (long) map.get("resultGrossWeightTime");
-        tmstruckWeightResult.setResultGrossWeightTime(new Date(resultGrossWeightTime));
 
         int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //更新订单路段顺序号
@@ -241,12 +243,29 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //添加皮重时间
         long resultTareWeightTime = (long) map.get("resultTareWeightTime");
         tmstruckWeightResult.setResultTareWeightTime(new Date(resultTareWeightTime));
-
+        //通过汽车衡编号查询汽车衡ID 添加计皮汽车衡
+        Integer calculateId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("truckCalculateNumber"));
+        if(calculateId != null){
+            tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(calculateId));
+        }
         int i1 = 0;
-        Integer orderType = (Integer) map.get("orderTypee");
-        switch (orderType){
-            //如果订单类型为采购订单 则执行采购订单计皮规则
+        Integer lineSequence = null; //路段顺序号
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1: //销售订单计皮为第一次计重
+                tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
+                addInsertRegularField(tmstruckWeightResult);// 添加插入常规字段 就是第一次计重时间
+                break;
+            case 2:
+                break;
             case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:  //如果订单类型为采购订单 则执行采购订单计皮规则
                 //计算净重  先从map中获取毛重 grossWeight
                 double netWeight = ((BigDecimal) map.get("grossWeight")).doubleValue() - ((Double) map.get("resultTareWeight"));
                 String resultNetWeight = df.format(netWeight);
@@ -259,21 +278,18 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 tmstruckReceiptResult.setInsertUsername("admin");
                 tmstruckReceiptResult.setInsertTime(new Date());
                 i1 = tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
+                lineSequence = 5; // 出厂
+                break;
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
                 break;
-            //销售订单计皮为第一次计重
-            case 1:
-                addInsertRegularField(tmstruckWeightResult);// 添加插入常规字段 就是第一次计重时间
-        }
-
-        //通过汽车衡编号查询汽车衡ID
-        Integer calculateId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("truckCalculateNumber"));
-        //添加计皮汽车衡
-        if(calculateId != null){
-            tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(calculateId));
         }
         int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //更新订单路段顺序号
-        int i2 = utilsService.updateOrderLineSequence(map, 4);
+        int i2 = utilsService.updateOrderLineSequence(map, lineSequence);
         return i + i1 + i2;
     }
 

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

@@ -83,12 +83,15 @@
 <!--    获取辅料车辆 并且为空闲状态 -->
     <select id="getFuCapacityId" resultType="java.util.LinkedHashMap">
         select
-            RC.CAPACITY_ID "id",
-            RC.CAPACITY_ID "value",
+            RDC.DRIVER_CAPACITY_ID "id",
+            RDC.DRIVER_CAPACITY_ID "value",
             RC.CAPACITY_NUMBER "label"
         from
-            RMS_CAPACITY RC
-        where RC.CAPACITY_STATUS = 0 and RC.CARRIER_ID = 2
+            RMS_DRIVER_CAPACITY RDC
+            left join RMS_CAPACITY RC
+            on RC.CAPACITY_ID = RDC.CAPACITY_ID
+        where RC.CAPACITY_STATUS = 0 and RC.CAPACITY_TYPE_ID = 1
+--           and RC.CARRIER_ID = 2
     </select>
 
 <!--    获取所有的港口 -->

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

@@ -459,8 +459,10 @@
                             on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
                   left join DIL_BATCH DB
                             on DB.BATCH_ID = APO.BATCH_ID
+                  left join RMS_DRIVER_CAPACITY RDC
+                            on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                   left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
+                            on RC.CAPACITY_ID = RDC.CAPACITY_ID
                   left join RMS_SUPPLIER RS
                             on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                   left join RMS_CONSIGNEE RCON

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

@@ -440,7 +440,7 @@
     </sql>
 
     <!-- 查询所有的出厂实绩 -->
-    <select id="getLeaveFactoryResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    <select id="getCGLeaveFactoryResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         select *
         from (
         select
@@ -467,12 +467,14 @@
             on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
             on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_DRIVER_CAPACITY RDC
+            on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-            on RC.CAPACITY_ID = OO.CAPACITY_ID
+            on RC.CAPACITY_ID = RDC.CAPACITY_ID
         left join RMS_GATEPOST RG
             on RG.GATEPOST_ID = TLFR.GATEPOST_ID
 
-        where RESULT_OUT_GATE_TIME is not null
+        where RESULT_OUT_GATE_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
             <if test="purchaseOrderNo != null">

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

@@ -612,13 +612,15 @@
                             on DB.BATCH_ID = APO.BATCH_ID
                   left join RMS_MATERIAL RM
                             on OOM.MATERIAL_ID = RM.MATERIAL_ID
+                  left join RMS_DRIVER_CAPACITY RDC
+                            on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                   left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
+                            on RC.CAPACITY_ID = RDC.CAPACITY_ID
                   left join RMS_SUPPLIER RS
                             on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                   left join RMS_CONSIGNEE RCON
                             on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-           where TLR.STATUS = #{status}
+           where TLR.STATUS = #{status} and OO.ORDER_TYPE = #{orderTypee}
          )
     <where>
       <if test="purchaseOrderId != null">

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

@@ -453,7 +453,7 @@
   </sql>
 
 <!--  查询所有签收实绩 -->
-  <select id="getReceiptResult" parameterType="java.util.Map" resultType="java.util.Map">
+  <select id="getCGReceiptResult" parameterType="java.util.Map" resultType="java.util.Map">
     select
            *
     from (
@@ -477,8 +477,10 @@
                             on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
                   left join DIL_BATCH DB
                             on DB.BATCH_ID = APO.BATCH_ID
+                  left join RMS_DRIVER_CAPACITY RDC
+                            on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                   left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
+                            on RC.CAPACITY_ID = RDC.CAPACITY_ID
                   left join TMSTRUCK_WEIGHT_RESULT TWR
                             on TWR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                   left join TMSTRUCK_UNLOAD_RESULT TUR
@@ -489,7 +491,7 @@
                             on OOM.MATERIAL_ID = RM.MATERIAL_ID
                   left join RMS_WAREHOUSE RW
                             on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-                where TRR.STATUS = 1
+                where TRR.STATUS = 1 and OO.ORDER_TYPE = #{orderTypee}
          )
         <where>
           <if test="purchaseOrderNo != null">

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

@@ -492,8 +492,8 @@
         </if>
     </sql>
 
-    <!-- 获取卸货实绩 -->
-    <select id="getUnloadResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    <!-- 获取采购卸货实绩 -->
+    <select id="getCGUnloadResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         select *
         from (
         select
@@ -519,11 +519,13 @@
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
         on OOM.MATERIAL_ID = RM.MATERIAL_ID
+        left join RMS_DRIVER_CAPACITY RDC
+        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        on RC.CAPACITY_ID = RDC.CAPACITY_ID
         left join RMS_WAREHOUSE RW
         on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        where RESULT_START_TIME is not null
+        where RESULT_START_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
             <if test="purchaseOrderNo != null">

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

@@ -564,7 +564,7 @@
   </select>
 
   <!--  查询所有的计毛实绩  -->
-  <select id="getAllJiMaoResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+  <select id="getCGAllJiMaoResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select *
     from (
     select
@@ -585,8 +585,10 @@
     on TTR.ORDER_ID = OO.ORDER_ID
     left join AMS_PURCHASE_ORDER APO
     on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join RMS_DRIVER_CAPACITY RDC
+            on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
     left join RMS_CAPACITY RC
-    on RC.CAPACITY_ID = OO.CAPACITY_ID
+    on RC.CAPACITY_ID = RDC.CAPACITY_ID
     left join RMS_TRUCK_CALCULATE RTC
     on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
     left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -597,7 +599,7 @@
     on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
     left join RMS_CONSIGNEE RCON
     on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-        where RESULT_GROSS_WEIGHT_TIME is not null
+    where RESULT_GROSS_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
     )
     <where>
       <if test="purchaseOrderNo != null">
@@ -655,7 +657,7 @@
   </select>
 
   <!--  查询所有的计皮实绩  -->
-    <select id="getAllJiPiResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    <select id="getCGAllJiPiResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select *
     from (
       select
@@ -681,8 +683,10 @@
     on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
     left join DIL_BATCH DB
     on DB.BATCH_ID = APO.BATCH_ID
+    left join RMS_DRIVER_CAPACITY RDC
+        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
     left join RMS_CAPACITY RC
-    on RC.CAPACITY_ID = OO.CAPACITY_ID
+    on RC.CAPACITY_ID = RDC.CAPACITY_ID
     left join RMS_TRUCK_CALCULATE RTC
     on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
     left join OMSTRUCK_ORDER_MATERIAL OOM