ytijsa

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

@@ -195,9 +195,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 throw  new Exception("该车作业环节未全部完成！");
             }
         }
+        Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
         if(orderType == 2){
             //根据总实绩ID查询该车有没有装货
-            Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
                 throw new Exception("该车未扫装货，请提醒司机去扫装货");
             }
@@ -215,6 +215,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
             }
         }
+        if(orderType == 13){
+            if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
+                throw new Exception("该车未扫装货，请提醒司机去扫装货");
+            }
+        }
         map.putAll(mesMap);
         map.putAll(selectMap);
         map.remove("Sqe");

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

@@ -1264,6 +1264,7 @@
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
           AND RM.MATERIAL_NAME = '钒渣'
+          AND OO.ORDER_TYPE = 2
           AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
     </select>