修改

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

@@ -71,4 +71,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     String getOrderCapacityHistory(BigDecimal orderId);
 
+    int selectOutFactory(BigDecimal orderId);
+
 }

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

@@ -2950,8 +2950,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateTransportOrderStatus(BigDecimal orderId) {
         //查询该运单下有没有净重,没有净重就变为7，有净重就变为2
         int netWeight = omstruckOrderMapper.selectNetWeightCount(orderId);
+        //查询该运单有没有出厂,没有出厂才变2
+        int outFactory = omstruckOrderMapper.selectOutFactory(orderId);
         int orderStatus = 7;
-        if(netWeight > 0) {
+        if(netWeight > 0 && outFactory == 0) {
             orderStatus = 2;
         }
         return amsSaleOrderMaterialMapper.updateTransportOrderStatus(orderId,orderStatus);

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

@@ -953,5 +953,12 @@
     <select id="getTelByCapacityId" resultType="java.lang.String">
         SELECT CAPACITY_TEL FROM RMS_CAPACITY WHERE CAPACITY_ID= #{capacityId}
     </select>
+    <select id="selectOutFactory" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT COUNT(TLFR.RESULT_ID) FROM TMSTRUCK_TOTAL_RESULT TTR
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId}
+        AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+    </select>
 
 </mapper>