修改

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

@@ -379,4 +379,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     int deleteQueueResult(BigDecimal resultTotalId);
 
     int deleteQueueSpellList(BigDecimal capacityId);
+
+    Date getOrderPrintDate(BigDecimal orderId);
+
 }

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

@@ -139,4 +139,6 @@ public interface OmstruckOrderSeparateMapper {
 
     Integer getSaleOrderDelete(Object orderId);
 
+    String getPrintFlag();
+
 }

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

@@ -253,21 +253,23 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         }else if(orderType == 21|| orderType == 26){
             return getTimeOrderResult(resultTotalId);
         }
-        //else if(orderType == 1){
-        //    //如果是钢材的订单则
-        //    Map<String,Object> steelDeliveryOrderMap = new HashMap<>();
-        //    steelDeliveryOrderMap.put("pointName","小东门自助一体机");
-        //    steelDeliveryOrderMap.put("linkName","送货单打印");
-        //    steelDeliveryOrderMap.put("pointDate",null);
-        //    List<Map<String,Object>> steelList  = getNormalOrderResult(resultTotalId);
-        //    Map<String,Object> steelLeaveFactoryMap = steelList.get(steelList.size()-1);
-        //    steelDeliveryOrderMap.put("segmenSqe",steelLeaveFactoryMap.get("segmenSqe"));
-        //    steelLeaveFactoryMap.put("segmenSqe",DataChange.dataToBigDecimal(steelLeaveFactoryMap.get("segmenSqe")).intValue() + 1);
-        //    steelList.remove(steelList.size()-1);
-        //    steelList.add(steelDeliveryOrderMap);
-        //    steelList.add(steelLeaveFactoryMap);
-        //    return steelList;
-        //}
+        else if(orderType == 1 && "true".equals(omstruckOrderSeparateMapper.getPrintFlag())){
+            //如果是钢材的订单则
+            //根据订单id,查询送货单打印时间
+            Date printDate = omstruckOrderMapper.getOrderPrintDate(orderId);
+            Map<String,Object> steelDeliveryOrderMap = new HashMap<>();
+            steelDeliveryOrderMap.put("pointName","送货单打印");
+            steelDeliveryOrderMap.put("linkName","打单");
+            steelDeliveryOrderMap.put("pointDate",printDate);
+            List<Map<String,Object>> steelList  = getNormalOrderResult(resultTotalId);
+            Map<String,Object> steelLeaveFactoryMap = steelList.get(steelList.size()-1);
+            steelDeliveryOrderMap.put("segmenSqe",steelLeaveFactoryMap.get("segmenSqe"));
+            steelLeaveFactoryMap.put("segmenSqe",DataChange.dataToBigDecimal(steelLeaveFactoryMap.get("segmenSqe")).intValue() + 1);
+            steelList.remove(steelList.size()-1);
+            steelList.add(steelDeliveryOrderMap);
+            steelList.add(steelLeaveFactoryMap);
+            return steelList;
+        }
         else{
             return getNormalOrderResult(resultTotalId);
         }

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

@@ -2198,7 +2198,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             }
             if(orderType == 23 || orderType == 24){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
-                if(planEnable == 0){ // 数据为0则失效
+                int GoBeyondCount = omstruckOrderMapper.getGoBeyondCount(orderMesMap.get("orderId"));
+                if(planEnable == 0 || GoBeyondCount == 0){ // 数据为0则失效
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }

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

@@ -4377,4 +4377,8 @@
         delete from QMS_QUEUE_SPELLING_LIST QQSL where QQSL.QUEUE_RESULT_ID =
         (SELECT QQR.RESULT_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId})
     </delete>
+    <select id="getOrderPrintDate" resultType="java.util.Date" parameterType="java.math.BigDecimal">
+        SELECT OO.PRINTDATE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>

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

@@ -943,4 +943,8 @@
         WHERE
             OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getPrintFlag" resultType="java.lang.String">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
 </mapper>