|
...
|
...
|
@@ -5,10 +5,10 @@ import com.tianbo.analysis.dao.PREPARESECONDARYMapper; |
|
|
|
import com.tianbo.analysis.model.CustomReception;
|
|
|
|
import com.tianbo.analysis.model.PREPAREMASTER;
|
|
|
|
import com.tianbo.analysis.model.PREPARESECONDARY;
|
|
|
|
import com.tianbo.analysis.service.NmmsBaseService;
|
|
|
|
import com.tianbo.analysis.service.PREPAREMASTERService;
|
|
|
|
import com.tianbo.util.Date.DateUtil;
|
|
|
|
import com.tianbo.analysis.tools.AWBTools;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
...
|
...
|
@@ -21,7 +21,7 @@ import java.util.List; |
|
|
|
*/
|
|
|
|
@Service
|
|
|
|
@Slf4j
|
|
|
|
public class PREPAREMASTERServiceImp implements PREPAREMASTERService {
|
|
|
|
public class PREPAREMASTERServiceImp extends NmmsBaseService implements PREPAREMASTERService {
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
PREPAREMASTERMapper preparemasterMapper;
|
|
...
|
...
|
@@ -33,49 +33,25 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { |
|
|
|
// 货物接收运抵主分单
|
|
|
|
public int insertRecept(CustomReception customReception) {
|
|
|
|
|
|
|
|
return super.insertRecept(customReception);
|
|
|
|
}
|
|
|
|
|
|
|
|
ShareServiceImp shareServiceImp = new ShareServiceImp();
|
|
|
|
// 发送日志 插入
|
|
|
|
CoustomAnalysisServiceImp coustomAnalysisServiceImp = new CoustomAnalysisServiceImp();
|
|
|
|
|
|
|
|
// 主单号
|
|
|
|
String awbA = customReception.getWayBillMaster();
|
|
|
|
String awbH = customReception.getWayBillSecond();
|
|
|
|
//回执内容
|
|
|
|
String reception = customReception.getResponseText();
|
|
|
|
String flightDateStr = customReception.getFlightDate();
|
|
|
|
if (!StringUtils.isEmpty(flightDateStr)) {
|
|
|
|
Date flightDate = DateUtil.formatByyyyyMMdd(flightDateStr);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* 入库分单回执信息
|
|
|
|
* @return 成功返回1，失败返回0。
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
public int second() {
|
|
|
|
// 设置 接收运抵分单 回执
|
|
|
|
PREPARESECONDARY preparesecondary = new PREPARESECONDARY();
|
|
|
|
preparesecondary.setReceiptinformation(reception);
|
|
|
|
|
|
|
|
//设置主单回执、航班号、航班日期
|
|
|
|
PREPAREMASTER preparemaster = new PREPAREMASTER();
|
|
|
|
preparemaster.setReceiptinformation(reception);
|
|
|
|
preparemaster.setFlightno(customReception.getFlightNo());
|
|
|
|
preparemaster.setFlightdate(flightDate);
|
|
|
|
|
|
|
|
if (awbA!=null && awbA.length()>0){
|
|
|
|
StringBuffer stringBuffer = new StringBuffer(awbA);
|
|
|
|
stringBuffer.insert(3,"-");
|
|
|
|
awbA = stringBuffer.toString();
|
|
|
|
|
|
|
|
//设置主分单的 主单号
|
|
|
|
preparesecondary.setWaybillnomaster(awbA);
|
|
|
|
preparemaster.setWaybillnomaster(awbA);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 判断航班号 航班日期 是否为空
|
|
|
|
if (flightDate != null && customReception.getFlightNo() != null){
|
|
|
|
//有分单号 更新分单
|
|
|
|
if(awbA!=null && awbA.length()>0 && awbH!=null && awbH.length()> 0){
|
|
|
|
//取分单号
|
|
|
|
//取分单号
|
|
|
|
String[] awbhArr = awbH.split("_");
|
|
|
|
String awbh = awbhArr[1];
|
|
|
|
preparesecondary.setWaybillnosecondary(awbh);
|
|
|
|
preparesecondary.setStatus(nmsStatusCode);
|
|
|
|
//更新分单回执
|
|
|
|
int i = preparesecondaryMapper.updateRECEIPTION(preparesecondary);
|
|
|
|
//获取分单autoid
|
|
...
|
...
|
@@ -85,18 +61,36 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { |
|
|
|
String autoId = preparesecondary1.getAutoid();
|
|
|
|
//插入sendlog记录表
|
|
|
|
log.info("即将插入日志运单号为:"+awbH+"->autoid="+autoId);
|
|
|
|
int ii = coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
|
|
|
|
int ii = coustomAnalysisServiceImp.insertSendlog(customReception.getMessageType(),reception,autoId);
|
|
|
|
|
|
|
|
int iii = shareServiceImp.updateMessages(customReception);
|
|
|
|
if (i>0 && ii>0 && iii > 0){
|
|
|
|
if (i>0 && ii>0){
|
|
|
|
log.info("运单号 {} 原始回执更新成功",awbH);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (iii > 0){
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//处理主单格式，将海关回执的主单号58019316861，变为580-19316861
|
|
|
|
if (awbA!=null && awbA.length()>0){
|
|
|
|
/**
|
|
|
|
* 入库分单回执信息
|
|
|
|
* @return 成功返回1，失败返回0。
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
public int master() {
|
|
|
|
//设置主单回执、航班号、航班日期
|
|
|
|
PREPAREMASTER preparemaster = new PREPAREMASTER();
|
|
|
|
preparemaster.setReceiptinformation(reception);
|
|
|
|
String[] flightInfo = AWBTools.splitFlight(customReception.getFlightNo());
|
|
|
|
preparemaster.setFlightno(flightInfo[1]);
|
|
|
|
preparemaster.setCarrier(flightInfo[0]);
|
|
|
|
preparemaster.setFlightdate(flightDate);
|
|
|
|
preparemaster.setWaybillnomaster(awbA);
|
|
|
|
preparemaster.setStatus(nmsStatusCode);
|
|
|
|
//更新主单回执
|
|
|
|
int i = preparemasterMapper.updateRECEIPTION(preparemaster);
|
|
|
|
//获取分单autoid
|
|
...
|
...
|
@@ -107,24 +101,17 @@ public class PREPAREMASTERServiceImp implements PREPAREMASTERService { |
|
|
|
|
|
|
|
//插入sendlog记录表
|
|
|
|
log.info("即将插入日志运单号为:"+awbA+"->autoid="+autoId);
|
|
|
|
int ii =coustomAnalysisServiceImp.insertSendlog("MT3201",reception,autoId);
|
|
|
|
int ii =coustomAnalysisServiceImp.insertSendlog(customReception.getMessageType(),reception,autoId);
|
|
|
|
|
|
|
|
int iii = shareServiceImp.updateMessages(customReception);
|
|
|
|
if (i>0 && ii>0 && iii > 0){
|
|
|
|
if (i>0 && ii>0){
|
|
|
|
log.info("运单号 {} 原始回执更新成功",awbA);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (iii > 0){
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}else {
|
|
|
|
|
|
|
|
|
|
|
|
return shareServiceImp.share("MT2201", customReception);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//未进入主分单解析 返回0 失败
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} |
...
|
...
|
|
