Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/steerinfo/dil/controller/AMScontroller.java
#	src/main/java/com/steerinfo/dil/feign/AmsFeign.java

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

@@ -2034,11 +2034,15 @@ public class AMScontroller{
         return amsFeign.getKucunList(map==null?new HashMap<>():map,startTime,endTime,remark,transferIndep,consigneeName,totheStation);
     }
 
+    @ApiOperation("批量保存库存调拨单")
+    @PostMapping("batchUpdateInwardConsignee")
+    public Map<String,Object> batchUpdateInwardConsignee(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.batchUpdateInwardConsignee(mapList);
+    }
 
     @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
     @PostMapping("/getNotice")
     public RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue){
-
         return amsFeign.getNotice(mapValue);
     }
 
@@ -2053,4 +2057,11 @@ public class AMScontroller{
     RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList){
         return amsFeign.queryMaterial(mapList);
     }
+
+    @ApiOperation("excel导入批量新增销售订单")
+    @PostMapping("addSteelSaleOrderList")
+    public Map<String,Object> addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        return amsFeign.addSteelSaleOrderList(mapList);
+    }
+
 }

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

@@ -667,12 +667,18 @@ public class BMSController extends BaseRESTfulController {
                                                  String carrierSsoId,
                                                  String userId,
                                                  String startTime,
-                                                 String endTime){
+                                                 String endTime,
+                                                 String orgCode,
+                                                 String capacityNo,
+                                                 String transRangeValues,
+                                                 String materialTypeNames,
+                                                 String shipperNames,
+                                                 String isPage){
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
         return bmstruckFeign.getNoInwardDetails(mapVal, pageNum, pageSize, apiId, carrierSsoId,userId, startTime,
-                endTime);
+                endTime,orgCode,capacityNo,transRangeValues,materialTypeNames,shipperNames,isPage);
     }
 
     @PostMapping("/getInwardWeightTimeDetailsOrder")
@@ -785,4 +791,10 @@ public class BMSController extends BaseRESTfulController {
         }
         return bmsshipFeign.editShipFeeStatement(map);
     }
+
+    //手动生成详单
+    @PostMapping("/newInwardSettle")
+    public Map<String,Object> newInwardSettle(@RequestBody  Map<String,Object> map){
+        return bmstruckFeign.newInwardSettle(map);
+    }
 }

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

@@ -1089,5 +1089,10 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.reduceInboundEas(inboundEasId);
     }
 
+    @ApiOperation("listAfterInwardOutbound")
+    @PostMapping("listAfterInwardOutbound")
+    public Map<String,Object> listAfterInwardOutbound(@RequestBody List<Map<String,Object>>mapList){
+        return wmsFeign.listAfterInwardOutbound(mapList);
+    }
 }
 

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

@@ -1763,6 +1763,10 @@ public interface AmsFeign {
                                      @RequestParam String consigneeName,
                                      @RequestParam String totheStation);
 
+
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/batchUpdateInwardConsignee")
+    Map<String, Object> batchUpdateInwardConsignee(@RequestBody List<Map<String, Object>> mapList);
+
     @PostMapping(value = "/api/v1/ams/dilnotices/getNotice")
     RESTfulResult getNotice(@RequestBody(required = false) Map<String, Object> mapValue);
 
@@ -1771,4 +1775,8 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/queryMaterial")
     RESTfulResult queryMaterial(@RequestBody List<Map<String,Object>> mapList);
+
+    @PostMapping("/api/v1/ams/amssaleorders/addSteelSaleOrderList")
+    Map<String, Object> addSteelSaleOrderList(@RequestBody List<Map<String, Object>> mapList);
+
 }

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

@@ -273,7 +273,13 @@ public interface BmstruckFeign {
                                            @RequestParam("carrierSsoId") String carrierSsoId,
                                            @RequestParam("userId") String userId,
                                            @RequestParam("startTime") String startTime,
-                                           @RequestParam("endTime") String endTime);
+                                           @RequestParam("endTime") String endTime,
+                                           @RequestParam("orgCode") String orgCode,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("transRangeValues") String transRangeValues,
+                                           @RequestParam("materialTypeNames") String materialTypeNames,
+                                           @RequestParam("shipperNames") String shipperNames,
+                                           @RequestParam("isPage") String isPage);
 
 
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getSteelTruckDetailsOrder")
@@ -286,6 +292,10 @@ public interface BmstruckFeign {
                                                   @RequestParam String startTime,
                                                   @RequestParam String endTime,
                                                   @RequestParam String con);
+
+    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/newInwardSettle")
+    Map<String, Object> newInwardSettle(@RequestBody Map<String,Object> map);
+
 }
 
 

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

@@ -915,4 +915,6 @@ public interface WMSFeign {
     @PostMapping("/api/v1/wms/inboundEas/reduceInboundEas")
     Map<String, Object> reduceInboundEas(@RequestParam Integer inboundEasId);
 
+    @PostMapping("/api/v1/wms/platformWarehouse/listAfterInwardOutbound")
+    Map<String, Object> listAfterInwardOutbound(@RequestBody List<Map<String, Object>> mapList);
 }

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8095}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign: