修改销售订单

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

@@ -1419,7 +1419,7 @@ public class AMScontroller{
     }
 
     @PostMapping("getSaleOrderInfoes")
-    @ApiOperation(value = "查询汽运单价信息")
+    @ApiOperation(value = "查询销售订单未上报信息")
     public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
@@ -1427,11 +1427,12 @@ public class AMScontroller{
                                                   String consigneeSsoId,
                                                   @RequestParam(required = false) String con,
                                                   String startTime,
-                                                  String endTime) {
+                                                  String endTime,
+                                                  String saler) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con,startTime,endTime,saler);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1443,11 +1444,12 @@ public class AMScontroller{
                                                @RequestParam(required = false) String consigneeSsoId,
                                                @RequestParam(required = false) String con,
                                                String startTime,
-                                               String endTime){
+                                               String endTime,
+                                               String saler){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con,startTime,endTime,saler);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1466,9 +1468,10 @@ public class AMScontroller{
                                                               Integer saleType,
                                                               String consigneeSsoId,
                                                               String startTime,
-                                                              String endTime
+                                                              String endTime,
+                                                              String saler
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId,startTime,endTime,saler);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1939,9 +1942,9 @@ public class AMScontroller{
                                                   String con,
                                                         String consigneeSsoId,
                                                         String startTime,
-                                                        String endTime
+                                                        String endTime,String saler
     ) {
-        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime);
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId,startTime,endTime,saler);
     }
 
     @ApiOperation(value = "修改厂内未装货车辆的运单车牌号")

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

@@ -856,4 +856,11 @@ public class UniversalController extends BaseRESTfulController {
     public Map<String,Object>getConsigneeByuserid(String userId){
         return universalMapper.getConsigneeByuserid(userId);
     }
+
+    //根据销售订单ID修改销售订单状态为上报
+    @PostMapping("/updateSaleOrderStatusById")
+    @ApiOperation(value = "根据销售订单id修改状态为未上报")
+    public RESTfulResult updateSaleOrderStatusById(BigDecimal saleOrderId){
+        return success(universalMapper.updateSaleOrderStatusById(saleOrderId));
+    }
 }

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

@@ -1357,7 +1357,8 @@ public interface AmsFeign {
                                            @RequestParam(required = false) String consigneeSsoId,
                                            @RequestParam(required = false) String con,
                                            @RequestParam String startTime,
-                                           @RequestParam String endTime);
+                                           @RequestParam String endTime,
+                                           @RequestParam String saler);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1371,7 +1372,8 @@ public interface AmsFeign {
                                                @RequestParam(required = false) String consigneeSsoId,
                                                @RequestParam(required = false) String con,
                                                @RequestParam String startTime,
-                                               @RequestParam String endTime);
+                                               @RequestParam String endTime,
+                                               @RequestParam String saler);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1383,7 +1385,8 @@ public interface AmsFeign {
                                                        @RequestParam(required = false) Integer saleType,
                                                        @RequestParam(required = false) String consigneeSsoId,
                                                        @RequestParam(required = false) String startTime,
-                                                       @RequestParam(required = false) String endTime
+                                                       @RequestParam(required = false) String endTime,
+                                                       @RequestParam(required = false) String saler
     );
 
     @ApiOperation(value="查询财务已审批销售订单信息")
@@ -1698,7 +1701,8 @@ public interface AmsFeign {
                                                  @RequestParam String con,
                                                  @RequestParam String consigneeSsoId,
                                                  @RequestParam(required = false) String startTime,
-                                                 @RequestParam(required = false) String endTime);
+                                                 @RequestParam(required = false) String endTime,
+                                                 @RequestParam(required = false) String saler);
 
     // 修改厂内未装货车辆的运单车牌号
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")

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

@@ -200,4 +200,6 @@ public interface UniversalMapper {
 
     Map<String, Object> getConsigneeByuserid(String userId);
 
+    int updateSaleOrderStatusById(BigDecimal saleOrderId);
+
 }

src/main/resources/application-prod.yml

@@ -9,7 +9,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
@@ -23,13 +23,13 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   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

@@ -6,6 +6,11 @@
         set oo.order_line_sequence = #{orderLineSqe}
         where oo.order_id = #{orderId}
     </update>
+    <update id="updateSaleOrderStatusById">
+        update AMS_SALE_ORDER ASO
+        SET ASO.SALE_ORDER_STATUS = 0
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+    </update>
     <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_NUMBER             "orderNumber",
                RC.CAPACITY_NUMBER          "capacityNumber",