Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1448,11 +1448,12 @@ public class AMScontroller{
                                                               Integer pageSize,
                                                               Integer apiId,
                                                               String con,
-                                                              Integer shipperId
+                                                              Integer shipperId,
+                                                              Integer saleType
 //                                                              String startDate,
 //                                                              String endDate
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1837,4 +1838,15 @@ public class AMScontroller{
         return amsFeign.getInwardPriceBy(mapvalue);
     }
 
+    @ApiOperation(value = "删除销售订单")
+    @PostMapping("/deleteSaleOrderById")
+    public Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId){
+        return amsFeign.deleteSaleOrderById(saleOrderId);
+    }
+
+    @ApiModelProperty(value = "查询出销售订单下的所有数据")
+    @PostMapping("/getAllSaleMessages")
+    public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {
+        return amsFeign.getAllSaleMessages(saleOrderId);
+    }
 }

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

@@ -305,10 +305,11 @@ public class OMSController {
                                             Integer orderType,
                                             Integer orderStatus,
                                             String con,
-                                            @RequestParam String carrierSsoId
+                                            @RequestParam String carrierSsoId,
+                                                   Integer shipperId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierSsoId,shipperId);
     }
 
 

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

@@ -1953,9 +1953,11 @@ public class TMSController extends BaseRESTfulController {
                                           Integer pageSize,
                                           String startTime,
                                           String endTime,
-                                          String carrierSsoId
+                                          String carrierSsoId,
+                                                Integer orderType,
+                                                Integer shipperId
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")

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

@@ -787,6 +787,12 @@ public class UniversalController extends BaseRESTfulController {
         return universalMapper.getNotReceiveOrderQuantity(capacityNumber);
     }
 
+    @ApiOperation(value = "西南水泥独用下拉框")
+    @GetMapping("/getXiNanCarrier")
+    public RESTfulResult getXiNanCarrier() {
+        return success(universalMapper.getXiNanCarrier());
+    }
+
     @ApiModelProperty(value = "边输边查发站到站")
     @GetMapping("/getArrivalByLike")
     public RESTfulResult getArrivalByLike(@RequestParam("index") String index){

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

@@ -1367,7 +1367,8 @@ public interface AmsFeign {
                                                        @RequestParam("pageSize") Integer pageSize,
                                                        @RequestParam("apiId") Integer apiId,
                                                        @RequestParam("con") String con,
-                                                       @RequestParam Integer shipperId
+                                                       @RequestParam Integer shipperId,
+                                                       @RequestParam(required = false) Integer saleType
 //                                                       @RequestParam String startDate,
 //                                                       @RequestParam String endDate
     );
@@ -1624,4 +1625,12 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
     Map<String, Object> getInwardPriceBy(@RequestBody(required = false)Map<String, Object> mapvalue);
 
+
+    //删除销售订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderById")
+    Map<String,Object> deleteSaleOrderById(@RequestParam Integer saleOrderId);
+
+    //查询出销售订单下的所有数据
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAllSaleMessages")
+    RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId);
 }

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

@@ -137,7 +137,8 @@ public interface OmsFeign {
                                             @RequestParam("orderType")  Integer orderType,
                                             @RequestParam("orderStatus")Integer orderStatus,
                                             @RequestParam("con")        String con,
-                                            @RequestParam("carrierSsoId")  String carrierSsoId
+                                            @RequestParam("carrierSsoId")  String carrierSsoId,
+                                            @RequestParam("shipperId") Integer shipperId
     );
 
     /**

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

@@ -390,7 +390,9 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam("startTime") String startTime,
                                          @RequestParam("endTime")   String endTime,
-                                      @RequestParam("carrierSsoId")   String carrierSsoId
+                                      @RequestParam("carrierSsoId")   String carrierSsoId,
+                                         @RequestParam("orderType") Integer orderType,
+                                         @RequestParam("shipperId") Integer shipperId
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")

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

@@ -179,6 +179,7 @@ public interface UniversalMapper {
     //通过车牌号查询未接收的订单数量（用于APP显示未接收小红点）
     Integer getNotReceiveOrderQuantity(String capacityNumber);
 
+    List<Map<String,Object>> getXiNanCarrier();
     //边输边查发站到站
     List<Map<String, Object>> getArrivalByLike(String index);
 

src/main/resources/application-dev.yml

@@ -32,7 +32,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.166:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 piction:

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

@@ -831,6 +831,7 @@
         RM.MATERIAL_MODEL "materialModel"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
+        AND RM.MATERIAL_ID != 2533
         <if test="materialNameText != null">
             AND (instr(RM.MATERIAL_NAME, #{materialNameText}) > 0)
         </if>
@@ -868,7 +869,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialId" desc
+            order by "materialCode" desc
         </if>
     </select>
 
@@ -932,6 +933,14 @@
         and OO.ORDER_STATUS = 4
     </select>
 
+    <select id="getXiNanCarrier" resultType="java.util.Map" >
+        SELECT RCA.CARRIER_ID   "id",
+               RCA.CARRIER_ID   "value",
+               RCA.CARRIER_NAME "label"
+        FROM RMS_CARRIER RCA
+        WHERE RCA.CARRIER_NAME LIKE '%西南水泥%'
+    </select>
+
     <select id="getArrivalByLike" parameterType="java.lang.String" resultType="java.util.Map">
         SELECT RAS.ARRIVAL_NAME AS "arrivalName",
                RAS.ARRIVAL_ID AS "arrivalId"