'销售钢材'

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

@@ -1405,8 +1405,12 @@ public class AMScontroller{
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                              String con){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+                                                              String con,
+                                                              Integer shipperId
+//                                                              String startDate,
+//                                                              String endDate
+    ){
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1677,4 +1681,94 @@ public class AMScontroller{
     public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.refuseDispatchSaleOrderList(mapList);
     }
+
+    @ApiModelProperty(value = "新增钢材销售订单")
+    @PostMapping("/addSteelSaleOrder")
+    public Map<String, Object> addSteelSaleOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addSteelSaleOrder(mapValue);
+    }
+
+    @ApiModelProperty(value = "查询销售订单下的物资")
+    @PostMapping("/getTruckNoAndMaterialList")
+    public RESTfulResult getTruckNoAndMaterialList(@RequestParam Integer saleOrderId) {
+        return amsFeign.getTruckNoAndMaterialList(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "销售钢材派车")
+    @PostMapping("/dispatchSteelOrder")
+    public Map<String, Object> dispatchSteelOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.dispatchSteelOrder(mapList);
+    }
+
+    @ApiModelProperty(value = "根据详细地址匹配承运商")
+    @GetMapping("/getCarrierByPlace")
+    public RESTfulResult getCarrierByPlace(@RequestParam Integer placeId) {
+        return amsFeign.getCarrierByPlace(placeId);
+    }
+
+    @ApiModelProperty(value = "将车序号下发给承运商")
+    @PostMapping("/dispatchToCarrier")
+    public RESTfulResult dispatchToCarrier(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.dispatchToCarrier(mapList);
+    }
+
+    @ApiModelProperty(value = "将车序号下发给承运商")
+    @PostMapping("/getSaleOrderListToCarrier")
+    public RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam String carrierSsoId,
+                                                   @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderListToCarrier(mapValue,pageNum,pageSize,apiId,carrierSsoId,con);
+    }
+
+    @ApiModelProperty(value = "展示未匹配承运商的车序号")
+    @PostMapping("/getSteelTruckNoList")
+    public RESTfulResult getSteelTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSteelTruckNoList(mapValue,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiModelProperty(value = "展示未匹配承运商的车序号详情")
+    @PostMapping("/getTruckNoMaterial")
+    public RESTfulResult getTruckNoMaterial(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterial(saleOrderMaterialId);
+    }
+
+    @ApiModelProperty(value = "展示已分配承运商但未派车的车序号")
+    @PostMapping("/getNoCarTruckNoList")
+    public RESTfulResult getNoCarTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getNoCarTruckNoList(mapValue,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiModelProperty(value = "展示已派车的车序号")
+    @PostMapping("/getHaveCarTruckNoList")
+    public RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam(required = false) String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getHaveCarTruckNoList(mapValue,apiId,pageNum,pageSize,con);
+    }
+
 }

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

@@ -629,7 +629,80 @@ public class UniversalController extends BaseRESTfulController {
            failed();
        }
        return success(carrier);
+    }
 
+    @ApiModelProperty(value = "模糊查询钢材物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSteelMaterial")
+    public RESTfulResult getSteelMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId,
+                                          String materialNameText,
+                                          String materialSpecificationText,
+                                          String materialModelText) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null")) {
+            mapValue.put("materialNameText", materialNameText);
+        }
+        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
+            mapValue.put("materialSpecificationText", materialSpecificationText);
+        }
+        if (materialModelText != null && !materialModelText.equals("undefined") && !materialModelText.equals("null")) {
+            mapValue.put("materialModelText", materialModelText);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getSteelMaterial(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
+        return success(data);
+    }
+
+    @ApiOperation(value="得到所有省份")
+    @PostMapping("/getAllProvince")
+    public RESTfulResult getAllProvince(){
+        List<Map<String,Object>> provinceList = universalMapper.getAllProvince();
+        return success(provinceList);
+    }
+
+    @ApiOperation(value="根据省份得到下面的地级市")
+    @PostMapping("/getDistrictByProvince")
+    public RESTfulResult getDistrictByProvince(@RequestParam String addressProvince){
+        List<Map<String,Object>> districtList = universalMapper.getDistrictByProvince(addressProvince);
+        return success(districtList);
+    }
+
+    @ApiOperation(value="根据地级市得到下面的区/县")
+    @PostMapping("/getTownByDistrict")
+    public RESTfulResult getTownByDistrict(@RequestParam String addressDistrict){
+        List<Map<String,Object>> townList = universalMapper.getTownByDistrict(addressDistrict);
+        return success(townList);
+    }
+
+    @ApiOperation(value="根据省市县得到下面的详细地址")
+    @PostMapping("/getPlaceByAllAddress")
+    public RESTfulResult getPlaceByAllAddress(@RequestBody Map<String,Object> mapValue){
+        List<Map<String,Object>> townList = universalMapper.getPlaceByAllAddress(mapValue);
+        return success(townList);
+    }
+
+    @ApiOperation(value="获得销售员下拉框")
+    @GetMapping("/getSalerList")
+    public RESTfulResult getSalerList(){
+        List<Map<String,Object>> salerList= universalMapper.getSalerList();
+        return success(salerList);
+    }
 
+    @ApiOperation(value="通过收货客户匹配销售组")
+    @PostMapping("/getSaleArea")
+    public RESTfulResult getSaleArea(@RequestParam Integer receiveId){
+        String saleArea= universalMapper.getSaleArea(new BigDecimal(receiveId));
+        return success(saleArea);
     }
 }

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

