修改

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

@@ -15,6 +15,7 @@ import com.steerinfo.dil.util.EASCapacityTestUtil;
 import com.steerinfo.dil.util.SaleLogUtil;
 import com.steerinfo.dil.util.getRequestUtils;
 import io.swagger.models.auth.In;
+import org.apache.tools.ant.taskdefs.Sleep;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1023,9 +1024,23 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                         //该车两天内有进厂,且进厂后没有出厂纪录
                         //更新ok
                         System.out.println("自动补扫进厂");
-                        omstruckOrderMapper.updateEnFactoryResultRemark(DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
-                        tmsTruckFeign.enFactoryResultByPDA(orderMessage);
                         saleLogUtil.logOrder(orderId,"两天内进厂且无出厂纪录,系统自动补扫进厂",map,1);
+                        omstruckOrderMapper.updateEnFactoryResultRemark(DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
+                        try{
+                            new Thread( new Runnable() {
+                                public void run(){
+                                    try {
+                                        Thread.sleep(100);
+                                    } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                    }
+                                    orderMessage.put("gatepostId",29998);
+                                    tmsTruckFeign.enFactoryResultByPDA(orderMessage);
+                                }
+                            }).start();
+                        }catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 }
             }

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

@@ -491,6 +491,7 @@
     OO.ORDER_STATUS "orderStatus",
     OTO.ORDER_ID    "trainOrderId",
     OTO.ORDER_WAGON_NO  "wagonNo",
+    rpg.INSERT_UPDATE_REMARK    "stackName",
     to_char(OTO.ENSTATION_TIME,'yyyy-mm-dd') "enStationTime",
     to_char(OTO.OUTSTATION_TIME,'yyyy-mm-dd') "outStationTime",
     RW.WAREHOUSE_NAME   "sendStation",

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

@@ -4294,8 +4294,8 @@
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
         TTR.RESULT_TOTAL_ID "resultTotalId",
         OO.ORDER_STATUS "orderStatus",
-        RAS.ARRIVAL_NAME "sendStaionName",
-        RPG.INSERT_UPDATE_REMARK    "stackName"
+        RAS.ARRIVAL_NAME "sendStaionName"
+
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -4318,8 +4318,6 @@
         and
         RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
         ) TEMP ON TEMP."orderId"=OO.ORDER_ID
-        LEFT JOIN RMS_PWAREHOUSE_GRID RPG
-        ON RPG.STACKING_ID = OO.ORDER_ID
         WHERE
         OO.ORDER_ID = #{orderId}
         AND rownum =1