2021年12月3日01:59:06 采购辅料

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

@@ -56,6 +56,16 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiOperation(value="更新计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "计量数据", required = false, dataType = "List<Map>"),
+    })
+    @PostMapping("/updateTruckWeight")
+    public RESTfulResult updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
+        int i = tmstruckWeightResultService.updateTruckWeight(mapList);
+        return success(i);
+    }
+
     @ApiOperation(value="查询计毛实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -21,6 +21,9 @@ public interface ITmstruckWeightResultService{
     //更新计毛实绩
     int addJiMaoResult(Map<String, Object> map);
 
+    //计量接口更新实绩
+    int updateTruckWeight(List<Map<String, Object>> mapList);
+
     //查询所有计毛实绩
     List<Map<String, Object>> getAllJiMaoResult(Map<String, Object> map);
 

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

@@ -27,7 +27,7 @@ public interface IUtilsService {
     Integer queryWarehouseIdByName(String warehouseName);
 
     //用于更新路段顺序号
-    int updateOrderLineSequence(Map<String, Object> map);
+    int updateOrderLineSequence(Map<String, Object> map, Integer num);
 
     //通过月台名称查找月台Id platformName
     Integer queryPlatformIdByName(String platformName);

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

@@ -62,9 +62,9 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         //生成进厂作业主键Id
         //添加主键
         tmstruckEnfactoryResult.setResultId(tmstruckEnfactoryResultMapper.selectMaxId());
-        //如果有线路ID  添加门岗ID 路线起点就是进厂门岗
-        if(map.get("lineStartNodeId") != null){
-            tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("lineStartNodeId")));
+        //如果有门岗ID  添加门岗ID 路线起点就是进厂门岗
+        if(map.get("gatepostId") != null){
+            tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("gatepostId")));
         }
         //添加实绩总表Id
         tmstruckEnfactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
@@ -189,13 +189,13 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 map.put("grossPlaceId", 3);
                 i += tmstruckWeightResultService.updateWeightResult(map);
 //                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                //路段顺序号 + 1
+                i += utilsService.updateOrderLineSequence(map, 2);
                 break;
             case 10: // 采购内转（老区-厂内） 没有进厂
                 break;
             case 11:
         }
-        //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
         return i;
     }
 
@@ -264,9 +264,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         //获取进厂实绩id
         tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         //添加门岗
-        String gatepostName = (String) map.get("gatepostName");
-        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
-        tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostId));
+        tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("gatepostId")));
         //添加进厂时间
         tmstruckEnfactoryResult.setResultEntryGateTime(new Date());
         tmstruckEnfactoryResult.setInsertTime(new Date());

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

@@ -170,7 +170,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 11:
         }
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
+        i += utilsService.updateOrderLineSequence(map, 1);
         return i;
     }
 

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

@@ -169,7 +169,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     /**
      * PDA新增销售钢材装车实绩  （如果是多种物资【多拼】，通过物资Id和运输订单号来确定唯一的装车实绩进行修改）
      *    orderNumber 运输订单号
-     *  insertUpdateRemark 备注  platformName 月台名称  scanText 扫描结果
+     *  insertUpdateRemark 备注   scanText 扫描结果
      * @param map
      * @return
      */

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

@@ -160,7 +160,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
         }
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
+        i += utilsService.updateOrderLineSequence(map, 1);
         return i;
     }
 

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

@@ -15,6 +15,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -208,7 +210,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
+        i += utilsService.updateOrderLineSequence(map, 1);
         return i;
     }
 
@@ -314,11 +316,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
         i += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
+        i += utilsService.updateOrderLineSequence(map, 1);
         return i;
     }
 
 