@@ -1350,7 +1350,11 @@ public interface AmsFeign {
                                                        @RequestParam("pageNum") Integer pageNum,
                                                        @RequestParam("pageSize") Integer pageSize,
                                                        @RequestParam("apiId") Integer apiId,
-                                                       @RequestParam("con") String con);
+                                                       @RequestParam("con") String con,
+                                                       @RequestParam Integer shipperId
+//                                                       @RequestParam String startDate,
+//                                                       @RequestParam String endDate
+    );
 
     @ApiOperation(value="查询财务已审批销售订单信息")
     @ApiImplicitParams({
@@ -1522,4 +1526,54 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
     Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addSteelSaleOrder")
+    Map<String, Object> addSteelSaleOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getTruckNoAndMaterialList")
+    RESTfulResult getTruckNoAndMaterialList(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/dispatchSteelOrder")
+    Map<String, Object> dispatchSteelOrder(@RequestBody List<Map<String, Object>> mapList);
+
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getCarrierByPlace")
+    RESTfulResult getCarrierByPlace(@RequestParam Integer placeId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getPriceByCarrierAndPlace")
+    Map<String, Object> getPriceByCarrierAndPlace(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/dispatchToCarrier")
+    RESTfulResult dispatchToCarrier(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderListToCarrier")
+    RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String carrierSsoId,
+                                            @RequestParam(required = false) String con);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSteelTruckNoList")
+    RESTfulResult getSteelTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getTruckNoMaterial")
+    RESTfulResult getTruckNoMaterial(@RequestParam Integer saleOrderMaterialId);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getNoCarTruckNoList")
+    RESTfulResult getNoCarTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getHaveCarTruckNoList")
+    RESTfulResult getHaveCarTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con);
 }

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

@@ -139,4 +139,24 @@ public interface UniversalMapper {
 
     Map<String, Object> getRmsCarrierByCarrierSsoId(String carrierSsoId);
 
+    //边输边查物资
+    List<Map<String, Object>> getSteelMaterial(Map<String, Object> mapValue);
+
+    // 得到所有省份
+    List<Map<String, Object>> getAllProvince();
+
+    // 通过省份得到省份下面的市
+    List<Map<String, Object>> getDistrictByProvince(String addressProvince);
+
+    // 通过市得到市下面的区和县
+    List<Map<String, Object>> getTownByDistrict(String addressDistrict);
+
+    // 通过省市县得到具体地址
+    List<Map<String, Object>> getPlaceByAllAddress(Map<String, Object> mapValue);
+
+    // 得到销售员下拉
+    List<Map<String, Object>> getSalerList();
+
+    // 获得销售组
+    String getSaleArea(BigDecimal receiveId);
 }

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

@@ -750,4 +750,100 @@
         where r_carrier.CARRIER_SSO_ID = #{carrierSsoId}
 
     </select>
+
+    <!--  模糊查询所有物资  -->
+    <select id="getSteelMaterial" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        <if test="materialNameText != null">
+            AND (instr(RM.MATERIAL_NAME, #{materialNameText}) > 0)
+        </if>
+        <if test="materialSpecificationText != null">
+            AND (instr(RM.MATERIAL_SPECIFICATION, #{materialSpecificationText}) > 0)
+        </if>
+        <if test="materialModelText != null">
+            AND (instr(RM.MATERIAL_MODEL, #{materialModelText}) > 0)
+        </if>
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
+
+    <select id="getAllProvince" resultType="java.util.Map">
+        SELECT DISTINCT RRA.ADDRESS_PROVINCE AS "addressProvince",
+                        RRA.ADDRESS_PROVINCE AS "id"
+        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"
+        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"
+        FROM RMS_RECEIVE_ADDRESS RRA
+        WHERE RRA.ADDRESS_DISTRICT = #{addressDistrict}
+    </select>
+
+    <select id="getPlaceByAllAddress" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT RRA.ADDRESS_ID AS "addressId"
+        FROM RMS_RECEIVE_ADDRESS RRA
+        WHERE RRA.ADDRESS_DISTRICT = #{addressDistrict}
+          AND RRA.ADDRESS_TOWN = #{addressTown}
+          AND RRA.ADDRESS_PROVINCE = #{addressProvince}
+    </select>
+
+    <select id="getSalerList" resultType="java.util.Map" >
+        SELECT RS.SALER_ID   "id",
+               RS.SALER_ID   "value",
+               RS.SALER_NAME "label"
+        FROM RMS_SALER RS
+    </select>
+
+    <select id="getSaleArea" parameterType="DECIMAL" resultType="java.lang.String" >
+        SELECT
+                RSA.AREA_NAME AS "areaName"
+        FROM RMS_CONSIGNEE RC
+                 LEFT JOIN RMS_SALE_AREA RSA
+                           ON RSA.AREA_ID = RC.AREA_ID
+        WHERE RC.CONSIGNEE_ID = #{receiveId}
+    </select>
 </mapper>