扫码限制和调用计费

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.github.pagehelper.PageHelper;
+import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.ColumnDataFeign;
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.WmspInboundResultMapper;
@@ -61,6 +62,9 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
     @Autowired
     OmsFeign omsFeign;
 
+    @Autowired
+    BmsTruckFeign bmsTruckFeign;
+
 
     /**
      * 1.新增扫描吊牌实绩！！！此时入库实绩未生成
@@ -100,7 +104,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
             //关闭运输订单
             omsFeign.closeSteelOrderType4(DataChange.dataToBigDecimal(orderId));
             //生成计费详单
-            omsFeign.addInwardDetailsOrder(order);
+            bmsTruckFeign.addInwardDetailsOrder(order);
             return  success(mapList);
         }
         int isExist= wmsInboundScanResultService.isExist(map.get("userName").toString(),map.get("resultMaterial").toString().substring(0,map.get("resultMaterial").toString().length()-1));

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

@@ -1,7 +1,9 @@
 package com.steerinfo.dil.feign;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
@@ -15,4 +17,7 @@ public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
     int addDetailsOrder(Map<String,Object> map);
+
+    @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
+    RESTfulResult addInwardDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -18,7 +18,4 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstrainorders/generateOmstrain")
     int generateOmstrain(@RequestBody(required = false) Map<String,Object> map);
-
-    @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
-    RESTfulResult addInwardDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
 }

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

@@ -329,7 +329,6 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
             WmspInboundScanResult wmspInboundScanResult=new WmspInboundScanResult();
             //设置自增主键
             wmspInboundScanResult.setId(wmspInboundScanResultMapper.getCount());
-            System.out.println("resultId"+wmspInboundScanResult.getResultId());
             //获取班次次序的吊牌信息
             String resultMaterial=temp.get("resultMaterial").toString();
             String[] result = resultMaterial.split("-");