+
+
     /**
      * 生成计皮实绩
      * @param tmstruckWeightResult
@@ -455,4 +459,88 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         return updateWeightResult(oIdAndMidMap);
     }
 
+
+    /**
+     * 添加计量实绩
+     * 传参样式：
+     * {
+     *     "orderNumber":"WYSDD2021091000000002",
+     *      "resultTareCalculateNumber":"1号汽车衡",
+     *     "resultCrossCalculateNumber":"1号汽车衡",
+     *      "resultTareWeight":40.00,
+     *     "resultCrossWeight":40.00,
+     *      "resultNetWeight":0,
+     *     "resultTareWeightTime":"2021-09-10 09:05:22",
+     *     "resultCrossWeightTime":"2021-09-10 09:05:22",
+     *     "resultNetWeightTime":"2021-09-10 09:05:22",
+     *     "resultPoundNo":"Bd123456780",
+     *      "materialId":40
+     *      --“IsAssembly”:”false”
+     * }
+     * @param mapList
+     * @return
+     */
+    public int updateTruckWeight(List<Map<String, Object>> mapList){
+        //遍历列表
+        int count = 0;
+        for (Map<String, Object> map : mapList) {
+            //通过传来的运输订单号 与 物资ID查询计重实绩ID
+            map.putAll(tmstruckWeightResultMapper.selectTotalIdByOrderNo(map));
+            try {
+                TmstruckWeightResult tmstruckWeightResult = generateWeightResult(map);
+                count += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return count;
+    }
+
+    /**
+     * 生成计量实体类
+     * @param map
+     * @return
+     */
+    public TmstruckWeightResult generateWeightResult(Map<String, Object> map) throws ParseException {
+        TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
+        tmstruckWeightResult.setId(DataChange.dataToBigDecimal(map.get("weightTaskResultId")));
+        //磅单号
+        tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
+        //如果计皮汽车衡不为空 查询汽车衡ID
+        if(map.get("resultTareCalculateNumber") != null){
+            Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
+            tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(tareId));
+        }
+        //如果计毛汽车衡不为空 查询计毛汽车衡
+        if(map.get("resultCrossCalculateNumber") != null){
+            Integer crossId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultCrossCalculateNumber"));
+            tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(crossId));
+        }
+        //毛重
+        BigDecimal resultCrossWeight = DataChange.dataToBigDecimal(map.get("resultCrossWeight"));
+        tmstruckWeightResult.setResultGrossWeight(resultCrossWeight);
+        //皮重
+        BigDecimal resultTareWeight = DataChange.dataToBigDecimal(map.get("resultTareWeight"));
+        tmstruckWeightResult.setResultTareWeight(resultTareWeight);
+        //净重
+        tmstruckWeightResult.setResultNetWeight(DataChange.dataToBigDecimal(map.get("resultNetWeight")));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //毛重时间
+        Object resultCrossWeightTime =  map.get("resultCrossWeightTime");
+        if(resultCrossWeightTime != null)
+            tmstruckWeightResult.setResultGrossWeightTime(sdf.parse((String) resultCrossWeightTime));
+        //皮重时间
+        Object resultTareWeightTime = map.get("resultTareWeightTime");
+        if(resultTareWeightTime != null)
+            tmstruckWeightResult.setResultTareWeightTime(sdf.parse((String) resultCrossWeightTime));
+        //如果皮重毛重都有数据则是第二次计量设置更新 否则为第一次计量
+        if(resultCrossWeight.intValue() != 0 && resultTareWeight.intValue() != 0){
+            tmstruckWeightResult.setUpdateTime(new Date());
+            tmstruckWeightResult.setUpdateUsername("admin");
+        }else {
+            tmstruckWeightResult.setInsertTime(new Date());
+            tmstruckWeightResult.setInsertUsername("admin");
+        }
+        return tmstruckWeightResult;
+    }
 }

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

