提交每天八点关单代码

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -859,8 +859,7 @@ public class RMScontroller {
         return rmsFeign.insertOilPrice(map);
     }
 
-    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
-    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @ApiOperation(value = "更新油价信息", notes = "根据油价ID来更新油价")
     @PostMapping(value = "/updateOilPrice")
     public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.updateOilPrice(mapValue);

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

@@ -240,9 +240,8 @@ public class UniversalServiceImpl implements UniversalService {
      * 关闭过期运输订单
      * @return
      */
-    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0,5,8 8 * * ?")
     public void closePassedOrder() {
-        System.out.println("我在十一点被执行");
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
         int result = universalMapper.closePassedOrder();
@@ -265,6 +264,8 @@ public class UniversalServiceImpl implements UniversalService {
         }catch (Exception e){
 
         }
+
+
         System.out.println("订单关闭数为：" + result);
         //return 1;
     }

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

@@ -1183,16 +1183,20 @@
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
                            ON TTR.ORDER_ID = OO.ORDER_ID
-                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                 ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = 1
           AND OO.ORDER_STATUS IN (4,5)
-          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
-          AND ASOM.SALE_DATE_OF_RECEIPT < sysdate
+          AND (TER.RESULT_ENTRY_GATE_TIME IS NULL
+          OR TWR.RESULT_TARE_WEIGHT =0)
+          AND OO.INSERT_TIME between
+          sysdate-1 and sysdate
           ORDER BY OO.ORDER_ID DESC
     </select>
 
@@ -1353,20 +1357,26 @@
 
     <update id="closePassedOrder" >
         UPDATE OMSTRUCK_ORDER OO
-        SET OO.CAN_WORK = 1
+        SET OO.ORDER_STATUS=7
         WHERE OO.ORDER_ID IN
         (SELECT OO.ORDER_ID
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID = OO.ORDER_ID
-        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                 ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = 1
-        AND OO.ORDER_STATUS IN (4,5)
-        AND TLFR.RESULT_OUT_GATE_TIME IS NULL
-        AND ASOM.SALE_DATE_OF_RECEIPT &lt; sysdate
+          AND OO.ORDER_STATUS IN (4,5)
+          AND (TER.RESULT_ENTRY_GATE_TIME IS NULL
+          OR TWR.RESULT_TARE_WEIGHT =0)
+          AND OO.INSERT_TIME between
+          sysdate-1 and sysdate
         )
     </update>