安检申报添加 修改提示信息

@@ -354,7 +354,8 @@ public class SecurityDeclarationController {
 
 
 
 
         //查询是否存在
         //查询是否存在
-        if (securityDeclarationService.findWaybill(waybill) == 0 && manifestService.findWbm(waybill) == null){
+        if (securityDeclarationService.findWaybill(waybill) == 0){
+            if (manifestService.findWbm(waybill) == null){
                 //货物性质（类型）添加
                 //货物性质（类型）添加
                 for (String type: list){
                 for (String type: list){
                     SDCargoTypeEntity sdCargoTypeEntity = new SDCargoTypeEntity();
                     SDCargoTypeEntity sdCargoTypeEntity = new SDCargoTypeEntity();
@@ -437,6 +438,10 @@ public class SecurityDeclarationController {
 
 
                 model.setStatus(200);
                 model.setStatus(200);
             }else {
             }else {
+                model.setStatus(204);
+            }
+
+        }else {
             model.setStatus(203);
             model.setStatus(203);
         }
         }
 
 
@@ -744,7 +749,7 @@ public class SecurityDeclarationController {
         String path = resource.getPath();
         String path = resource.getPath();
         String s = path +"../../resource/img/bar_code/"+replace+".png";
         String s = path +"../../resource/img/bar_code/"+replace+".png";
         //生成条形码
         //生成条形码
-//        BarCodeUtil.generateFile(replace, s);
+        BarCodeUtil.generateFile(replace, s);
 
 
         model.addAttribute("path", replace);
         model.addAttribute("path", replace);
 
 

@@ -297,6 +297,8 @@
                     }
                     }
                     else if (data.status == 203){
                     else if (data.status == 203){
                     	alert("安检申报不可以重复添加");
                     	alert("安检申报不可以重复添加");
+                	}else if(data.status == 204){
+                        alert("请前往预配界面添加安检申报");
 					} else {
 					} else {
                         layer.open({content:data.msg});
                         layer.open({content:data.msg});
                     }
                     }

@@ -217,6 +217,7 @@
 		function prebackout(id){
 		function prebackout(id){
 			if(typeof(id) == "undefined")
 			if(typeof(id) == "undefined")
 				return;
 				return;
+
 			layer.confirm("确定要撤销吗？", function(flag){
 			layer.confirm("确定要撤销吗？", function(flag){
 				layer.close(flag);
 				layer.close(flag);
 				$.ajax({
 				$.ajax({