@@ -77,7 +77,7 @@ public class UtilsServiceImpl implements IUtilsService {
      * @param map 运输订单号 或者是运输订单ID
      * @return
      */
-    public int updateOrderLineSequence(Map<String, Object> map){
+    public int updateOrderLineSequence(Map<String, Object> map, Integer num){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         if(orderId.intValue() == 0){
             //如果没有传入运输订单Id则需要传入了运输订单号
@@ -86,7 +86,7 @@ public class UtilsServiceImpl implements IUtilsService {
         Integer lineSequence = getLineSequenceByOrderId(orderId);
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
-        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + 1);
+        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + num);
         return utilsMapper.updateLineSeqByOrderIdOrNum(mesMap);
     }
 

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

@@ -47,6 +47,8 @@ public class DataChange {
         if (data != null){
             if(data instanceof String){
                 String data1 = (String) data;
+                if(data1.length()==0)
+                    return new BigDecimal(0);
                 return new BigDecimal(data1);
             }
             if(data instanceof Integer){

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

@@ -466,10 +466,8 @@
         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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         left join RMS_CONSIGNEE RCON
@@ -859,25 +857,18 @@
                            ON TTR.ORDER_ID = OO.ORDER_ID
                  LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_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 = RDC.CAPACITY_ID
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
 -- WHERE TER
     </select>
 
     <!-- APP通过运输订单id查询进厂实绩 -->
     <select id="getEnfactoryMessageByOrderId" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT OO.ORDER_NUMBER     AS "orderNumber",
-               RCA.CAPACITY_NUMBER AS "capacityNumber",
-               RCD.DRIVER_NAME     AS "driverName"
+               RCA.CAPACITY_NUMBER AS "capacityNumber"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                  LEFT JOIN RMS_CAPACITY RCA
-                           ON RCA.CAPACITY_ID = RDC.CAPACITY_ID
-                 LEFT JOIN RMS_CAR_DRIVER RCD
-                           ON RCD.DRIVER_ID = RDC.DRIVER_ID
+                           ON RCA.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -908,10 +899,8 @@
                                     ON RS.SHIPPER_ID = AROD.SHIPPER_ID
                           LEFT JOIN RMS_WAREHOUSE RW
                                     ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_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 = RDC.CAPACITY_ID
+                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  WHERE OO.ORDER_TYPE = 4
                    AND TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
              )
@@ -993,10 +982,8 @@
                                     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 = RDC.CAPACITY_ID
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                           left join RMS_SUPPLIER RS
                                     on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                           left join RMS_CONSIGNEE RCON
@@ -1096,10 +1083,8 @@
         ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM

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

@@ -467,10 +467,8 @@
             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 = RDC.CAPACITY_ID
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_GATEPOST RG
             on RG.GATEPOST_ID = TLFR.GATEPOST_ID
 
@@ -559,14 +557,12 @@
                OO.ORDER_ID "orderId",
                OO.ORDER_TYPE "orderTypee",
                TTR.RESULT_TOTAL_ID "resultTotalId",
-               RDC.CAPACITY_ID "capacityId"
+               OO.CAPACITY_ID "capacityId"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID
                  left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                            on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 left join RMS_DRIVER_CAPACITY RDC
-                           on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
@@ -836,10 +832,8 @@
                                     ON OO.ORDER_ID = TTR.ORDER_ID
                           LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
                                     ON AROD.DAYPLAN_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 = RDC.CAPACITY_ID
+                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN RMS_GATEPOST RG
                                     ON RG.GATEPOST_ID = TLFR.GATEPOST_ID
                  WHERE OO.ORDER_TYPE = 4
@@ -918,10 +912,8 @@
                                     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 = RDC.CAPACITY_ID
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                           left join RMS_GATEPOST RG
                                     on RG.GATEPOST_ID = TLFR.GATEPOST_ID
 
@@ -1002,10 +994,8 @@
         on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on OO.ORDER_ID = TTR.ORDER_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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TLFR.GATEPOST_ID
 

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

@@ -664,10 +664,8 @@
         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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         left join RMS_CONSIGNEE RCON
@@ -986,10 +984,8 @@
                 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 = RDC.CAPACITY_ID
+                ON RC.CAPACITY_ID = OO.CAPACITY_ID
             LEFT JOIN RMS_STANDARD_DATA RSD
                 ON RSD.STANDARD_DATA_ID = TLR.LOAD_STANDARD_TIME_ID
             LEFT JOIN RMS_PERSONNEL RP
@@ -1104,7 +1100,6 @@
                  select OO.ORDER_ID        "orderId",
                         OO.ORDER_NUMBER    "orderNumber",
                         ASO.SALE_NUMBER    "saleNumber",
-                        RCD.DRIVER_NAME    "driverName",
                         RC.CAPACITY_NUMBER "capacityNumber",
                         OO.ORDER_ISSUE_TIME "orderIssueTime"
                  from OMSTRUCK_ORDER OO
@@ -1112,12 +1107,8 @@
                                     on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
                           left join AMS_SALE_ORDER ASO
                                     on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                          left join RMS_DRIVER_CAPACITY RDC
-                                    on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-                          left join RMS_CAR_DRIVER RCD
-                                    on RCD.DRIVER_ID = RDC.DRIVER_ID
                           left join RMS_CAPACITY RC
-                                    on RDC.CAPACITY_ID = RC.CAPACITY_ID
+                                    on OO.CAPACITY_ID = RC.CAPACITY_ID
                  where OO.ORDER_ID in (select OO.ORDER_ID
                                        from QMS_QUEUE_RESULT QQR
                                                 left join TMSTRUCK_TOTAL_RESULT TTR
@@ -1194,10 +1185,8 @@
                                     ON OO.ORDER_ID = TTR.ORDER_ID
                           LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
                                     ON AROD.DAYPLAN_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 = RDC.CAPACITY_ID
+                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN RMS_PERSONNEL RP
                                     ON RP.PERSONNEL_ID = TLR.LOADER_ID
                           LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
@@ -1309,10 +1298,8 @@
                                     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 = RDC.CAPACITY_ID
+                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN RMS_WAREHOUSE RW
                                     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
                  WHERE OO.ORDER_TYPE = #{orderTypee}
@@ -1395,10 +1382,8 @@
                                     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 = RDC.CAPACITY_ID
+                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN RMS_WAREHOUSE RW
                                     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
                  WHERE OO.ORDER_TYPE = 11

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

@@ -479,10 +479,8 @@
                             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 = RDC.CAPACITY_ID
+                            on RC.CAPACITY_ID = OO.CAPACITY_ID
                   left join TMSTRUCK_WEIGHT_RESULT TWR
                             on TWR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                   left join TMSTRUCK_UNLOAD_RESULT TUR
@@ -571,10 +569,8 @@
                               ON OO.ORDER_ID = TTR.ORDER_ID
                     LEFT JOIN RMS_WAREHOUSE RW
                               ON RW.WAREHOUSE_ID = TRR.WAREHOUSE_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 = RDC.CAPACITY_ID
+                              ON RC.CAPACITY_ID = OO.CAPACITY_ID
             WHERE OO.ORDER_TYPE = 4 AND TRR.STATUS = 1
            )
     <where>
@@ -636,10 +632,8 @@
                             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 = RDC.CAPACITY_ID
+                            on RC.CAPACITY_ID = OO.CAPACITY_ID
                   left join TMSTRUCK_WEIGHT_RESULT TWR
                             on TWR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                   left join TMSTRUCK_UNLOAD_RESULT TUR

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

@@ -350,7 +350,6 @@
                       RC.CAPACITY_NUMBER           "capacityNumber",
                       RW1.WAREHOUSE_NAME           "warehouseName1",
                       RW2.WAREHOUSE_NAME           "warehouseName2",
-                      RCD.DRIVER_NAME              "driverName",
                       RCT.CAPACITY_TYPE_NAME       "capacityTypeName",
                       RS.SHIPPER_NAME              "shipperName",
                       AIR.REQUIREMENT_WORK_CONTENT "requirmentWorkContent",
@@ -374,12 +373,8 @@
                                   ON RW2.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
                         LEFT JOIN RMS_CAPACITY RC
                                   ON OO.CAPACITY_ID = RC.CAPACITY_ID
-                        LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                                  ON RC.CAPACITY_ID = RDC.CAPACITY_ID
                         LEFT JOIN RMS_CAPACITY_TYPE RCT
                                   ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
-                        LEFT JOIN RMS_CAR_DRIVER RCD
-                                  ON RDC.DRIVER_ID = RCD.DRIVER_ID
                         LEFT JOIN RMS_SHIPPER RS
                                   ON AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
                WHERE AIR.REQUIREMENT_TYPE = '计时'

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

@@ -659,10 +659,8 @@
         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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -757,10 +755,8 @@
         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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1068,10 +1064,8 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMS_SALE_ORDER ASO
         on ASO.SALE_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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1195,10 +1189,8 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMS_SALE_ORDER ASO
         on ASO.SALE_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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1386,10 +1378,8 @@
                                     ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
                           LEFT JOIN RMS_TRUCK_CALCULATE RTC
                                     ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_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 = RDC.CAPACITY_ID
+                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
                 WHERE OO.ORDER_TYPE = 4 AND TWR.RESULT_TARE_WEIGHT IS NOT NULL
              )
         <where>
@@ -1499,10 +1489,8 @@
             ON RW.WAREHOUSE_ID = AROD.RECEIVING_UNIT_ID
         LEFT JOIN RMS_TRUCK_CALCULATE RTC
             ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_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 = RDC.CAPACITY_ID
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_TYPE = 4 AND TWR.RESULT_GROSS_WEIGHT IS NOT NULL
         )
         <where>
@@ -1609,10 +1597,8 @@
                                     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 = RDC.CAPACITY_ID
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                           left join RMS_TRUCK_CALCULATE RTC
                                     on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
                           left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1714,10 +1700,8 @@
                                     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 = RDC.CAPACITY_ID
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                           left join RMS_TRUCK_CALCULATE RTC
                                     on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
                           left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1832,10 +1816,8 @@
         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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -1948,10 +1930,8 @@
         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 = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
@@ -2047,10 +2027,8 @@
                                     on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                           left join OMSTRUCK_ORDER OO
                                     on TTR.ORDER_ID = OO.ORDER_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 = RDC.CAPACITY_ID
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                           left join RMS_TRUCK_CALCULATE RTC
                                     on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
                           left join OMSTRUCK_ORDER_MATERIAL OOM