Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -125,8 +125,8 @@ public class OffSiteTransportationController extends BaseRESTfulController {
             SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
             String startTime1=simpleDateFormat.format(startDate);
             String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
+            mapValue.put("startTime",startTime1);
+            mapValue.put("endTime",endTime1);
         }
         List<Map<String,Object>> filter= offSiteTransportationService.getInTransitTransportation(mapValue);
         PageHelper.startPage(pageNum, pageSize);
@@ -171,8 +171,8 @@ public class OffSiteTransportationController extends BaseRESTfulController {
             SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
             String startTime1=simpleDateFormat.format(startDate);
             String endTime1=simpleDateFormat.format(ca.getTime());
-            mapValue.replace("startTime",startTime1);
-            mapValue.replace("endTime",endTime1);
+            mapValue.put("startTime",startTime1);
+            mapValue.put("endTime",endTime1);
         }
         //已经完成
         mapValue.put("orderStatus",2);

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

@@ -1269,7 +1269,7 @@
                         OO.INSERT_UPDATE_REMARK                              "demo",
                         ASM.EAS_PRIMARY_ID                                   "FLID"
 
-                 from OMSTRUCK_ORDER oo
+                 from OMSTRUCK_ORDER OO
                           left join OMSTRUCK_ORDER_MATERIAL OOM
                                     ON OO.ORDER_ID = OOM.ORDER_ID
                           LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
@@ -1321,7 +1321,8 @@
                           left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
                           left join AMS_SALE_ORDER_MATERIAL ASOM on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
                           left join AMS_SALE_ORDER ASO on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                          left join AMS_SALE_MATERIAL ASM on ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                          left join AMS_SALE_TRUCKNO_MATERIAL ASTM on ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+                          left join AMS_SALE_MATERIAL ASM on ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
                           left join RMS_SHIPPER RS on ASO.SHIPPER_ID = RS.SHIPPER_ID
                           left join RMS_CONSIGNEE RCON on ASO.RECEIVE_ID = RCON.CONSIGNEE_ID
                           left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID