diff --git a/src/main/java/com/agent/controller/agent/ManifestController.java b/src/main/java/com/agent/controller/agent/ManifestController.java
index e5e3d76..aaa6536 100644
--- a/src/main/java/com/agent/controller/agent/ManifestController.java
+++ b/src/main/java/com/agent/controller/agent/ManifestController.java
@@ -1259,8 +1259,9 @@ public class ManifestController extends BasicController {
ResponseModel model = new ResponseModel();
try {
+ // 判断验证码 是否正确
if ("dcdf38d9a5d6411985e49155481882f5".equals(manifest.getDe_size())) {
-
+ // 判断参数是否为空
if (StringUtils.isBlank(manifest.getWaybillnomaster()) || StringUtils.isBlank(manifest.getDe_type())
|| StringUtils.isBlank(manifest.getDelivery_station()) || StringUtils.isBlank(manifest.getFlightno())
|| manifest.getFlightdate() == null || StringUtils.isBlank(manifest.getOriginatingstation())
@@ -1278,57 +1279,117 @@ public class ManifestController extends BasicController {
model.setMsg("缺少参数");
}else {
- if (manifest.getWaybillnomaster().contains("-")) {
+ // 判断 主分单
+ if(StringUtils.isBlank(manifest.getDe_number())){
+ // 查看主单号
+ if (manifest.getWaybillnomaster().contains("-")) {
- } else {
- StringBuilder stringBuilder = new StringBuilder(manifest.getWaybillnomaster());
+ } else {
+ StringBuilder stringBuilder = new StringBuilder(manifest.getWaybillnomaster());
- StringBuilder waybill = stringBuilder.insert(3, "-");
+ StringBuilder waybill = stringBuilder.insert(3, "-");
- manifest.setWaybillnomaster(waybill.toString());
+ manifest.setWaybillnomaster(waybill.toString());
- }
+ }
- manifest.setDe_size("");
+ manifest.setDe_size("");
- String flightno = manifest.getFlightno();
- String carrier = "";
- if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
- carrier = flightno.substring(0, 2);
- flightno = flightno.replace(carrier, "");
- }
- manifest.setCarrier(carrier);
- manifest.setFlightno(flightno);
+ String flightno = manifest.getFlightno();
+ String carrier = "";
+ // 拆分 承运人航班号 CV0000
+ if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
+ carrier = flightno.substring(0, 2);
+ flightno = flightno.replace(carrier, "");
+ }
+ manifest.setCarrier(carrier);
+ manifest.setFlightno(flightno);
+
+
+ // 判断主单是否存在
+ 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");
+ manifest.setStowagedate(ManifestEntity.getStowagedate(stowagedate));
+ // 保存
+ manifest.setIsdelete(1);
+ manifest.setResponse_code(String.valueOf(type.getValue()));
+ manifest.setResponse_text(type.getName());
+ manifest.setSave_time(System.currentTimeMillis());
+
+ manifestService.save(manifest);
+
+ model.setData(manifest);
+ model.setStatus(200);
+ model.setMsg(HttpJsonMsg.SUCCESS);
+ }
+ }else {
+ PreparesecondaryEntity pe = new PreparesecondaryEntity();
- // manifest.setUSER_ID(Tools.getUserId());
- ManifestEntity wbm = manifestService.findWbm(manifest.getWaybillnomaster());
- if (wbm != null) {
- model.setStatus(201);
- model.setMsg("该订单号已存在！");
- } else {
- WaybillReceiptType type = WaybillReceiptType.TEMP_SAVE;
+ pe.setWaybillnomaster(manifest.getWaybillnomaster());
+ pe.setWaybillnosecondary(manifest.getDe_volume());
+ pe.setDe_type(manifest.getDe_type());
+ pe.setDelivery_station(manifest.getDelivery_station());
- String stowagedate = request.getParameter("stowagedate");
- manifest.setStowagedate(ManifestEntity.getStowagedate(stowagedate));
- // 保存
- manifest.setIsdelete(1);
- manifest.setResponse_code(String.valueOf(type.getValue()));
- manifest.setResponse_text(type.getName());
- manifest.setSave_time(System.currentTimeMillis());
+ String flightno = manifest.getFlightno();
+ String carrier = "";
+ // 拆分 承运人航班号 CV0000
+ if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
+ carrier = flightno.substring(0, 2);
+ flightno = flightno.replace(carrier, "");
+ }
+ pe.setCarrier(carrier);
+ pe.setFlightno(flightno);
+ pe.setFlightdate(manifest.getFlightdate());
+ pe.setOriginatingstation(manifest.getOriginatingstation());
+ pe.setDestinationstation(manifest.getDestinationstation());
+ pe.setTotalpiece(manifest.getTotalpiece());
+ pe.setTotalweight(manifest.getTotalweight());
+ pe.setPaymode(manifest.getPaymode());
+ pe.setCustomsstatus(manifest.getCustomsstatus());
+ pe.setCustomscode(manifest.getCustomscode());
+ pe.setName_ofgoods(manifest.getName_ofgoods());
+ pe.setCo_company(manifest.getCo_company());
+ pe.setCo_address(manifest.getCo_address());
+ pe.setShpcusid(manifest.getShpcusid());
+
+ if (StringUtils.isNotBlank(manifest.getCo_telephone())){
+ pe.setCo_telephone(manifest.getCo_telephone());
+ }else {
+ pe.setCo_telephone("");
+ }
+ pe.setCo_country(manifest.getCo_country());
+ pe.setSh_company(manifest.getSh_company());
+ pe.setSh_address(manifest.getSh_address());
+ pe.setCnecusid(manifest.getCnecusid());
+ pe.setSh_country(manifest.getSh_country());
+
+ if (StringUtils.isNotBlank(manifest.getSh_telephone())){
+ pe.setSh_telephone(manifest.getSh_telephone());
+ }else {
+ pe.setSh_telephone("");
+ }
- manifestService.save(manifest);
+ pe.setSh_city(manifest.getSh_city());
+ pe.setUSER_ID(manifest.getUSER_ID());
+ pe.setReach_station(manifest.getReach_station());
+ preparesecondaryServer.save(pe);
model.setData(manifest);
model.setStatus(200);
model.setMsg(HttpJsonMsg.SUCCESS);
-
-
}
+
}
}else{
model.setStatus(202);
- model.setMsg("缺少验证密码");
+ model.setMsg("验证码错误");
}
} catch (Exception e) {
model.setStatus(500);