修改

src/main/java/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.java

@@ -69,4 +69,6 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
 
     //清除重复实绩
     int clearRepeat(TmstruckUnloadResult TmstruckUnloadResult);
+
+    int selectUnloadIdByInwardSteel(Map<String, Object> map);
 }

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

@@ -223,6 +223,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         }
         Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
         if(selectMap == null){
+            if(orderType == 4) {
+                return i;
+            }
             throw new Exception("该车已出厂！！");
         }else{
             BigDecimal segmentSqe = DataChange.dataToBigDecimal(selectMap.get("segmentSqe"));

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

@@ -252,8 +252,12 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //获取该实绩的路段顺序号
         BigDecimal segmentSqe = DataChange.dataToBigDecimal(dataMap.get("segmentSqe"));
         //获取订单的路段顺序号
-        BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe"));
-        if(segmentSqe.intValue() > (orderSegmentSqe.intValue() + 1)){
+        BigDecimal orderSegmentSqe = DataChange.dataToBigDecimal(mesMap.get("orderSegmentSqe") );
+        Boolean unloadFlag = true;
+        if(orderType == 4 && tmstruckUnloadResultMapper.selectUnloadIdByInwardSteel(map) > 0 && netWeight > 0) {
+            unloadFlag = false;
+        }
+        if(segmentSqe.intValue() > (orderSegmentSqe.intValue() + 1) && unloadFlag){
             return -6;
         }
         map.putAll(dataMap);

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

@@ -3250,6 +3250,7 @@
                            ASM.SALE_MATERIAL_ID "saleMaterialId",
                            ASO.SALE_NUMBER "saleOrderNo",
                            ASM.MATERIAL_NUMBER "materialNum",
+                           ASOM.SALE_ORDER_MATERIAL_ID  "saleOrderMaterialId",
                            ASM.EAS_PRIMARY_ID "closeEntryId",
                            ASM.DELETED "deletedStatus",
                            RM.MATERIAL_ID "materialId",
@@ -3273,7 +3274,9 @@
                            RDOOUTDEP.ORG_NAME "transOutDep",
                            RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse",
                            oo.ORDER_NUMBER  "orderNumber",
+                           OO.ORDER_NUMBER  "orderNo",
                            oo.ORDER_STATUS "orderStatus",
+                           OO.OPTIONER_CODE "optionCode",
                            TWR.RESULT_NET_WEIGHT    "netWeight"
                        FROM
                            AMS_SALE_ORDER ASO
@@ -3296,7 +3299,6 @@
                                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                          AND TWR.MATERIAL_ID = ASM.MATERIAL_ID
-                                        AND TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
                        WHERE
                            ASO.SALE_TYPE = 4
                          AND ASO.DELETED = 0

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

@@ -1151,4 +1151,12 @@
             ROWS ONLY
         )
     </delete>
+    <select id="selectUnloadIdByInwardSteel" resultType="java.lang.Integer" parameterType="map">
+        select count(OOM.ORDER_ID) from OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
+        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+        ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
+        WHERE TPAR.SEND_STATION_ID = #{sendStationId}
+        AND OOM.ORDER_ID = #{orderId}
+    </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout