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

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")
@@ -1822,11 +1825,13 @@ public class AMScontroller{
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize,
-                                             @RequestParam(required = false) String con) {
+                                             @RequestParam(required = false) String con,
+                                             @RequestParam(required = false) String startTime,
+                                             @RequestParam(required = false) String endTime  ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getHaveCarTruckNoList(mapValue, apiId, pageNum, pageSize, con);
+        return amsFeign.getHaveCarTruckNoList(mapValue, apiId, pageNum, pageSize, con,startTime,endTime);
     }
 
     @ApiOperation(value="获取零星订单的物资详情")
@@ -1939,9 +1944,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/RMScontroller.java

@@ -3,6 +3,7 @@ import com.steerinfo.dil.feign.RmsFeign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -211,6 +212,10 @@ public class RMScontroller {
     public String uploadCarrier1(@RequestParam ("file") MultipartFile multipartFile){
         return rmsFeign.uploadCarrier1(multipartFile);
     }
+
+
+
+
     //    处理承运商照片
     @PostMapping("/uploadCarrier2")
     public int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile){
@@ -1169,4 +1174,17 @@ public class RMScontroller {
     public Map<String, Object> signConsignee(@RequestBody Map<String,Object> mapVal){
         return rmsFeign.signConsignee(mapVal);
     }
+
+    //边输边查港口名称
+    @PostMapping(value = "/getPortName")
+    public Map<String, Object> getPortName(String index){
+        return rmsFeign.getPortName(index);
+    }
+
+    //边输边查码头名称
+    @PostMapping(value = "/getPierName")
+    public Map<String, Object> getPierName(String index){
+        return rmsFeign.getPierName(index);
+    }
+
 }

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

@@ -1939,8 +1939,8 @@ public class TMSController extends BaseRESTfulController {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "/addDomesticLoadResult")
-    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list) {
-        return tmsTrainFeign.addDomesticLoadResult(list);
+    public Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return tmsTrainFeign.addDomesticLoadResult(mapValue);
     }
 
     @ApiOperation(value = "国产矿物流补录装车信息")
@@ -2401,4 +2401,21 @@ public class TMSController extends BaseRESTfulController {
         System.out.println(map);
         return tmsTrainFeign.getPurchaseOrderList(map,apiId,pageNum,pageSize,materialName, resultForeignShipName);
     }
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getSaleSteelReport")
+    public Map<String,Object> getSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 Integer apiId,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleSteelReport(map,apiId,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark);
+    }
 }

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

@@ -697,10 +697,10 @@ public class UniversalController extends BaseRESTfulController {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null")) {
+        if (materialNameText != null && !materialNameText.equals("undefined") && !materialNameText.equals("null") && materialNameText != "" && !"".equals(materialNameText)) {
             mapValue.put("materialNameText", materialNameText);
         }
-        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null")) {
+        if (materialSpecificationText != null && !materialSpecificationText.equals("undefined") && !materialSpecificationText.equals("null") && materialSpecificationText != "" && !"".equals(materialSpecificationText)) {
             mapValue.put("materialSpecificationText", materialSpecificationText);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -775,7 +775,6 @@ public class UniversalController extends BaseRESTfulController {
     @GetMapping("/getTransRange")
     public RESTfulResult getTransRange(){
         return success(universalMapper.getTransRange());
-
     }
 
 //    //测试质保书回显
@@ -856,4 +855,24 @@ 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));
+    }
+
+    //根据销售订单ID修改销售订单状态为上报
+    @PostMapping("/updateDriverTel")
+    @ApiOperation(value = "修改司机电话号码")
+    public RESTfulResult updateDriverTel(@RequestBody Map<String,Object> map){
+        return success(universalMapper.updateDriverTel(map));
+    }
+
+    @GetMapping("/getQueueCount")
+    public RESTfulResult getQueueCount(){
+        return success(universalMapper.getQueueCount());
+    }
+
 }

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="查询财务已审批销售订单信息")
@@ -1608,7 +1611,9 @@ public interface AmsFeign {
                                         @RequestParam Integer apiId,
                                         @RequestParam Integer pageNum,
                                         @RequestParam Integer pageSize,
-                                        @RequestParam String con);
+                                        @RequestParam String con,
+                                        @RequestParam String startTime,
+                                        @RequestParam String endTime);
     @PostMapping(value = "/api/v1/ams/amstrucksporadicorders/getSporadic")
     Map<String, Object> getSporadic(@RequestParam Integer sporadicId);
 
@@ -1698,7 +1703,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/feign/RmsFeign.java

@@ -640,4 +640,12 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmsconsignee/signConsignee")
     Map<String, Object> signConsignee(@RequestBody Map<String, Object> mapVal);
+
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPortName")
+    Map<String, Object> getPortName(@RequestParam("index") String index);
+
+    // 边输边查码头名称
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPierName")
+    Map<String, Object> getPierName(@RequestParam("index") String index);
 }

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

@@ -237,7 +237,7 @@ public interface TmsTrainFeign {
 
     @ApiOperation(value = "国产矿物流新增装车")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/addDomesticLoadResult")
-    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) List<Map<String, Object>> list);
+    Map<String, Object> addDomesticLoadResult(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @ApiOperation(value = "国产矿物流补录装车信息")
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/updateDomesticLoadResult")

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

@@ -702,6 +702,17 @@ public interface TmsTruckFeign {
                                                 @RequestParam("orgCode")String orgCode,
                                                 @RequestParam("isPage")String isPage,
                                                 @RequestParam("index")String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReport")
+    Map<String, Object> getSaleSteelReport(@RequestBody(required = false)Map<String, Object> map,
+                                           @RequestParam("apiId")Integer apiId,
+                                           @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);
 }
 
 

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

@@ -200,4 +200,10 @@ public interface UniversalMapper {
 
     Map<String, Object> getConsigneeByuserid(String userId);
 
+    int updateSaleOrderStatusById(BigDecimal saleOrderId);
+    // 修改司机电话
+    int updateDriverTel(Map<String, Object> map);
+
+    int getQueueCount();
+
 }

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -23,7 +23,7 @@ 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:

src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ eureka:
 
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 

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",
@@ -1013,4 +1018,20 @@
         from RMS_CONSIGNEE RC
         WHERE RC.CONSIGNEE_SSO_ID = #{userId}
     </select>
+    <select id="getQueueCount" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM (SELECT QQL.LIST_ID "soleP"
+              FROM QMS_QUEUE_LIST QQL
+              WHERE QQL.ENTRY_SURE_TIME is null
+              union all
+              SELECT QQSL.SPELLING_RESULT_ID "soleP"
+              from QMS_QUEUE_SPELLING_LIST QQSL
+              WHERE QQSL.ENTRY_SURE_TIME is null)
+    </select>
+
+    <update id="updateDriverTel" parameterType="java.util.Map">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.DRIVER_TEL = #{driverTel}
+        WHERE OO.ORDER_ID = #{orderId}
+    </update>
 </mapper>