...
|
...
|
@@ -1310,6 +1310,13 @@ public class ManifestController extends BasicController { |
|
|
String de_packing = manifest.getDe_packing();
|
|
|
// 操作代理 。。。。。。。。。
|
|
|
String de_remarks = manifest.getDe_remarks();
|
|
|
|
|
|
// 判断主单是否存在
|
|
|
ManifestEntity wbm = manifestService.findWbm(manifest.getWaybillnomaster());
|
|
|
if (wbm != null) {
|
|
|
model.setStatus(201);
|
|
|
model.setMsg("主单号已存在!");
|
|
|
} else {
|
|
|
// 货主信息
|
|
|
if(StringUtils.isBlank(de_trstation) && StringUtils.isBlank(de_packing) && StringUtils.isBlank(de_remarks)){
|
|
|
|
...
|
...
|
@@ -1393,13 +1400,6 @@ public class ManifestController extends BasicController { |
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
// 判断主单是否存在
|
|
|
ManifestEntity wbm = manifestService.findWbm(manifest.getWaybillnomaster());
|
|
|
if (wbm != null) {
|
|
|
model.setStatus(201);
|
|
|
model.setMsg("主单号已存在!");
|
|
|
} else {
|
|
|
WaybillReceiptType type = WaybillReceiptType.TEMP_SAVE;
|
|
|
|
|
|
String stowagedate = request.getParameter("stowagedate");
|
...
|
...
|
|