|
|
|
|
@ -12,19 +12,19 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
|
|
import com.fasterxml.jackson.databind.json.JsonMapper; |
|
|
|
|
import com.logpm.factory.comfac.dto.*; |
|
|
|
|
import com.logpm.factory.mt.dto.*; |
|
|
|
|
import com.logpm.factory.mt.service.IMtFactoryDataService; |
|
|
|
|
import com.logpm.factory.mt.service.IMtFactoryOrderMainService; |
|
|
|
|
import com.logpm.factory.mt.service.IMtFactoryOrderService; |
|
|
|
|
import com.logpm.factory.mt.service.IMtPackageInfoService; |
|
|
|
|
import com.logpm.factory.mt.entity.MtFactoryOrder; |
|
|
|
|
import com.logpm.factory.mt.entity.MtFactoryOrderMain; |
|
|
|
|
import com.logpm.factory.mt.entity.MtOrderLogEntity; |
|
|
|
|
import com.logpm.factory.mt.entity.MtPackageInfo; |
|
|
|
|
import com.logpm.factory.mt.service.*; |
|
|
|
|
import com.logpm.factory.props.MtFactoryProperties; |
|
|
|
|
import com.logpm.factory.snm.bean.Resp; |
|
|
|
|
import com.logpm.factory.snm.entity.MtFactoryOrder; |
|
|
|
|
import com.logpm.factory.snm.entity.MtFactoryOrderMain; |
|
|
|
|
import com.logpm.factory.snm.entity.MtPackageInfo; |
|
|
|
|
|
|
|
|
|
import com.logpm.oldproject.entity.NewDistributionContactEntity; |
|
|
|
|
import com.logpm.oldproject.feign.IAdvanceDetailClient; |
|
|
|
|
import com.logpm.oldproject.feign.INewDistributionContactClient; |
|
|
|
|
import com.logpm.oldproject.feign.IWarehouseClient; |
|
|
|
|
import io.swagger.models.auth.In; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.slf4j.Logger; |
|
|
|
|
@ -38,7 +38,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
import java.nio.charset.StandardCharsets; |
|
|
|
|
import java.security.NoSuchAlgorithmException; |
|
|
|
|
import java.text.DateFormat; |
|
|
|
|
import java.text.ParseException; |
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
|
@ -61,6 +60,8 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
|
|
|
|
|
private final INewDistributionContactClient newDistributionContactClient; |
|
|
|
|
|
|
|
|
|
private final IMtOrderLogService mtOrderLogService; |
|
|
|
|
|
|
|
|
|
@Transactional |
|
|
|
|
@Override |
|
|
|
|
public R dealWithData(MtFactoryDataDTO mtFactoryDataDTO) { |
|
|
|
|
@ -283,10 +284,11 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException, JsonProcessingException, NoSuchAlgorithmException { |
|
|
|
|
logger.info("#############handleStatusData: orderStatusDTO={}",orderStatusDTO); |
|
|
|
|
|
|
|
|
|
String status = orderStatusDTO.getStatus(); |
|
|
|
|
String orderNo = orderStatusDTO.getOrderNo(); |
|
|
|
|
if("2".equals(status)||"3".equals(status)||"5".equals(status)||"6".equals(status)||"7".equals(status)||"8".equals(status)||"9".equals(status)){ |
|
|
|
|
if("1".equals(status)||"2".equals(status)||"3".equals(status)||"5".equals(status)||"6".equals(status)||"7".equals(status)||"8".equals(status)||"9".equals(status)){ |
|
|
|
|
logger.info("#############handleStatusData: 当前数据的状态不推送 status={}",status); |
|
|
|
|
return Resp.fail(400,"当前数据的状态不推送"); |
|
|
|
|
} |
|
|
|
|
@ -295,13 +297,20 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
//继续判断是否到达目的仓
|
|
|
|
|
String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
|
|
|
|
|
//查询destinationWarehouse logiBillNo plantId数据
|
|
|
|
|
logger.info("#############tag{}",1); |
|
|
|
|
|
|
|
|
|
Map<String,String> supplyData = advanceDetailClient.getSupplyData(orderStatusDTO.getUnitNo()); |
|
|
|
|
logger.info("#############tag{}",2); |
|
|
|
|
String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id
|
|
|
|
|
logger.info("#############tag{}",3); |
|
|
|
|
if(StringUtil.isBlank(currentWarehouseId)||StringUtil.isBlank(destinationWarehouseId)){ |
|
|
|
|
logger.info("#############tag{}",4); |
|
|
|
|
log.warn("##############dealWithDataHandler: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}",currentWarehouseId,destinationWarehouseId); |
|
|
|
|
throw new CustomerException(400,"仓库数据有误"); |
|
|
|
|
}else{ |
|
|
|
|
logger.info("#############tag{}",5); |
|
|
|
|
if(!currentWarehouseId.equals(destinationWarehouseId)){ |
|
|
|
|
logger.info("#############tag{}",6); |
|
|
|
|
log.info("##############dealWithDataHandler: 不用处理的状态 currentWarehouseId={} destinationWarehouseId={}",currentWarehouseId,destinationWarehouseId); |
|
|
|
|
throw new CustomerException(400,"仓库数据有误"); |
|
|
|
|
} |
|
|
|
|
@ -313,6 +322,8 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
QueryWrapper<MtPackageInfo> packageInfoQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
packageInfoQueryWrapper.eq("package_code",unitNo); |
|
|
|
|
MtPackageInfo one = mtPackageInfoService.getOne(packageInfoQueryWrapper); |
|
|
|
|
logger.info("#############one: {}",one); |
|
|
|
|
|
|
|
|
|
if(Objects.isNull(one)){ |
|
|
|
|
logger.info("#############handleStatusData: 当前包条码未找到对应数据unitNo={}",unitNo); |
|
|
|
|
return Resp.fail(400,"未找到包件数据"); |
|
|
|
|
@ -343,38 +354,8 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
|
|
|
|
|
String s = objectMapper.writeValueAsString(mtOrderStatusDTO); |
|
|
|
|
|
|
|
|
|
//先获取token
|
|
|
|
|
String token = getMtToken(); |
|
|
|
|
|
|
|
|
|
//请求参数
|
|
|
|
|
logger.info("##############handleStatusData: 推送包件状态请求参数 {}",s); |
|
|
|
|
return sendMtFactoryData(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/ShouHuoRuKu",s,1); |
|
|
|
|
|
|
|
|
|
//处理逻辑
|
|
|
|
|
String result = HttpRequest.post(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/ShouHuoRuKu") |
|
|
|
|
.header("APPKEY",mtFactoryProperties.getAppkey()) |
|
|
|
|
.header("Authorization",token) |
|
|
|
|
.header("USERID",mtFactoryProperties.getUserid()) |
|
|
|
|
.header("USERPWD",MD5Utils.md5Hex(mtFactoryProperties.getUserpwd().getBytes(StandardCharsets.UTF_8))) |
|
|
|
|
.header("Content-Type","application/json") |
|
|
|
|
.body(s).timeout(5 * 1000) |
|
|
|
|
.execute().body(); |
|
|
|
|
|
|
|
|
|
logger.info("##############handleStatusData: 推送包件状态返回参数 {}",result); |
|
|
|
|
|
|
|
|
|
//把结果字符串转为json对象
|
|
|
|
|
JSONObject jsonObject = JSONObject.parseObject(result); |
|
|
|
|
if(!Objects.isNull(jsonObject)){ |
|
|
|
|
Integer code = jsonObject.getInteger("Result"); |
|
|
|
|
String message = jsonObject.getString("Message"); |
|
|
|
|
if(code.equals(0)){ |
|
|
|
|
logger.info("##########handleStatusData: 物流状态传递成功"); |
|
|
|
|
}else{ |
|
|
|
|
return Resp.fail(405,message); |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
return Resp.fail(405,"返回格式有误："+result); |
|
|
|
|
} |
|
|
|
|
return Resp.success("SUCCESS"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -449,39 +430,9 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
|
|
|
|
|
String s = objectMapper.writeValueAsString(mtReceiveDTO); |
|
|
|
|
|
|
|
|
|
//推送数据到梦天
|
|
|
|
|
//先获取token
|
|
|
|
|
String token = getMtToken(); |
|
|
|
|
|
|
|
|
|
//请求参数
|
|
|
|
|
logger.info("##############sendReceiveInfo: 推送包件状态请求参数 {}",s); |
|
|
|
|
|
|
|
|
|
//处理逻辑
|
|
|
|
|
String result = HttpRequest.post(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/QianShouDan") |
|
|
|
|
.header("APPKEY",mtFactoryProperties.getAppkey()) |
|
|
|
|
.header("Authorization",token) |
|
|
|
|
.header("USERID",mtFactoryProperties.getUserid()) |
|
|
|
|
.header("USERPWD",MD5Utils.md5Hex(mtFactoryProperties.getUserpwd().getBytes(StandardCharsets.UTF_8))) |
|
|
|
|
.header("Content-Type","application/json") |
|
|
|
|
.body(s).timeout(5 * 1000) |
|
|
|
|
.execute().body(); |
|
|
|
|
|
|
|
|
|
logger.info("##############sendReceiveInfo: 推送包件状态返回参数 {}",result); |
|
|
|
|
return sendMtFactoryData(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/QianShouDan",s,5); |
|
|
|
|
|
|
|
|
|
//把结果字符串转为json对象
|
|
|
|
|
JSONObject jsonObject = JSONObject.parseObject(result); |
|
|
|
|
if(!Objects.isNull(jsonObject)){ |
|
|
|
|
Integer code = jsonObject.getInteger("Result"); |
|
|
|
|
String message = jsonObject.getString("Message"); |
|
|
|
|
if(code.equals(0)){ |
|
|
|
|
logger.info("##########sendReceiveInfo: 物流状态传递成功"); |
|
|
|
|
}else{ |
|
|
|
|
return Resp.fail(405,message); |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
return Resp.fail(405,"返回格式有误："+result); |
|
|
|
|
} |
|
|
|
|
return R.success("处理签收数据完成"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -497,31 +448,49 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
String s = objectMapper.writeValueAsString(unLoadCarNumDTO); |
|
|
|
|
|
|
|
|
|
//推送数据到梦天
|
|
|
|
|
//先获取token
|
|
|
|
|
String token = getMtToken(); |
|
|
|
|
|
|
|
|
|
//请求参数
|
|
|
|
|
logger.info("##############sendReceiveInfo: 推送包件状态请求参数 {}",s); |
|
|
|
|
return sendMtFactoryData(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/QueRenShouHuo",s,4); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 封装梦天数据对接接口 |
|
|
|
|
* @param url |
|
|
|
|
* @param data |
|
|
|
|
* @return |
|
|
|
|
* @throws NoSuchAlgorithmException |
|
|
|
|
*/ |
|
|
|
|
private R sendMtFactoryData(String url, String data, Integer type) throws NoSuchAlgorithmException { |
|
|
|
|
//先获取token
|
|
|
|
|
String token = getMtToken(); |
|
|
|
|
//处理逻辑
|
|
|
|
|
String result = HttpRequest.post(mtFactoryProperties.getUrl()+"/ZXCFaHuoDan/QueRenShouHuo") |
|
|
|
|
String result = HttpRequest.post(url) |
|
|
|
|
.header("APPKEY",mtFactoryProperties.getAppkey()) |
|
|
|
|
.header("Authorization",token) |
|
|
|
|
.header("USERID",mtFactoryProperties.getUserid()) |
|
|
|
|
.header("USERPWD",MD5Utils.md5Hex(mtFactoryProperties.getUserpwd().getBytes(StandardCharsets.UTF_8))) |
|
|
|
|
.header("Content-Type","application/json") |
|
|
|
|
.body(s).timeout(5 * 1000) |
|
|
|
|
.body(data).timeout(5 * 1000) |
|
|
|
|
.execute().body(); |
|
|
|
|
|
|
|
|
|
logger.info("##############sendReceiveInfo: 车次作业确认完成 {}",result); |
|
|
|
|
logger.info("##############sendMtFactoryData: {}",result); |
|
|
|
|
// 保存数据到数据库
|
|
|
|
|
MtOrderLogEntity mtOrderLogEntity = new MtOrderLogEntity(); |
|
|
|
|
mtOrderLogEntity.setReqArgs(data); |
|
|
|
|
mtOrderLogEntity.setResBody(result); |
|
|
|
|
mtOrderLogEntity.setType(type); |
|
|
|
|
mtOrderLogService.save(mtOrderLogEntity); |
|
|
|
|
|
|
|
|
|
//把结果字符串转为json对象
|
|
|
|
|
JSONObject jsonObject = JSONObject.parseObject(result); |
|
|
|
|
|
|
|
|
|
if(!Objects.isNull(jsonObject)){ |
|
|
|
|
Integer code = jsonObject.getInteger("Result"); |
|
|
|
|
String message = jsonObject.getString("Message"); |
|
|
|
|
if(code.equals(0)){ |
|
|
|
|
logger.info("##########sendReceiveInfo: 物流状态传递成功"); |
|
|
|
|
logger.info("##########sendMtFactoryData: 物流状态传递成功"); |
|
|
|
|
return Resp.success("物流状态传递成功"); |
|
|
|
|
}else{ |
|
|
|
|
return Resp.fail(405,message); |
|
|
|
|
} |
|
|
|
|
@ -530,9 +499,6 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return R.success("处理签收数据完成"); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
pref_mail@163.com
2 years ago