修改编辑分单时，企业类型仍然不显示的bug；

Kevin
src/main/java/com/agent/controller/agent/ManifestController.java
src/main/java/com/agent/controller/agent/ReceiptController.java
src/main/resources/i18n_en_US.properties
src/main/resources/i18n_zh_CN.properties
src/main/webapp/WEB-INF/views/manifest/edit.jsp
src/main/webapp/WEB-INF/views/manifest/list.jsp
src/main/webapp/WEB-INF/views/manifest/sub_edit.jsp
--- a/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @c28062e
+++ b/src/main/java/com/agent/controller/agent/ManifestController.java
查看文件 @c28062e
@@ -864,8 +864,9 @@ public class ManifestController extends BasicController {
 			} else {
 				String responseCode = manifest.getResponse_code();
 				int resCode = NumKit.parseString2Int(responseCode);
-				WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
-				WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
+//				WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
+//				WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
+				WaybillReceiptType type = WaybillReceiptType.APPLY;
 				String stowagedate = request.getParameter("stowagedate");
 				manifest.setStowagedate(ManifestEntity.getStowagedate(stowagedate));
@@ -1070,8 +1071,10 @@ public class ManifestController extends BasicController {
 			} else {
 				String responseCode = preparesecondary.getResponse_code();
 				int resCode = NumKit.parseString2Int(responseCode);
-				WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
-				WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
+//				WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
+//				WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
+				
+				WaybillReceiptType type = WaybillReceiptType.APPLY;
 				String stowagedate = request.getParameter("stowagedate");
 				preparesecondary.setStowagedate(preparesecondary.getStowagedate(stowagedate));
--- a/src/main/java/com/agent/controller/agent/ReceiptController.java
查看文件 @c28062e
+++ b/src/main/java/com/agent/controller/agent/ReceiptController.java
查看文件 @c28062e
@@ -55,6 +55,13 @@ public class ReceiptController {
 	public ResponseModel update(String waybillNo, String waybillNoSub, String sendTime, String response_code,
 			String response_text, HttpServletRequest reuqest) {
 		ResponseModel res = new ResponseModel();
+		
+		if (StringUtils.isBlank(response_code) || StringUtils.isBlank(response_text)) {
+			res.setStatus(500);
+			res.setMsg("回执为空");
+			return res;
+		}
+		
 		WaybillReceiprtEntity wre = null;
 		if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isBlank(waybillNoSub)) {
 			// 主单报文
@@ -72,7 +79,7 @@ public class ReceiptController {
 				wre.setMessage_type("MT2201");
 				wre.setResponse_code(response_code);
 				wre.setResponse_text(response_text);
-				wre.setSendtime(sendTime!=null?sendTime:Constant.dateTimeFormat.format(new Date()));
+				wre.setSendtime(sendTime != null ? sendTime : Constant.dateTimeFormat.format(new Date()));
 				wre.setWaybill_no(bean.getWaybillnomaster());
 				wre.setCreator(Tools.getUserEntity());
 				wre.setModifier(Tools.getUserEntity());
@@ -102,7 +109,7 @@ public class ReceiptController {
 				wre.setMessage_type("MT2201");
 				wre.setResponse_code(response_code);
 				wre.setResponse_text(response_text);
-				wre.setSendtime(sendTime!=null?sendTime:Constant.dateTimeFormat.format(new Date()));
+				wre.setSendtime(sendTime != null ? sendTime : Constant.dateTimeFormat.format(new Date()));
 				wre.setWaybill_no(bean.getWaybillnomaster());
 				wre.setSub_waybill_no(bean.getWaybillnosecondary());
 				wre.setCreator(Tools.getUserEntity());
--- a/src/main/resources/i18n_en_US.properties
查看文件 @c28062e
+++ b/src/main/resources/i18n_en_US.properties
查看文件 @c28062e
@@ -374,6 +374,8 @@ handlebill.password=Password
 track.no=Freight Waybill No
 ###
+manifest.carrier.tip=Please enter two words, for example, CA
+manifest.carrier.flightno.tip=Please enter flightno, for example, 999
 manifest.enterprise.code=Enterprise Code
 manifest.enterprise.code.type=Select Code Type
 manifest.list=Manifest List
--- a/src/main/resources/i18n_zh_CN.properties
查看文件 @c28062e
+++ b/src/main/resources/i18n_zh_CN.properties
查看文件 @c28062e
@@ -376,6 +376,8 @@ handlebill.password=\u8BBE\u7F6E\u63D0\u8D27\u5BC6\u7801
 track.no=\u8D27\u8FD0\u5355\u53F7
 ###
+manifest.carrier.tip=\u8BF7\u8F93\u5165\u822A\u53F8\u4E8C\u5B57\u7801,\u4F8B\u5982\uFF1ACA
+manifest.carrier.flightno.tip=\u8BF7\u8F93\u5165\u822A\u73ED\u53F7\uFF0C\u4F8B\u5982\uFF1A999
 manifest.enterprise.code=\u4F01\u4E1A\u4EE3\u7801
 manifest.enterprise.code.type=\u8BF7\u9009\u62E9\u4EE3\u7801\u7C7B\u578B
 manifest.list=\u9884\u914D\u8231\u5355\u5217\u8868
--- a/src/main/webapp/WEB-INF/views/manifest/edit.jsp
查看文件 @c28062e
+++ b/src/main/webapp/WEB-INF/views/manifest/edit.jsp
查看文件 @c28062e
@@ -124,12 +124,14 @@
 							<td class="kv-label"><spring:message code="manifest.carrier" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
+									placeholder="<spring:message code='manifest.carrier.tip'/>"
 									value="${manifest.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
 									onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.flight.number" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="flightno" name="flightno" type="text"
+									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
 									value="${manifest.flightno }" oninput="onInputChange(event,'flightno','oninput')"
 									onpropertychange="onInputChange(event,'flightno','onpropertychange')"></td>
@@ -537,6 +539,10 @@
 									onpropertychange="onInputChange(event,'unlodingcode','onpropertychange')"></td>
 						</tr>
 						<!-- 收货人信息 end -->
+						
+						<tr style="display: none;">
+							<td> <input value="${manifest.cnecusid}"/> <input value="${manifest.shpcusid}"/> </td>
+						</tr>
 						<!-- 危险品信息 start -->
 						<tr>
--- a/src/main/webapp/WEB-INF/views/manifest/list.jsp
查看文件 @c28062e
+++ b/src/main/webapp/WEB-INF/views/manifest/list.jsp
查看文件 @c28062e
@@ -40,7 +40,7 @@
                             <%-- <th field="totalpiece" width="50"><spring:message code="manifest.number.of.consignment.note"/></th>--%>
                             <th field="preparetotalweight" width="20"><spring:message code="manifest.pre.weight"/></th>
                             <th field="preparetotalpiece"  width="20"><spring:message code="manifest.number.of.fittings"/></th>
-                            <th field="response_text" widht="260"><spring:message code="manifest.response_text" /></th>
+                            <th field="response_text" widht="260" formatter="checkResponseText"><spring:message code="manifest.response_text" /></th>
                             <th field=".." width="20" formatter="operatorFormat"><spring:message code="opt.operator" /></th>
 <%--                        <th field="flightdate" width="130"><spring:message code="manifest.flight.date"/></th> --%>
                         </tr>
@@ -68,6 +68,22 @@
 <!--弹出层引入的JS-->
 <script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
     <script type="text/javascript">
+    
+    function checkResponseText(value, row, index) {
+        var res = '';
+        if(value){
+     	   		var start = value.indexOf("41301");
+ 	           if(start>-1){
+ 	            	// 成功
+ 	            	res = '<span style="color:green;">'+value+'</span>';
+            }else{
+               	// 未通过
+               	res = '<span style="color:black;">'+value+'</span>';
+            }
+        }
+
+        return res;
+ 	}
     $(function(){
         function getPageNumber(){
@@ -121,7 +137,23 @@
                         {field:'totalweight',title:'<spring:message code="manifest.waybill.weight"/>',width:60}, */
                         {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>',width:30},
                         {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>',width:30},
-                        {field:'response_text',title:'<spring:message code="manifest.response_text"/>', width:160},
+                        {field:'response_text',title:'<spring:message code="manifest.response_text"/>', width:160,
+	                        	formatter:function(value, row, index){
+	                        		   var res = '';
+	                                if(value){
+	                             	   		var start = value.indexOf("41301");
+	                         	           if(start>-1){
+	                         	            	// 成功
+	                         	            	res = '<span style="color:green;">'+value+'</span>';
+	                                    }else{
+	                                       	// 未通过
+	                                       	res = '<span style="color:black;">'+value+'</span>';
+	                                    }
+	                                }
+
+	                                return res;
+	                        }
+                        },
                         {field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:40}
                     ]],
                     onResize:function(){
--- a/src/main/webapp/WEB-INF/views/manifest/sub_edit.jsp
查看文件 @c28062e
+++ b/src/main/webapp/WEB-INF/views/manifest/sub_edit.jsp
查看文件 @c28062e
@@ -95,12 +95,14 @@
 							<td class="kv-label"><spring:message code="manifest.carrier" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
+									placeholder="<spring:message code='manifest.carrier.tip'/>"
 									value="${manifest.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
 									onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.flight.number" /><span
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="flightno" name="flightno" type="text"
+									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
 									value="${pre.flightno }" oninput="onInputChange(event,'flightno','oninput')"
 									onpropertychange="onInputChange(event,'flightno','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.flight.date" /><span
@@ -168,8 +170,8 @@
 									<option value="CC" <c:if test = "${pre.paymode =='CC' }">selected="selected "</c:if>><spring:message
 											code="manifest.to.pay" /></option>
 								</select></td>
-							<td class="kv-label"><spring:message code="manifest.fitting.time" /></td>
-							<td class="kv-content"><input type="text" class="date bill" id="stowagedate"
+							<td style="display: none;" class="kv-label"><spring:message code="manifest.fitting.time" /></td>
+							<td style="display: none;" class="kv-content"><input type="text" class="date bill" id="stowagedate"
 									autocomplete="off" name="stowagedate"
 									onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})"
 									value="<fmt:formatDate pattern='yyyy-MM-dd HH:mm:ss' value='${pre.stowagedate }'></fmt:formatDate>">
@@ -435,6 +437,10 @@
 									value="${pre.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
 									onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
 						</tr>
+						
+						<tr style="display: none;">
+							<td> <input value="${pre.cnecusid}"/> <input value="${pre.shpcusid}"/> </td>
+						</tr>
 						<%-- <tr>
 							<td class="kv-label"><spring:message code="manifest.province.code" /></td>
 							<td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text"
@@ -974,6 +980,26 @@
 			});
 		 function onGetData(selectId,inputId) {
+			 var cneType = "";
+			 var shpType = "";
+			 if(selectId=="co_cusid"){
+				 //发货的
+				 var shp_cusid = "${pre.shpcusid}";
+				 console.log("shp_cusid-->"+shp_cusid);
+				 if(notEmpty(shp_cusid)){
+					 shpType = shp_cusid.split("+")[0];
+				 }
+			 }
+			 
+			 if(selectId=="sh_cusid"){
+				 //收货的
+				 var cnecusid = "${pre.cnecusid}";
+				 console.log("cnecusid-->"+cnecusid);
+				 if(notEmpty(cnecusid)){
+					 cneType = cnecusid.split("+")[0];
+				 }
+			 }
+			 
 			 var select = $("#"+selectId);
 			 select.html("");
 			 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
@@ -985,10 +1011,26 @@
 				success : function(data) {
 					if (data.status == 200) {
 						if (data.data) {
+							console.log("shpType-->"+shpType);
+							console.log("cneType-->"+cneType);
+							
 							for (var i = 0; i < data.data.length; i++) {
 								var type = data.data[i].enterprise_type;
-								select.append("<option value='"+type+"'>"
-										+ type + "</option>");
+								if(selectId=="co_cusid"){
+									if(notEmpty(shpType)&&type&&(type==shpType)){
+										select.append("<option selected value='"+type+"'>"+type+"</option>");
+									}else{
+										select.append("<option value='"+type+"'>"+type+"</option>");
+									}
+								}else if(selectId=="sh_cusid"){
+									if(notEmpty(cneType)&&type&&(type==cneType)){
+										select.append("<option selected value='"+type+"'>"+type+"</option>");
+									}else{
+										select.append("<option value='"+type+"'>"+type+"</option>");
+									}
+								}else{
+									select.append("<option value='"+type+"'>"+type+"</option>");
+								}
 							}
 						}
 					}