修改

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

@@ -340,7 +340,7 @@ 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));
+        return success(omstruckOrderSeparateService.closeInwardOrder(orderId, sqe, resultNetWeight));
     }
 
 

src/main/java/com/steerinfo/dil/feign/BmsTruckFeign.java

@@ -17,5 +17,5 @@ import java.util.Map;
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
-    int addDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
+    RESTfulResult addDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -10,6 +10,7 @@ import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.dil.service.IOmstruckOrderSeparateService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -661,11 +662,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");
                 //当前时间小于截至日期
@@ -696,7 +697,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             if(priceValueMap != null){
                 priceValueMap.put("netWeight", resultNetWeight);
                 priceValueMap.put("orderId",orderId);
-                i += bmsTruckFeign.addDetailsOrder(priceValueMap);
+                RESTfulResult resTfulResult =  bmsTruckFeign.addDetailsOrder(priceValueMap);
             }
         } catch (Exception e) {
             e.printStackTrace();

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