sha

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

@@ -248,6 +248,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      * @param map
      * @return
      */
+    @Transactional
     public int addXS2LoadResult(Map<String, Object> map){
         //通过运输订单号 查询 总实绩ID、订单类型
         Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
@@ -265,14 +266,21 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         Date loadEndTime = new Date();
         tmstruckLoadResult.setResultLoadEndTime(loadEndTime);
         //计算装车时长 取分钟
-        long differentTime = (loadEndTime.getTime() - loadStartTime.getTime() / 60000);
+        long differentTime = (loadEndTime.getTime() - loadStartTime.getTime()) / 60000;
         tmstruckLoadResult.setResultLoadDuration(new BigDecimal(differentTime));
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
         int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //装车成功后计算计毛汽车衡（出厂：2）
-        i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 2);
+        BigDecimal orderType = DataChange.dataToBigDecimal(orderMap.get("orderType"));
+        if(orderType.intValue() == 10){
+            //如果订单是采购内转类型订单
+            map.put("grossPlaceId", 15);
+            i += tmstruckWeightResultService.updateWeightResult(map);
+        }else {
+            i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 2);
+        }
         //更新路段顺序号
         i += utilsService.updateOrderLineSequence(map);
         //推送消息到websocket

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

@@ -639,12 +639,9 @@
             <if test="orderId != null">
                 OO.ORDER_ID = #{orderId}
             </if>
-            <if test="orderNumber != null">
+            <if test="orderNumber != null and orderId == null">
                 and OO.ORDER_NUMBER = #{orderNumber}
             </if>
-            <if test="capacityNumber != null">
-                RC.CAPACITY_NUMBER = #{capacityNumber} and OO.ORDER_STATUS != 2 --司机还未结束不能生成下一单
-            </if>
         </where>
     </select>