运单列表

xudada
src/main/java/com/sy/logic/LiftBar.java
src/main/java/com/sy/mapper/LAND_BUSINEESTYPE_LIST_INFOMapper.java
src/main/java/com/sy/service/BusnesslistinfoService.java
src/main/java/com/sy/service/ResMessageService.java
src/main/java/com/sy/service/impl/BusnesslistinfoImpl.java
src/main/java/com/sy/service/impl/ResMessageServiceImpl.java
src/main/resources/mapping/LAND_BUSINEESTYPE_LIST_INFOMapper.xml
--- a/src/main/java/com/sy/logic/LiftBar.java
查看文件 @099be03
+++ b/src/main/java/com/sy/logic/LiftBar.java
查看文件 @099be03
@@ -143,6 +143,9 @@ public class LiftBar {
             return result;
         }
         selfWt=Double.parseDouble(ve.getSelfWt());//车辆备案我不是
+
+        List<LAND_BUSINEESTYPE_LIST_INFO> listinfos=logic.busnesslistinfoService.selectmanilist(info.getBarcode());
+
         /**
          * 3. 车牌号,二维码，场站ID/号，通道ID/号，进出业务类型标识I/E
          * 查询是否已有此场站通道的申请
@@ -163,7 +166,6 @@ public class LiftBar {
             boolean checkResult = false;
             boolean check = false;
             boolean checkMainfest =false;
-
             //7. 判断是进场申请还是出场申请
             if("I".equals(info.getIetype())){
                 //进场申请宽进
@@ -229,7 +231,7 @@ public class LiftBar {
                             if (logic.weightCheckHandleService.checkImportDlv(growssWt, Double.parseDouble(ve.getSelfWt()), goodsWt,inWt)){
                                 checkResult=true;
                                 //检查运单放行
-                                if (logic.resMessageService.checkManifestRelease(info,list.getMasterList())){
+                                if (logic.resMessageService.checkManifestRelease(info,listinfos)){
                                     checkResult=true;
                                 }else {
                                     //有运单未放行
@@ -270,7 +272,7 @@ public class LiftBar {
                             if (logic.weightCheckHandleService.checkAllocateOrDispatch(growssWt, Double.parseDouble(ve.getSelfWt()), goodsWt,inWt)){
                                 checkResult=true;
                                 //检查运单放行
-                                if (logic.resMessageService.checkManifestRelease(info,list.getMasterList())){
+                                if (logic.resMessageService.checkManifestRelease(info,listinfos)){
                                     checkResult=true;
                                 }else {
                                     //有运单未放行
--- a/src/main/java/com/sy/mapper/LAND_BUSINEESTYPE_LIST_INFOMapper.java
查看文件 @099be03
+++ b/src/main/java/com/sy/mapper/LAND_BUSINEESTYPE_LIST_INFOMapper.java
查看文件 @099be03
@@ -21,4 +21,6 @@ public interface LAND_BUSINEESTYPE_LIST_INFOMapper {
     List<LAND_BUSINEESTYPE_LIST_INFO> selectarrive(@Param("applicationformid") String applicationformid);
     List<LAND_BUSINEESTYPE_LIST_INFO> selectpartialidentity(@Param("applicationformid") String applicationformid);
+
+    List<LAND_BUSINEESTYPE_LIST_INFO> selectmanilists(@Param("applicationformid") String applicationformid);
 }
--- a/src/main/java/com/sy/service/BusnesslistinfoService.java
查看文件 @099be03
+++ b/src/main/java/com/sy/service/BusnesslistinfoService.java
查看文件 @099be03
@@ -7,4 +7,5 @@ import java.util.List;
 public interface BusnesslistinfoService {
     List<LAND_BUSINEESTYPE_LIST_INFO> selectarrvie(String applicationformid);
     List<LAND_BUSINEESTYPE_LIST_INFO> selectpartialidentity(String applicationformid);
+    List<LAND_BUSINEESTYPE_LIST_INFO> selectmanilist(String applicationformid);
 }
--- a/src/main/java/com/sy/service/ResMessageService.java
查看文件 @099be03
+++ b/src/main/java/com/sy/service/ResMessageService.java
查看文件 @099be03
 package com.sy.service;
 import com.sy.model.GatherInfo;
+import com.sy.model.LAND_BUSINEESTYPE_LIST_INFO;
 import com.sy.model.RESMESSAGE;
 import java.util.List;
@@ -18,8 +19,8 @@ public interface ResMessageService {
     List<RESMESSAGE> selectByManifestList(String[] manifest);
     /**
-     * @param manifestList 运单号数组字符串 格式为"'69515289724','40692420145','17233862076'"
+     * @param list_infos 运单号数组字符串 格式为"'69515289724','40692420145','17233862076'"
      * @return 全部放行 返回true 未全部放行返回false
      */
