修改

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

@@ -2310,4 +2310,53 @@ public class AMScontroller{
         return amsFeign.updateSaleOrderRemark(mapValue);
     }
 
+    @ApiOperation(value="新增欧冶具体库房信息")
+    @PostMapping("/insertOyeWarehouse")
+    public Map<String,Object> insertOyeWarehouse(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.insertOyeWarehouse(mapValue);
+    }
+
+
+    @ApiOperation(value = "查询欧冶库房信息")
+    @PostMapping("/getOyeWarehouse")
+    public Map<String,Object>  getOyeWarehouse(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      Integer pageNum,
+                                      Integer pageSize,
+                                      Integer apiId){
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return amsFeign.getOyeWarehouse(mapValue,pageNum,pageSize,apiId);
+    }
+
+    @ApiOperation(value = "查询转运计划信息")
+    @PostMapping("/getTransPlan")
+    public Map<String,Object> getTransPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId){
+        if(mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return amsFeign.getTransPlan(mapValue,pageNum,pageSize,apiId);
+    }
+
+    @ApiOperation(value="审核转运计划")
+    @PostMapping("/approveTransPlan")
+    public Map<String,Object> approveTransPlan(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.approveTransPlan(mapValue);
+    }
+
+    @ApiOperation(value="批量新增欧冶转运计划")
+    @PostMapping("/addTransPlanList")
+    public Map<String,Object> addTransPlanList(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.addTransPlanList(mapList);
+    }
+
+    @ApiOperation(value="新增转运计划")
+    @PostMapping("/addTransPlan")
+    public Map<String,Object> addTransPlan(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addTransPlan(mapValue);
+    }
+
 }

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

@@ -1344,4 +1344,48 @@ public class RMScontroller {
     public Map<String, Object> deleteReceiveCompany(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteReceiveCompany(id);
     }
+
+    @ApiOperation(value = "物资单重信息展示")
+    @PostMapping("/getMaterialSingleWeightList")
+    public Map<String, Object> getMaterialSingleWeightList(@RequestBody(required = false) Map<String,Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getMaterialSingleWeightList(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value = "直发城市维护")
+    @PostMapping("/getDirectlySentCity")
+    public Map<String, Object> getDirectlySentCity(@RequestBody(required = false) Map<String,Object> map,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getDirectlySentCity(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value = "直发城市新增")
+    @PostMapping("/insertDirectlySentCityInfo")
+    public Map<String, Object> insertDirectlySentCityInfo(@RequestBody Map<String,Object> map) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.insertDirectlySentCityInfo(map);
+    }
+
+    @ApiOperation(value = "直发城市删除")
+    @PostMapping("/deleteInfo")
+    public Map<String, Object> deleteInfo(@RequestBody Map<String,Object> map) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.deleteInfo(map);
+    }
 }

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

@@ -2889,4 +2889,32 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.yawnReport(map);
     }
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getOyeSteelReport")
+    public Map<String,Object> getOyeSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler,
+                                                 String easPrimaryId){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getOyeSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler,easPrimaryId);
+    }
+
+
+    @ApiOperation("根据车序号id查询主干数据")
+    @PostMapping("/getOyeSteelReportDetailsBySmId")
+    public Map<String,Object> getOyeSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId){
+        return tmsTruckFeign.getOyeSteelReportDetailsBySmId(saleOrderMaterialId);
+    }
 }

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

@@ -511,6 +511,14 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+
+    @ApiModelProperty(value = "选择器承运商")
+    @PostMapping("/getCarrierIdBySelect")
+    public RESTfulResult getCarrierIdBySelect(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getCarrierIdBySelect(index == null ? "" : index);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "模糊查询收货单位")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -842,6 +850,7 @@ public class UniversalController extends BaseRESTfulController {
         return success(townList);
     }
 
