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

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

@@ -151,7 +151,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("resultId",tmstruckUnloadResultMapper.selectMaxId());
             map.put("Sqe",sqe);
             map.put("totalId",totalId);
-            i += tmstruckUnloadResultMapper.insertSelective(generateUnload(map));
+            TmstruckUnloadResult tmstruckUnloadResult = generateUnload(map);
+            i += tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
             //查询是否有净重 如果没有净重更新路段顺序号需要继续回皮 有就结束订单
@@ -212,7 +213,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //添加卸货点
         if(map.get("warehouseId") !=null){
             tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("warehouseId")));
-        }if(map.get("personnelSsoId") !=null){
+        }
+        if(map.get("personnelSsoId") !=null){
             //通过SSo主键查询人员管理主键
             Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String)map.get("personnelSsoId"));
             if(personnelId !=null){
@@ -221,7 +223,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         }
         //判断物资是否为空
         if(map.get("materialId") != null){
-            tmstruckUnloadResult.setUnloaderId(DataChange.dataToBigDecimal(map.get("materialId")));
+            tmstruckUnloadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         }
         //添加卸货时间
         tmstruckUnloadResult.setResultEndTime(new Date());

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

@@ -1439,7 +1439,7 @@
     LEFT JOIN RMS_WAREHOUSE RW
     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
     WHERE OO.ORDER_TYPE = 11
-    AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+    AND TLR.RESULT_LOAD_END_TIME IS NOT NULL
     )
     <where>
       <if test="resultLoadEndTime != null">

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

@@ -890,7 +890,7 @@
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        WHERE TUR.RESULT_START_TIME IS NOT NULL
+        WHERE TUR.RESULT_END_TIME IS NOT NULL
         AND OO.ORDER_TYPE = 11
         )
         <where>