-    boolean checkManifestRelease(GatherInfo info, String manifestList);
+    boolean checkManifestRelease(GatherInfo info, List<LAND_BUSINEESTYPE_LIST_INFO> list_infos);
 }
--- a/src/main/java/com/sy/service/impl/BusnesslistinfoImpl.java
查看文件 @099be03
+++ b/src/main/java/com/sy/service/impl/BusnesslistinfoImpl.java
查看文件 @099be03
@@ -21,4 +21,9 @@ public class BusnesslistinfoImpl implements BusnesslistinfoService {
     public List<LAND_BUSINEESTYPE_LIST_INFO> selectpartialidentity(String applicationformid) {
         return list_infoMapper.selectpartialidentity(applicationformid);
     }
+
+    @Override
+    public List<LAND_BUSINEESTYPE_LIST_INFO> selectmanilist(String applicationformid) {
+        return list_infoMapper.selectmanilists(applicationformid);
+    }
 }
--- a/src/main/java/com/sy/service/impl/ResMessageServiceImpl.java
查看文件 @099be03
+++ b/src/main/java/com/sy/service/impl/ResMessageServiceImpl.java
查看文件 @099be03
@@ -2,6 +2,7 @@ package com.sy.service.impl;
 import com.sy.mapper.RESMESSAGEMapper;
 import com.sy.model.GatherInfo;
+import com.sy.model.LAND_BUSINEESTYPE_LIST_INFO;
 import com.sy.model.RESMESSAGE;
 import com.sy.service.ResMessageService;
 import com.sy.socket.CommandClient;
@@ -9,6 +10,7 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Vector;
@@ -42,14 +44,18 @@ public class ResMessageServiceImpl implements ResMessageService {
     }
     @Override
-    public boolean checkManifestRelease(GatherInfo info,String manifestList) {
+    public boolean checkManifestRelease(GatherInfo info, List<LAND_BUSINEESTYPE_LIST_INFO> list_infos) {
         List<String> noRelease = new Vector<>();
-        if (manifestList.length() < 1) {
+        if (list_infos.size() < 1) {
             CommandClient.Client(info, AWB_EMPTY);
             return false;
         }
-        manifestList = manifestList.replace("-", "").replace("，", ",");
-        String[] maifest = manifestList.split(",");
+        List<String> manifestList=new ArrayList<String>();
+        for(LAND_BUSINEESTYPE_LIST_INFO land:list_infos){
+            manifestList.add(land.getAwba());
+        }
+        //manifestList = manifestList.replace("-", "").replace("，", ",");
+        String[] maifest = manifestList.toArray(new String[manifestList.size()]);
         logger.info("运单列表:" + manifestList);
         boolean flag = false;
--- a/src/main/resources/mapping/LAND_BUSINEESTYPE_LIST_INFOMapper.xml
查看文件 @099be03
+++ b/src/main/resources/mapping/LAND_BUSINEESTYPE_LIST_INFOMapper.xml
查看文件 @099be03
@@ -37,6 +37,13 @@
     where 1=1 and partialIdentity='1'
     and applicationFormId = #{applicationformid,jdbcType=VARCHAR}
   </select>
+  <select id="selectmanilists" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select
+    awba
+    from land_busineestype_list_info
+    where 1=1
+    and applicationFormId = #{applicationformid,jdbcType=VARCHAR}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from land_busineestype_list_info
     where id = #{id,jdbcType=VARCHAR}