tijiaoi

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

@@ -2026,7 +2026,11 @@ public class AMScontroller{
     @PostMapping("getKucunList")
     public Map<String,Object> getKucunList(@RequestBody(required = false) Map<String,Object> map,
                                            String startTime,
-                                           String endTime){
-        return amsFeign.getKucunList(map==null?new HashMap<>():map,startTime,endTime);
+                                           String endTime,
+                                           String remark,
+                                           String transferIndep,
+                                           String consigneeName,
+                                           String totheStation){
+        return amsFeign.getKucunList(map==null?new HashMap<>():map,startTime,endTime,remark,transferIndep,consigneeName,totheStation);
     }
 }

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

@@ -2528,19 +2528,14 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> getInwardSaleSteelOrder(@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){
         if(map==null){
             map=new HashMap<>();
         }
-        return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+        return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,remark,capacityNo,consigneeName);
     }
 
 

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

@@ -522,8 +522,12 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "查装货卸货点")
     @PostMapping("/selectUnloadingPoint")
-    public List<Map<String, Object>> selectUnloadingPoint() {
-        return universalMapper.selectUnloadingPoint();
+    public List<Map<String, Object>> selectUnloadingPoint(String index) {
+        String index1 = null;
+        if(index != null && !"null".equals(index) && !"".equals(index)){
+            index1 = "%" + index + "%";
+        }
+        return universalMapper.selectUnloadingPoint(index1);
     }
 
     @ApiModelProperty(value = "模糊查询承运商")

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

@@ -1757,6 +1757,10 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amssaleorders/getKucunList")
     Map<String, Object> getKucunList(@RequestBody(required = false) Map<String, Object> map,
                                      @RequestParam String startTime,
-                                     @RequestParam String endTime);
+                                     @RequestParam String endTime,
+                                     @RequestParam String remark,
+                                     @RequestParam String transferIndep,
+                                     @RequestParam String consigneeName,
+                                     @RequestParam String totheStation);
 
 }

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

@@ -737,15 +737,10 @@ public interface TmsTruckFeign {
     Map<String, Object> getInwardSaleSteelOrder(@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("consigneeName") String consigneeName
+                                                 );
 
 }
 

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

@@ -70,7 +70,7 @@ public interface UniversalMapper {
     List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
 
     //查卸货点
-    List<Map<String, Object>> selectUnloadingPoint();
+    List<Map<String, Object>> selectUnloadingPoint(String index1);
 
     // 查询所有门岗
     List<Map<String, Object>> getAllGatepost();

src/main/resources/application-prod.yml

@@ -11,27 +11,27 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
     url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:localhost:8047}
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:

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

@@ -552,9 +552,13 @@
 <!--  边输边查卸货点  -->
     <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
         select RW.WAREHOUSE_NAME "warehouseName",
-               RW.WAREHOUSE_ID "warehouseId"
+               RW.WAREHOUSE_ID "warehouseId",
+        RW.WAREHOUSE_NAME "value"
         from RMS_WAREHOUSE RW
         where RW.DELETED = 0
+        <if test="index1 != null">
+            and RW.WAREHOUSE_NAME LIKE #{index}
+        </if>
         order by "warehouseName"
     </select>
 
@@ -1256,6 +1260,7 @@
                            ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
         WHERE RPG.GRID_TYPE = 1
           AND RPG.INSERT_USERNAME = #{userId}
+          AND OO.ORDER_ID IS NOT NULL
         <if test="gmStatus != null and gmStatus != -1">
             AND WGM.DELETED = #{gmStatus}
         </if>