tijia

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

@@ -18,7 +18,6 @@ import java.util.Map;
 public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
-    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId,
-                                        @RequestParam(value = "status") Integer status);
+    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
 
 }

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

@@ -748,11 +748,12 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             if(orderType.intValue() == 11){
                 List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
                 if(detailsIds.size() == 0){
-                    omsFeign.closeInwardOrder(orderId,1);
+                    omsFeign.closeInwardOrder(orderId);
                     count++;
                 }else{
-                    for(int i=0;i<detailsIds.size()-1;i++){
+                    for(int i=0;i<detailsIds.size();i++){
                         bmstruckDetailsOrderMapper.deleteByPrimaryKey(detailsIds.get(i));
+                        omsFeign.closeInwardOrder(orderId);
                         count++;
                     }
                 }
@@ -768,7 +769,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 }
                 inserInwardOrder(orderIdMap);
             }
-            if(orderType.intValue() == 23){
+            if(orderType.intValue() == 23 || orderType.intValue() == 24){
                 List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
                 for(BigDecimal detailsId:detailsIds){
                     //根据详单ID物理删除详单