+
     @ApiOperation(value="根据省市县得到下面的详细地址")
     @PostMapping("/getPlaceByAllAddress")
     public RESTfulResult getPlaceByAllAddress(@RequestBody Map<String,Object> mapValue){
@@ -1275,4 +1284,16 @@ public class UniversalController extends BaseRESTfulController {
     public String getWlUrl() {
         return universalMapper.getWlUrl();
     }
+
+    @PostMapping("/getOyeConsigneeId")
+    public RESTfulResult getOyeConsigneeId(@RequestBody(required = false) Map<String,Object> map) {
+        return success(universalMapper.getOyeConsigneeId(map));
+    }
+
+    @PostMapping("/getOyeSaleArea")
+    public RESTfulResult getOyeSaleArea(@RequestBody(required = false) Map<String,Object> map) {
+        return success(universalMapper.getOyeSaleArea(map));
+    }
+
+
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -1121,5 +1122,64 @@ public class WMSController extends BaseRESTfulController {
     public Map<String,Object> recordScanResult(@RequestBody Map<String,Object> map) {
         return wmsFeign.recordScanResult(map);
     }
+
+
+    @ApiOperation("获取欧冶入库实绩")
+    @PostMapping("getOyeInboundResult")
+    public Map<String,Object> getOyeInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                String con,
+                                                String startTime,
+                                                String endTime){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getOyeInboundResult(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
+    }
+
+
+    @ApiOperation("获取欧冶出库实绩")
+    @PostMapping("getOyeOutboundResult")
+    public Map<String,Object> getOyeOutboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getOyeOutboundResult(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("获取欧冶实时库存")
+    @PostMapping("getOyeRealTimeResult")
+    public Map<String,Object> getOyeRealTimeResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con,
+                                                   String startTime,
+                                                   String endTime){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getOyeRealTimeResult(mapValue,apiId,pageNum,pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("新增出库实绩")
+    @PostMapping("insertOyeOutboundResult")
+    public  Map<String,Object> insertOyeOutboundResult(@RequestBody Map<String,Object> map) {
+        return wmsFeign.insertOyeOutboundResult(map);
+    }
+
+    @ApiOperation("新增入库实绩")
+    @PostMapping("insertOyeInboundResult")
+    public  Map<String,Object> insertOyeInboundResult(@RequestBody Map<String,Object> map) {
+        return wmsFeign.insertOyeInboundResult(map);
+    }
 }
 

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

@@ -1924,4 +1924,27 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/updateSaleOrderRemark")
     Map<String, Object> updateSaleOrderRemark(@RequestBody Map<String, Object> mapValue);
 
+    @PostMapping("/api/v1/ams/OyeWarehouse/getOyeWarehouse")
+    Map<String, Object> getOyeWarehouse(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    @PostMapping("/api/v1/ams/OyeWarehouse/insertOyeWarehouse")
+    Map<String, Object> insertOyeWarehouse(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/OyeWarehouse/getTransPlan")
+    Map<String, Object> getTransPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId);
+
+    @PostMapping("/api/v1/ams/OyeWarehouse/addTransPlan")
+    Map<String, Object> addTransPlan(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/OyeWarehouse/addTransPlanList")
+    Map<String, Object> addTransPlanList(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("/api/v1/ams/OyeWarehouse/approveTransPlan")
+    Map<String, Object> approveTransPlan(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -730,4 +730,26 @@ public interface RmsFeign {
 
     @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteReceiveCompany/{id}")
     Map<String, Object> deleteReceiveCompany(@PathVariable("id") BigDecimal id);
+
+
+    @PostMapping(value = "/api/v1/rms/rmsMaterialSingleWeight/getMaterialSingleWeightList")
+    Map<String, Object> getMaterialSingleWeightList(@RequestBody(required = false) Map<String,Object> map,
+                                                    @RequestParam("apiId") Integer apiId,
+                                                    @RequestParam("pageNum") Integer pageNum,
+                                                    @RequestParam("pageSize") Integer pageSize,
+                                                    @RequestParam("con") String con);
+
+    @PostMapping(value = "/api/v1/rms/RmsDirectlySentCity/getDirectlySentCity")
+    Map<String, Object> getDirectlySentCity(@RequestBody(required = false) Map<String,Object> map,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
+
+    @PostMapping(value = "/api/v1/rms/RmsDirectlySentCity/insertDirectlySentCityInfo")
+    Map<String, Object> insertDirectlySentCityInfo(@RequestBody Map<String,Object> map);
+
+
+    @PostMapping(value = "/api/v1/rms/RmsDirectlySentCity/deleteInfo")
+    Map<String, Object> deleteInfo(@RequestBody Map<String,Object> map);
 }

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

@@ -857,6 +857,25 @@ public interface TmsTruckFeign {
 
     @PostMapping("/api/v1/truckTms/statisticalReport/yawnReport")
     Map<String, Object> yawnReport(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getOyeSteelReport")
+    Map<String, Object> getOyeSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("startTime")String startTime,
+                                           @RequestParam("endTime")String endTime,
+                                           @RequestParam("carrierSsoId")String carrierSsoId,
+                                           @RequestParam("receiveName")String receiveName,
+                                           @RequestParam("materialName")String materialName,
+                                           @RequestParam("specification")String specification,
+                                           @RequestParam("remark")String remark,
+                                           @RequestParam("capacityNo") String capacityNo,
+                                           @RequestParam("carrierName") String carrierName,
+                                           @RequestParam("consigneeName") String consigneeName,
+                                           @RequestParam("saler") String saler,
+                                           @RequestParam("easPrimaryId") String easPrimaryId
+    );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getOyeSteelReportDetailsBySmId")
+    Map<String, Object> getOyeSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
 }
 
 

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

@@ -947,4 +947,38 @@ public interface WMSFeign {
     @PostMapping("/api/v1/wms/inboundScanResult/recordScanResult")
     Map<String, Object> recordScanResult(@RequestBody Map<String, Object> map);
 
+
+    @PostMapping("/api/v1/wms/OyeResult/getOyeInboundResult")
+    Map<String, Object> getOyeInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/OyeResult/getOyeOutboundResult")
+    Map<String, Object> getOyeOutboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/OyeResult/getOyeRealTimeResult")
+    Map<String, Object> getOyeRealTimeResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con,
+                                            @RequestParam String startTime,
+                                            @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/OyeResult/insertOyeInboundResult")
+    Map<String, Object> insertOyeInboundResult(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/wms/OyeResult/insertOyeOutboundResult")
+    Map<String, Object> insertOyeOutboundResult(@RequestBody Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -303,4 +304,12 @@ public interface UniversalMapper {
 
     int updateTruckRemark(Map<String, Object> map);
 
+
+    List<Map<String, Object>> getCarrierIdBySelect(String index);
+
+    List<Map<String,Object>> getOyeConsigneeId(Map<String,java.lang.Object> map);
+
+
+    List<Map<String,Object>> getOyeSaleArea(Map<String, Object> map);
+
 }

src/main/resources/application-prod.yml

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

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

@@ -914,20 +914,26 @@
 
     <select id="getAllProvince" resultType="java.util.Map">
         SELECT DISTINCT RRA.ADDRESS_PROVINCE AS "addressProvince",
-                        RRA.ADDRESS_PROVINCE AS "id"
+                        RRA.ADDRESS_PROVINCE AS "id",
+                        RRA.ADDRESS_PROVINCE AS "label",
+                        RRA.ADDRESS_PROVINCE AS "value"
         FROM RMS_RECEIVE_ADDRESS RRA
     </select>
 
     <select id="getDistrictByProvince" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT DISTINCT RRA.ADDRESS_DISTRICT AS "addressDistrict",
-                        RRA.ADDRESS_DISTRICT AS "id"
+                        RRA.ADDRESS_DISTRICT AS "id",
+                        RRA.ADDRESS_DISTRICT AS "label",
+                        RRA.ADDRESS_DISTRICT AS "value"
         FROM RMS_RECEIVE_ADDRESS RRA
         WHERE RRA.ADDRESS_PROVINCE = #{addressProvince}
     </select>
 
     <select id="getTownByDistrict" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT DISTINCT RRA.ADDRESS_TOWN AS "addressTown",
-                        RRA.ADDRESS_TOWN AS "id"
+                        RRA.ADDRESS_TOWN AS "id",
+                        RRA.ADDRESS_TOWN AS "value",
+                        RRA.ADDRESS_TOWN AS "label"
         FROM RMS_RECEIVE_ADDRESS RRA
         WHERE RRA.ADDRESS_DISTRICT = #{addressDistrict}
     </select>
@@ -1676,4 +1682,40 @@
            or ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
         </if>
     </update>
+    <select id="getCarrierIdBySelect" parameterType="string" resultType="java.util.Map">
+        select
+            RC.CARRIER_ID "carrierId",
+            RC.CARRIER_ID "value",
+            RC.CARRIER_NAME "label",
+            RC.CARRIER_NAME "carrierName",
+            RC.CARRIER_ABBREVIATION "value1"
+        from RMS_CARRIER RC
+        where
+            instr(RC.CARRIER_NAME, #{index}) > 0 and rownum &lt; 10
+            AND RC.CARRIER_TYPE like '销售%'
+        order by "value"
+    </select>
+    <select id="getOyeConsigneeId" resultType="java.util.Map">
+        SELECT DISTINCT
+               RC.CONSIGNEE_ID "value",
+               RC.CONSIGNEE_ID "id",
+               RC.CONSIGNEE_COMPANY_NAME "label"
+               FROM OYE_REALTIME_INVENTORY ORI
+        LEFT JOIN RMS_CONSIGNEE RC on ORI.CONSIGNEE_ID = RC.CONSIGNEE_ID
+        WHERE ORI.CONSIGNEE_ID is not NULL
+        AND NVL(ORI.MATERIAL_NUMBER,0) > 0
+        <if test="saleArea != null and saleArea != ''">
+            AND ORI.SALE_AREA = #{saleArea}
+        </if>
+    </select>
+    <select id="getOyeSaleArea" resultType="java.util.Map">
+        SELECT DISTINCT
+               ORI.SALE_AREA "value",
+               ORI.SALE_AREA "label"
+        FROM OYE_REALTIME_INVENTORY ORI
+        WHERE NVL(ORI.MATERIAL_NUMBER,0) > 0
+        <if test="consigneeId != null and consigneeId != ''">
+            AND ORI.CONSIGNEE_ID = #{consigneeId}
+        </if>
+    </select>
 </mapper>