查询分拨申请放行回执

@@ -65,3 +65,6 @@ feign.httpclient.connection-timeout=3000
 wharf.interface.host=http://10.50.3.66:1983/
 wharf.interface.host=http://10.50.3.66:1983/
 #新舱单运单查询数据接口,注意尾部带/符号
 #新舱单运单查询数据接口,注意尾部带/符号
 nmms.interface.host=http://10.50.3.82:8081/
 nmms.interface.host=http://10.50.3.82:8081/
+#查询分拨申请放行
+inport-url=http://nmms1.15miaoo.com:17999/
+

+package com.sy.IMPORT;
+
+
+import com.sy.model.InportallocateMode;
+import com.sy.service.InportallcateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/inport")
+public class InportallocateController {
+    @Autowired
+    InportallcateService inportallcateService;
+    @RequestMapping("/selectInportallocates")
+    public Map getById(@RequestParam(value = "waybill",required = true) String waybill,
+                              @RequestParam(value = "pageIndex",required = true) int pageIndex,
+                              @RequestParam(value = "pageSize",required = true) int pageSize){
+        InportallocateMode mode=new InportallocateMode();
+        mode.setWaybill(waybill);
+        mode.setPageIndex(pageIndex);
+        mode.setPageSize(pageSize);
+        Map map=inportallcateService.selectAllocate(mode);
+        return map;
+    }
+}

@@ -140,7 +140,7 @@ public class NewLeftBar {
                  * 若进场站为北货，只允许空车进，备案车重=过卡车重
                  * 若进场站为北货，只允许空车进，备案车重=过卡车重
                  * 其它走校验
                  * 其它走校验
                  * */
                  * */
-                if(FileTool.readProperties("stationb").equals(info.getAreaid())){
+                if(FileTool.readProperties("stationb").equals(info.getAreaid()) && "进口提货".equals(land.getBusinesstype())){
                     logger.info("--------->车辆进入北货场站");
                     logger.info("--------->车辆进入北货场站");
                     if(logic.checkFlag(growssWt, Double.parseDouble(ve.getSelfWt()))){
                     if(logic.checkFlag(growssWt, Double.parseDouble(ve.getSelfWt()))){
                         checkResult=true;
                         checkResult=true;

+package com.sy.model;
+
+
+public class InportallocateMode {
+    private String waybill;
+    private int pageIndex;
+    private int pageSize;
+
+    public String getWaybill() {
+        return waybill;
+    }
+
+    public void setWaybill(String waybill) {
+        this.waybill = waybill;
+    }
+
+    public int getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(int pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+}

+package com.sy.service;
+
+import com.sy.model.InportallocateMode;
+import com.sy.service.impl.InportallocateImpl;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.Map;
+
+@Component
+@FeignClient(url="${inport-url}",fallback = InportallocateImpl.class,name = "InportFeign")
+public interface InportallcateService {
+
+    @PostMapping("/Allocate/querypage_inportallocate")
+    Map selectAllocate(InportallocateMode mode);
+}

+package com.sy.service.impl;
+
+
+import com.sy.model.InportallocateMode;
+import com.sy.service.InportallcateService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Service
+public class InportallocateImpl implements InportallcateService {
+    @Override
+    public Map selectAllocate(InportallocateMode mode) {
+        return null;
+    }
+}