tijiao

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

@@ -339,8 +339,8 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
 
     @ApiOperation(value = "正常关闭运输订单")
     @PostMapping("/closeInwardOrder")
-    public RESTfulResult closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight,Integer status){
-        return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe, resultNetWeight,status));
+    public RESTfulResult closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight){
+        return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe, resultNetWeight));
     }
 
 

src/main/java/com/steerinfo/dil/service/IOmstruckOrderSeparateService.java

@@ -40,7 +40,7 @@ public interface IOmstruckOrderSeparateService {
     int batchCloseOrder(List<Map<String, Object>> mapList);
     List<Map<String,Object>> getOrderMaterial(Integer orderId);
 
-    int closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight,Integer status);
+    int closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight);
 
 
     List<Map<String,Object>> getTimeTaskEnd(Map<String, Object> map);

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

@@ -661,11 +661,11 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
     }
 
     @Override
-    public int closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight,Integer status) {
+    public int closeInwardOrder(Integer orderId, Integer sqe, String resultNetWeight) {
         int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         //根据运输订单id查找需求日期是否超过一个月
-        if (map != null && status != 1) {
+        if (map != null && i != 0) {
             if (DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 11) {
                 Date dueDate = (Date) map.get("dueTime");
                 //当前时间小于截至日期

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

@@ -537,7 +537,9 @@
         <if test="sqe != null">
             , OO.ORDER_LINE_SEQUENCE = #{sqe}
         </if>
-        where oo.ORDER_ID = #{orderId}
+        where
+        oo.order_status = 5
+        and oo.ORDER_ID = #{orderId}
     </update>
     <update id="updateSporadicStatus">
         update AMSTRUCK_SPORADIC_ORDER ASO