add veManifestRealtion

zhangFan
README.md
config/config.properties
src/main/java/com/sy/logic/LogicOperation.java
src/main/java/com/sy/relation/VeManifestRelation.java
--- a/README.md 0 → 100644
查看文件 @f3ebb57
+++ b/README.md 0 → 100644
查看文件 @f3ebb57
+#### 卡口报文数据交换
+##### 项目描述
+###### 从IMF消息总线接收队列内消息并处理，生成卡口硬件所能识别的抬杆报文消息，实现卡口抬杆自动化
+
+#### 项目目录
+##### config
+###### 项目配置文件
+####### application.properties 数据库配置，spring配置及其他项目所需配置
+####### config.properties IMF登录配置及报文头部信息配置
+####### imf_config.properties IMF连接配置文件
+####### log4j.properties 日志配置
+##### lib
+###### IMF所需本地jar包，在pom.xml中引入，不引入项目无法启动
+##### logs
+###### 项目日志存储地址，可在log4j.properties中配置
+##### out
+###### 打包的jar目录
+##### src
+###### 新项目主程序所在
+##### test
+###### 测试代码
+##### pom.xml
+###### maven引入jar所在
--- a/config/config.properties
查看文件 @f3ebb57
+++ b/config/config.properties
查看文件 @f3ebb57
 #\u767B\u5F55\u8D26\u53F7
-loginname = KAOR
+loginname=KKW1
 #\u5361\u53E3\u6570\u636E\u63A5\u6536KKW1\uFF0C\u5361\u53E3\u53D1\u9001\u6570\u636EKAKO\uFF0C\u653E\u884C\u62A5\u6587 KKFX
 #\u767B\u5F55\u5BC6\u7801
-loginpass=KAOR
+loginpass=KKW1
 #\u53D1\u9001\u62A5\u6587\u76EE\u5F55,\u76F8\u5BF9\u7A0B\u5E8F\u76EE\u5F55
 sendDirectory=D:/bw/sendDirectory
 #\u63A5\u6536\u5B58\u50A8\u62A5\u6587\u76EE\u5F55
 receiveDirectory=D:/bw/receiveDirectory
 #\u8F66\u5355\u5173\u7CFB\u62A5\u6587\u76EE\u5F55
-veManifestDirectory=D:/bw/veManifestDirectory
+veManifestDirectory=D:/bw/veManifestDirectory/
 #IMF MEAT\u62A5\u5934\u914D\u7F6E
 RCVR=
-TYPE=KAOR
+TYPE=KAKO
 STYP=CARM
 #\u8F7D\u91CD\u4E0E\u79F0\u91CD\u7684\u53EF\u63A7\u8303\u56F4 ?%
--- a/src/main/java/com/sy/logic/LogicOperation.java
查看文件 @f3ebb57
+++ b/src/main/java/com/sy/logic/LogicOperation.java
查看文件 @f3ebb57
@@ -172,26 +172,30 @@ public class LogicOperation {
                 }
             }
-            boolean check = logic.checkResult(growssWt, selfWt, goodsWt);
-            boolean checkMainfest = logic.checkManifest(list.getMasterList());
             boolean checkResult = false;
+            boolean check = false;
+            boolean checkMainfest =false;
-            if ("E".equals(list.getTurnoverflag())) {
-                checkResult = checkMainfest || check;
-            } else {
-                checkResult = check || checkMainfest;
-            }
-
-            if("查验货".equals(list.getCocode())){
+            if(!"普通货".equals(list.getCocode())){
                 checkResult = true;
-            }
-            //宽进
-            if ("I".equals(info.getIetype())) {
-                if (check == false && checkResult == false) {
-                    checkResult = true;
+            }else {
+               check = logic.checkResult(growssWt, selfWt, goodsWt);
+               checkMainfest = logic.checkManifest(list.getMasterList());
+
+                if ("E".equals(list.getTurnoverflag())) {
+                    checkResult = checkMainfest || check;
+                } else {
+                    checkResult = check || checkMainfest;
+                }
+
+                //宽进
+                if ("I".equals(info.getIetype())) {
+                    if (check == false && checkResult == false) {
+                        checkResult = true;
+                    }
                 }
+                logger.info("重量校验结果：" + check + "，运单校验结果：" + checkMainfest + ",最终校验结果：" + checkResult);
             }
-            logger.info("重量校验结果：" + check + "，运单校验结果：" + checkMainfest + ",最终校验结果：" + checkResult);
             if (logic.sendBw(info, checkResult)) {
                 if ("I".equals(info.getIetype())) {
@@ -208,6 +212,8 @@ public class LogicOperation {
                     double diffVal = 0;
                     for (int i = 0; i < typeLists.size(); i++) {
                         if ("I".equals(typeLists.get(i).getTurnoverflag()) && typeLists.get(i).getEndstation().equals(list.getEndstation())) {
+                            System.out.println(typeLists.get(i).getAislewt());
+                            System.out.println(growssWt);
                             diffVal = typeLists.get(i).getAislewt() - growssWt;
                             break;
                         }
--- a/src/main/java/com/sy/relation/VeManifestRelation.java
查看文件 @f3ebb57
+++ b/src/main/java/com/sy/relation/VeManifestRelation.java
查看文件 @f3ebb57
@@ -39,7 +39,7 @@ public class VeManifestRelation {
     public String getMsg(LandBusinessTypeList landBusinessTypeList){
         StringBuffer buffer = new StringBuffer();
         buffer.append("<CONTENT>");
-        buffer.append("<VENAME>"+"</VENAME>");
+        buffer.append("<VENAME>"+landBusinessTypeList.getTrailerFrameNo()+"</VENAME>");
         buffer.append("<MANIFESTS>");
         String [] manifests = getManifests(landBusinessTypeList.getMasterList());
         for (String manifest : manifests){
@@ -50,6 +50,7 @@ public class VeManifestRelation {
         buffer.append("<ASILE>"+landBusinessTypeList.getAisle()+"</ASILE>");
         buffer.append("<TYPE>"+landBusinessTypeList.getBusinesstype()+"</TYPE>");
         buffer.append("<OPTM>"+new DateTimeConverter().dateFormat() +"</OPTM>");
+        buffer.append("</CONTENT>");
         return buffer.toString();
     }