朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 24ff46ce6204fc9a74ebef6fa2b68eeab1e031b8 1 个父辈 58aaf163

修改 海关状态 收发货人 城市 改为null（海关规定） 发货人手机为必填项 收货人除名称以外 其他改为选填项

内嵌 并排对比
正在显示 5 个修改的文件 包含 41 行增加 和 26 行删除
@@ -1077,7 +1077,8 @@ public class ManifestController extends BasicController { @@ -1077,7 +1077,8 @@ public class ManifestController extends BasicController {
1077 model.setData(manifest); 1077 model.setData(manifest);
1078 model.setStatus(200); 1078 model.setStatus(200);
1079 model.setMsg(HttpJsonMsg.SUCCESS); 1079 model.setMsg(HttpJsonMsg.SUCCESS);
1080 - 1080 + manifest.setSh_city("");
  1081 + manifest.setCo_city("");
1081 receiptService.saveFromManifest(manifest, WaybillReceiptType.TEMP_SAVE); 1082 receiptService.saveFromManifest(manifest, WaybillReceiptType.TEMP_SAVE);
1082 } 1083 }
1083 } catch (Exception e) { 1084 } catch (Exception e) {
@@ -1150,7 +1151,8 @@ public class ManifestController extends BasicController { @@ -1150,7 +1151,8 @@ public class ManifestController extends BasicController {
1150 @ResponseBody 1151 @ResponseBody
1151 public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) { 1152 public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
1152 1153
1153 - System.out.println(manifest); 1154 + manifest.setSh_city("");
  1155 + manifest.setCo_city("");
1154 1156
1155 //发货人 1157 //发货人
1156 String forShortShipper = request.getParameter("for_short_shipper"); 1158 String forShortShipper = request.getParameter("for_short_shipper");
@@ -21,6 +21,7 @@ public class SDCargoTypeService extends BasicService<SDCargoTypeEntity> { @@ -21,6 +21,7 @@ public class SDCargoTypeService extends BasicService<SDCargoTypeEntity> {
21 21
22 @Transactional 22 @Transactional
23 public SDCargoTypeEntity save(SDCargoTypeEntity sdCargoTypeEntity){ 23 public SDCargoTypeEntity save(SDCargoTypeEntity sdCargoTypeEntity){
  24 +
24 return sdCargoTypeRepository.save(sdCargoTypeEntity); 25 return sdCargoTypeRepository.save(sdCargoTypeEntity);
25 } 26 }
26 27
@@ -27,7 +27,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -27,7 +27,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
27 27
28 28
29 <div style="margin-top: 10px;"> 29 <div style="margin-top: 10px;">
30 - <input class="verifyInputs" style="float: left; width: 191px; height: 26px; line-height: 35px; margin-left: 0px; padding: 5px;" name="verifyInput" id="verifyInput" placeholder="请输入验证码"> 30 + <input class="verifyInputs" style="float: left; width: 191px; height: 26px; line-height: 35px; margin-left: 0px; padding: 5px;" name="verifyInput" id="verifyInput" placeholder="请计算右侧图片中的数值">
31 31
32 <img class="verifyCodes" style="float: left; width: 202px; height: 37px; line-height: 35px; margin-left: 11px; padding: 5px; margin-top: -5px;" onclick="changeCode()" src="<%=basePath %>agent/getVerifyCode"> 32 <img class="verifyCodes" style="float: left; width: 202px; height: 37px; line-height: 35px; margin-left: 11px; padding: 5px; margin-top: -5px;" onclick="changeCode()" src="<%=basePath %>agent/getVerifyCode">
33 33
@@ -216,20 +216,34 @@ @@ -216,20 +216,34 @@
216 class="required_span">*</span></td> 216 class="required_span">*</span></td>
217 <td class="kv-content" colspan="3"><select id="customsstatus" name="customsstatus" required> 217 <td class="kv-content" colspan="3"><select id="customsstatus" name="customsstatus" required>
218 <option value="001" 218 <option value="001"
219 - <c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>><spring:message  
220 - code="manifest.customs_status_001" /></option> 219 + <c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>>
  220 + <%--<spring:message--%>
  221 + <%--code="manifest.customs_status_001" />--%>进出口货物
  222 + </option>
221 <option value="002" 223 <option value="002"
222 - <c:if test="${manifest.customsstatus == 002 }">selected="selected"</c:if>><spring:message  
223 - code="manifest.customs_status_002" /></option> 224 + <c:if test="${manifest.customsstatus == 002 }">selected="selected"</c:if>>
  225 + <%--<spring:message--%>
  226 + <%--code="manifest.customs_status_002" />--%>国际转运货物
  227 + </option>
224 <option value="003" 228 <option value="003"
225 - <c:if test="${manifest.customsstatus == 003 }">selected="selected"</c:if>><spring:message  
226 - code="manifest.customs_status_003" /></option> 229 + <c:if test="${manifest.customsstatus == 003 }">selected="selected"</c:if>>
  230 + <%--<spring:message--%>
  231 + <%--code="manifest.customs_status_003" />--%>过境货物
  232 + </option>
227 <option value="004" 233 <option value="004"
228 - <c:if test="${manifest.customsstatus == 004 }">selected="selected"</c:if>><spring:message  
229 - code="manifest.customs_status_004" /></option>  
230 - <option value="006"  
231 - <c:if test="${manifest.customsstatus == 006 }">selected="selected"</c:if>><spring:message  
232 - code="manifest.customs_status_006" /></option> 234 + <c:if test="${manifest.customsstatus == 004 }">selected="selected"</c:if>>
  235 + <%--<spring:message--%>
  236 + <%--code="manifest.customs_status_004" />--%>暂时进出境集装箱
  237 + </option>
  238 + <option value="007"
  239 + <c:if test="${manifest.customsstatus == 007 }">selected="selected"</c:if>><%--<spring:message--%>
  240 + <%--code="manifest.customs_status_006" />--%>互市贸易</option>
  241 + <option value="008"
  242 + <c:if test="${manifest.customsstatus == 008 }">selected="selected"</c:if>>
  243 + <%--<spring:message--%>
  244 + <%--code="manifest.customs_status_006" />--%>
  245 + 惰性物料
  246 + </option>
233 </select></td> 247 </select></td>
234 </tr> 248 </tr>
235 <tr style="display: none;"> 249 <tr style="display: none;">
@@ -298,8 +312,10 @@ @@ -298,8 +312,10 @@
298 value="${manifest.co_zipcode }"></td> 312 value="${manifest.co_zipcode }"></td>
299 </tr> 313 </tr>
300 <tr> 314 <tr>
301 - <td class="kv-label"><spring:message code="manifest.telephone" /></td>  
302 - <td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50" 315 + <td class="kv-label"><spring:message code="manifest.telephone" />
  316 + <span class="required_span">*</span>
  317 + </td>
  318 + <td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50" required
303 value="${manifest.co_telephone }" 319 value="${manifest.co_telephone }"
304 oninput="onInputChange(event,'co_telephone','oninput')" 320 oninput="onInputChange(event,'co_telephone','oninput')"
305 onpropertychange="onInputChange(event,'co_telephone','onpropertychange')" 321 onpropertychange="onInputChange(event,'co_telephone','onpropertychange')"
@@ -360,22 +376,20 @@ @@ -360,22 +376,20 @@
360 <td class="kv-content"><input required id="sh_company" name="sh_company" type="text" maxlength="70" 376 <td class="kv-content"><input required id="sh_company" name="sh_company" type="text" maxlength="70"
361 value="${manifest.sh_company }" oninput="onInputChange(event,'sh_company','oninput')" 377 value="${manifest.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
362 onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td> 378 onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
363 - <td class="kv-label"><spring:message code="manifest.address" /><span  
364 - class="required_span">*</span></td>  
365 - <td class="kv-content"><input required id="sh_address" name="sh_address" maxlength="70" 379 + <td class="kv-label"><spring:message code="manifest.address" /></td>
  380 + <td class="kv-content"><input id="sh_address" name="sh_address" maxlength="70"
366 type="text" value="${manifest.sh_address }" 381 type="text" value="${manifest.sh_address }"
367 oninput="onInputChange(event,'sh_address','oninput')" 382 oninput="onInputChange(event,'sh_address','oninput')"
368 onpropertychange="onInputChange(event,'sh_address','onpropertychange')"></td> 383 onpropertychange="onInputChange(event,'sh_address','onpropertychange')"></td>
369 - <td class="kv-label"><spring:message code="manifest.country" /><span  
370 - class="required_span">*</span></td>  
371 - <td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2" 384 + <td class="kv-label"><spring:message code="manifest.country" /></td>
  385 + <td class="kv-content"><input id="sh_country" name="sh_country" maxlength="2"
372 type="text" value="${manifest.sh_country}" class="layui-input" 386 type="text" value="${manifest.sh_country}" class="layui-input"
373 oninput="onInputChange(event,'sh_country','oninput')" 387 oninput="onInputChange(event,'sh_country','oninput')"
374 onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td> 388 onpropertychange="onInputChange(event,'sh_country','onpropertychange')"></td>
375 </tr> 389 </tr>
376 <tr> 390 <tr>
377 - <td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>  
378 - <td class="kv-content"><input required id="sh_city" name="sh_city" type="text" maxlength="35" 391 + <td class="kv-label"><spring:message code="manifest.city" /></td>
  392 + <td class="kv-content"><input id="sh_city" name="sh_city" type="text" maxlength="35"
379 value="${manifest.sh_city }" oninput="onInputChange(event,'sh_city','oninput')" 393 value="${manifest.sh_city }" oninput="onInputChange(event,'sh_city','oninput')"
380 onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td> 394 onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
381 <td class="kv-label"><spring:message code="manifest.state" /></td> 395 <td class="kv-label"><spring:message code="manifest.state" /></td>
@@ -75,7 +75,6 @@ @@ -75,7 +75,6 @@
75 </div> 75 </div>
76 </div> 76 </div>
77 </div> 77 </div>
78 -<%--<script src="http://res.layui.com/lay/lib/layer/src/layer.js?v=2.0"></script>--%>  
79 <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script> 78 <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
80 79
81 <script type="text/javascript"> 80 <script type="text/javascript">
@@ -103,7 +102,6 @@ @@ -103,7 +102,6 @@
103 var confirmnewpassword = $("#confirmnewpassword").val(); 102 var confirmnewpassword = $("#confirmnewpassword").val();
104 var id = $("#id").val(); 103 var id = $("#id").val();
105 104
106 - UPSCGOSCS123  
107 var passwords = $("#newpassword").val(); 105 var passwords = $("#newpassword").val();
108 106
109 var reg = /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{8,}$/; 107 var reg = /^(?![A-Za-z0-9]+$)(?![a-z0-9\W]+$)(?![A-Za-z\W]+$)(?![A-Z0-9\W]+$)[a-zA-Z0-9\W]{8,}$/;