java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.修复线上欧派|梦天车次问题

training
pref_mail@163.com 2 years ago
parent
c9bfcb013e
commit
0ba0ff47d0
7 changed files with 282 additions and 240 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
  2. 2
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java
  3. 439
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpSignDataHandler.java
  4. 17
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  5. 1
      blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java
  6. 12
      blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
  7. 4
      blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java

47
blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.factory.comfac.service.impl; package com.logpm.factory.comfac.service.impl;
import cn.hutool.core.util.ArrayUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@ -96,6 +97,11 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
private final IFactoryPackageDetailService factoryPackageDetailService; private final IFactoryPackageDetailService factoryPackageDetailService;
/**
* 目前推送的基地
*/
private String [] jidiCanshu ={"双流基地","无锡基地"};
/** /**
* 处理皮阿诺数据推送到汇通老库 * 处理皮阿诺数据推送到汇通老库
*/ */
@ -147,7 +153,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setSenderMobile(StringUtil.isBlank(panFactoryOrder.getSenderMobile()) ? "" : panFactoryOrder.getSenderMobile());//发货人电话 可以为空 advanceEntity.setSenderMobile(StringUtil.isBlank(panFactoryOrder.getSenderMobile()) ? "" : panFactoryOrder.getSenderMobile());//发货人电话 可以为空
advanceEntity.setSenderAddress(StringUtil.isBlank(panFactoryOrder.getSenderAddress()) ? "" : panFactoryOrder.getSenderAddress()); //发货地址 可以为空 advanceEntity.setSenderAddress(StringUtil.isBlank(panFactoryOrder.getSenderAddress()) ? "" : panFactoryOrder.getSenderAddress()); //发货地址 可以为空
advanceEntity.setSenderName(StringUtil.isBlank(panFactoryOrder.getSendFactory()) ? "" : panFactoryOrder.getSendFactory()); //发货工厂名称 可以为空 advanceEntity.setSenderName(StringUtil.isBlank(panFactoryOrder.getSendFactory()) ? "" : panFactoryOrder.getSendFactory()); //发货工厂名称 可以为空
advanceEntity.setAdministratorsId(1078);// 导入人 advanceEntity.setAdministratorsId(1093);// 导入人
advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCreateTime(initTimestamp()); //添加时间
advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setCarsNum(""); //派车单--snm 可以为空
advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setDeleteTime(0); // 删除时间
@ -221,7 +227,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setDeleteTime(0);//删除时间
advanceDetailEntity.setServiceNum(StringUtil.isBlank(panFactoryOrder.getServiceNum()) ? "" : panFactoryOrder.getServiceNum());//服务号 advanceDetailEntity.setServiceNum(StringUtil.isBlank(panFactoryOrder.getServiceNum()) ? "" : panFactoryOrder.getServiceNum());//服务号
advanceDetailEntity.setAdmin("");// advanceDetailEntity.setAdmin("");//
advanceDetailEntity.setAdministratorsId(0);//导入人 advanceDetailEntity.setAdministratorsId(1126);//导入人
// advanceDetailEntity.setDueDate(0);//交期 // advanceDetailEntity.setDueDate(0);//交期
advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setRemark("");//备注
advanceDetailEntity.setOldId(0);// advanceDetailEntity.setOldId(0);//
@ -250,7 +256,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
detailProductEntity.setDelivernum(Objects.isNull(panPackageList.getQuantity()) ? 0 : panPackageList.getQuantity()); detailProductEntity.setDelivernum(Objects.isNull(panPackageList.getQuantity()) ? 0 : panPackageList.getQuantity());
detailProductEntity.setProducttype(""); detailProductEntity.setProducttype("");
detailProductEntity.setBuyTime(""); detailProductEntity.setBuyTime("");
detailProductEntity.setAdministratorsId(0); detailProductEntity.setAdministratorsId(1126);
detailProductEntity.setDeleteTime(0); detailProductEntity.setDeleteTime(0);
detailProductEntity.setCreateTime(LocalDate.now()); detailProductEntity.setCreateTime(LocalDate.now());
saveList.add(detailProductEntity); saveList.add(detailProductEntity);
@ -401,9 +407,18 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
// 需要从老系统进行订单数据查询 // 需要从老系统进行订单数据查询
AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(factoryOrderEntity.getSelfCode(),carNumber); AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(factoryOrderEntity.getSelfCode(),carNumber);
if (ObjectUtils.isNull(advanceEntity)) { if (ObjectUtils.isNull(advanceEntity)) {
//todo 先阶段值推送老系统的双流和无锡
if(!ArrayUtil.contains(jidiCanshu,receivingOrderEntity.getCurrentWarehouseName())){
log.info("推送老系统失败，当前仓库不是双流和无锡，推送失败 {}",receivingOrderEntity.getCurrentWarehouseName());
continue;
}
advanceEntity = new AdvanceEntity(); advanceEntity = new AdvanceEntity();
advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号 advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号
advanceEntity.setSiteName(""); // 基地 TODO 需要映射 advanceEntity.setSiteName(receivingOrderEntity.getCurrentWarehouseName()); // 基地 TODO 需要映射
advanceEntity.setArea(""); // 区域 advanceEntity.setArea(""); // 区域
advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空 advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空
advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空 advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
@ -434,13 +449,19 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setSenderMobile("");//发货人电话 可以为空 advanceEntity.setSenderMobile("");//发货人电话 可以为空
advanceEntity.setSenderAddress(""); //发货地址 可以为空 advanceEntity.setSenderAddress(""); //发货地址 可以为空
advanceEntity.setSenderName(""); //发货工厂名称 可以为空 advanceEntity.setSenderName(""); //发货工厂名称 可以为空
advanceEntity.setAdministratorsId(1078);// 导入人 advanceEntity.setAdministratorsId(1126);// 导入人
advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCreateTime(initTimestamp()); //添加时间
advanceEntity.setCarsNum(receivingOrderEntity.getCarNumber()); advanceEntity.setCarsNum(receivingOrderEntity.getCarNumber());
advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setDeleteTime(0); // 删除时间
advanceEntity.setWaybillNo("");//运单号 可以为空 advanceEntity.setWaybillNo("");//运单号 可以为空
// Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); // Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId());
advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射 advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射
advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单 advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单
advanceEntity.setOldId(0);// advanceEntity.setOldId(0);//
advanceEntity.setFreeze(Byte.parseByte("1"));//冻结状态：1=正常，2=冻结 advanceEntity.setFreeze(Byte.parseByte("1"));//冻结状态：1=正常，2=冻结
@ -538,7 +559,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setDeleteTime(0);//删除时间
advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号 advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号
advanceDetailEntity.setAdmin("");// advanceDetailEntity.setAdmin("");//
advanceDetailEntity.setAdministratorsId(0);//导入人 advanceDetailEntity.setAdministratorsId(1126);//导入人
advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setRemark("");//备注
advanceDetailEntity.setOldId(0);// advanceDetailEntity.setOldId(0);//
Integer detailId = advanceDetailClient.addAdvanceDetail(advanceDetailEntity); Integer detailId = advanceDetailClient.addAdvanceDetail(advanceDetailEntity);
@ -657,7 +678,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
detailProductEntity.setDelivernum(Objects.isNull(zbPackageInfoEntity.getPlanQty()) ? 0 : zbPackageInfoEntity.getPlanQty()); detailProductEntity.setDelivernum(Objects.isNull(zbPackageInfoEntity.getPlanQty()) ? 0 : zbPackageInfoEntity.getPlanQty());
detailProductEntity.setProducttype(""); detailProductEntity.setProducttype("");
detailProductEntity.setBuyTime(""); detailProductEntity.setBuyTime("");
detailProductEntity.setAdministratorsId(0); detailProductEntity.setAdministratorsId(1126);
detailProductEntity.setDeleteTime(0); detailProductEntity.setDeleteTime(0);
detailProductEntity.setCreateTime(LocalDate.now()); detailProductEntity.setCreateTime(LocalDate.now());
saveList.add(detailProductEntity); saveList.add(detailProductEntity);
@ -697,7 +718,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
detailProductEntity.setDelivernum(1); detailProductEntity.setDelivernum(1);
detailProductEntity.setProducttype(""); detailProductEntity.setProducttype("");
detailProductEntity.setBuyTime(""); detailProductEntity.setBuyTime("");
detailProductEntity.setAdministratorsId(0); detailProductEntity.setAdministratorsId(1126);
detailProductEntity.setDeleteTime(0); detailProductEntity.setDeleteTime(0);
detailProductEntity.setCreateTime(LocalDate.now()); detailProductEntity.setCreateTime(LocalDate.now());
saveList.add(detailProductEntity); saveList.add(detailProductEntity);
@ -781,7 +802,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setDeleteTime(0);//删除时间
advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号 advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号
advanceDetailEntity.setAdmin("");// advanceDetailEntity.setAdmin("");//
advanceDetailEntity.setAdministratorsId(0);//导入人 advanceDetailEntity.setAdministratorsId(1126);//导入人
// advanceDetailEntity.setDueDate(0);//交期 // advanceDetailEntity.setDueDate(0);//交期
advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setRemark("");//备注
advanceDetailEntity.setOldId(0);// advanceDetailEntity.setOldId(0);//
@ -881,8 +902,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setSenderMobile(StringUtil.isBlank(zbReceiptEntity.getSenderMobile()) ? "" : zbReceiptEntity.getSenderMobile());//发货人电话 可以为空 advanceEntity.setSenderMobile(StringUtil.isBlank(zbReceiptEntity.getSenderMobile()) ? "" : zbReceiptEntity.getSenderMobile());//发货人电话 可以为空
advanceEntity.setSenderAddress(StringUtil.isBlank(zbReceiptEntity.getSenderAddress()) ? "" : zbReceiptEntity.getSenderAddress()); //发货地址 可以为空 advanceEntity.setSenderAddress(StringUtil.isBlank(zbReceiptEntity.getSenderAddress()) ? "" : zbReceiptEntity.getSenderAddress()); //发货地址 可以为空
advanceEntity.setSenderName(StringUtil.isBlank(zbReceiptEntity.getSenderName()) ? "" : zbReceiptEntity.getSenderName()); //发货工厂名称 可以为空 advanceEntity.setSenderName(StringUtil.isBlank(zbReceiptEntity.getSenderName()) ? "" : zbReceiptEntity.getSenderName()); //发货工厂名称 可以为空
// todo 需要运营提供 1080为线上测试环境 // todo 需要运营提供 1080为线上测试环境 1126为正式
advanceEntity.setAdministratorsId(1080);// 导入人 advanceEntity.setAdministratorsId(1126);// 导入人
advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCreateTime(initTimestamp()); //添加时间
advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setCarsNum(""); //派车单--snm 可以为空
advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setDeleteTime(0); // 删除时间
@ -1033,7 +1054,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceEntity.setSenderMobile("");//发货人电话 可以为空 advanceEntity.setSenderMobile("");//发货人电话 可以为空
advanceEntity.setSenderAddress(""); //发货地址 可以为空 advanceEntity.setSenderAddress(""); //发货地址 可以为空
advanceEntity.setSenderName(""); //发货工厂名称 可以为空 advanceEntity.setSenderName(""); //发货工厂名称 可以为空
advanceEntity.setAdministratorsId(1078);// 导入人 advanceEntity.setAdministratorsId(1094);// 导入人
advanceEntity.setCreateTime(initTimestamp()); //添加时间 advanceEntity.setCreateTime(initTimestamp()); //添加时间
advanceEntity.setCarsNum(StringUtil.isBlank(mtFactoryOrderMain.getInvoiceOrderCode()) ? "" : mtFactoryOrderMain.getInvoiceOrderCode()); //派车单--snm 可以为空 advanceEntity.setCarsNum(StringUtil.isBlank(mtFactoryOrderMain.getInvoiceOrderCode()) ? "" : mtFactoryOrderMain.getInvoiceOrderCode()); //派车单--snm 可以为空
advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setDeleteTime(0); // 删除时间
@ -1071,7 +1092,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setDeleteTime(0);//删除时间
advanceDetailEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode());//服务号 advanceDetailEntity.setServiceNum(StringUtil.isBlank(mtFactoryOrder.getMainOrderCode()) ? "" : mtFactoryOrder.getMainOrderCode());//服务号
advanceDetailEntity.setAdmin("");// advanceDetailEntity.setAdmin("");//
advanceDetailEntity.setAdministratorsId(0);//导入人 advanceDetailEntity.setAdministratorsId(1094);//导入人
// advanceDetailEntity.setDueDate(0);//交期 // advanceDetailEntity.setDueDate(0);//交期
advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setRemark("");//备注
advanceDetailEntity.setOldId(0);// advanceDetailEntity.setOldId(0);//

2
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryOrderMainServiceImpl.java
Unescape View File

@ -63,7 +63,7 @@ public class MtFactoryOrderMainServiceImpl extends BaseServiceImpl<MtFactoryOrde
@Override @Override
public Boolean beachPush(List<Long> longs, String data) { public Boolean beachPush(List<Long> longs, String data) {
if(StringUtils.isNotEmpty(data)){ if(StringUtils.isEmpty(data)){
data = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); data = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
} }

439
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpSignDataHandler.java
Unescape View File

@ -47,231 +47,246 @@ public class OpSignDataHandler {
public void opSignDataHandler(Map map, Message message, Channel channel) throws IOException { public void opSignDataHandler(Map map, Message message, Channel channel) throws IOException {
// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
log.info("##################opSignDataHandler: 处理欧派收货数据到新系统"); log.info("##################opSignDataHandler: 处理欧派收货数据到新系统");
OpOrderStatusLogEntity opOrderStatusLogEntity = (OpOrderStatusLogEntity) map.get("messageData"); try {
String args = opOrderStatusLogEntity.getArgs(); if (Objects.isNull(map)) {
JSONObject jsonObject = JSONObject.parseObject(args); log.error("##################opSignDataHandler: 处理欧派收货数据到新系统,map为空");
JSONArray jsonArray = jsonObject.getJSONArray("value"); return;
for (int i = 0; i < jsonArray.size(); i++) { }
JSONObject valueObject = jsonArray.getJSONObject(i); // 获取消息id
JSONObject outGoingOrder = valueObject.getJSONObject("OutGoingOrder"); String messageId = message.getMessageProperties().getMessageId();
String outGoingOrderCode = outGoingOrder.getString("Code"); // 获取消息id
JSONObject store = valueObject.getJSONObject("Store"); String messageData = new String(message.getBody());
JSONArray packages = valueObject.getJSONArray("Packages");
String status = outGoingOrder.getString("Status");
//先查询是否已经有数据存在系统中
OpOutGoingOrderEntity opOutGoingOrderEntity = opOutGoingOrderService.getEntityByCode(outGoingOrderCode);
Long outGoingOrderId = null;
if(Objects.isNull(opOutGoingOrderEntity)){
//如果是空则新增
opOutGoingOrderEntity = new OpOutGoingOrderEntity();
opOutGoingOrderEntity.setCode(outGoingOrderCode);
if("新建".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(0);
}else if("已调度".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(1);
}else if("已发运".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(2);
}else if("已签收".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(3);
}else if("部分签收".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(4);
}else if("待处理".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(5);
}
JSONObject warehouse = outGoingOrder.getJSONObject("Warehouse");
if(!Objects.isNull(warehouse)){
opOutGoingOrderEntity.setWarehouseCode(warehouse.getString("Code"));
opOutGoingOrderEntity.setWarehouseName(warehouse.getString("Name"));
opOutGoingOrderEntity.setWarehouseAddress(warehouse.getString("Address"));
}
JSONObject truck = outGoingOrder.getJSONObject("Truck");
if(!Objects.isNull(truck)){
opOutGoingOrderEntity.setTruckPlate(truck.getString("Plate"));
}
opOutGoingOrderEntity.setDeliveryDate(CommonUtil.StringToDateByT(outGoingOrder.getString("DeliveryDate")));
opOutGoingOrderEntity.setCreator(outGoingOrder.getString("Creator"));
opOutGoingOrderEntity.setCreateTime(CommonUtil.StringToDateByT(outGoingOrder.getString("CreateTime")));
if (!Objects.isNull(store)) { OpOrderStatusLogEntity opOrderStatusLogEntity = (OpOrderStatusLogEntity) map.get("messageData");
JSONObject shop = store.getJSONObject("Shop"); String args = opOrderStatusLogEntity.getArgs();
if(!Objects.isNull(shop)){ JSONObject jsonObject = JSONObject.parseObject(args);
opOutGoingOrderEntity.setShopCode(shop.getString("Code")); JSONArray jsonArray = jsonObject.getJSONArray("value");
opOutGoingOrderEntity.setShopName(shop.getString("Name")); for (int i = 0; i < jsonArray.size(); i++) {
JSONObject valueObject = jsonArray.getJSONObject(i);
JSONObject outGoingOrder = valueObject.getJSONObject("OutGoingOrder");
String outGoingOrderCode = outGoingOrder.getString("Code");
JSONObject store = valueObject.getJSONObject("Store");
JSONArray packages = valueObject.getJSONArray("Packages");
String status = outGoingOrder.getString("Status");
//先查询是否已经有数据存在系统中
OpOutGoingOrderEntity opOutGoingOrderEntity = opOutGoingOrderService.getEntityByCode(outGoingOrderCode);
Long outGoingOrderId = null;
if (Objects.isNull(opOutGoingOrderEntity)) {
//如果是空则新增
opOutGoingOrderEntity = new OpOutGoingOrderEntity();
opOutGoingOrderEntity.setCode(outGoingOrderCode);
if ("新建".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(0);
} else if ("已调度".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(1);
} else if ("已发运".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(2);
} else if ("已签收".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(3);
} else if ("部分签收".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(4);
} else if ("待处理".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(5);
} }
opOutGoingOrderEntity.setStoreCode(store.getString("Code")); JSONObject warehouse = outGoingOrder.getJSONObject("Warehouse");
opOutGoingOrderEntity.setStoreName(store.getString("Name")); if (!Objects.isNull(warehouse)) {
} opOutGoingOrderEntity.setWarehouseCode(warehouse.getString("Code"));
opOutGoingOrderEntity.setSendTime(CommonUtil.StringToDateByT(outGoingOrder.getString("SendTime"))); opOutGoingOrderEntity.setWarehouseName(warehouse.getString("Name"));
opOutGoingOrderService.save(opOutGoingOrderEntity); opOutGoingOrderEntity.setWarehouseAddress(warehouse.getString("Address"));
outGoingOrderId = opOutGoingOrderEntity.getId(); }
}else{ JSONObject truck = outGoingOrder.getJSONObject("Truck");
if("新建".equals(status)){ if (!Objects.isNull(truck)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(0); opOutGoingOrderEntity.setTruckPlate(truck.getString("Plate"));
}else if("已调度".equals(status)){ }
opOutGoingOrderEntity.setOutGoingOrderStatus(1); opOutGoingOrderEntity.setDeliveryDate(CommonUtil.StringToDateByT(outGoingOrder.getString("DeliveryDate")));
}else if("已发运".equals(status)){ opOutGoingOrderEntity.setCreator(outGoingOrder.getString("Creator"));
opOutGoingOrderEntity.setOutGoingOrderStatus(2); opOutGoingOrderEntity.setCreateTime(CommonUtil.StringToDateByT(outGoingOrder.getString("CreateTime")));
}else if("已签收".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(3);
}else if("部分签收".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(4);
}else if("待处理".equals(status)){
opOutGoingOrderEntity.setOutGoingOrderStatus(5);
}
opOutGoingOrderService.updateById(opOutGoingOrderEntity);
outGoingOrderId = opOutGoingOrderEntity.getId();
}
//处理签收单数据 if (!Objects.isNull(store)) {
Long signBillId = null; JSONObject shop = store.getJSONObject("Shop");
String recevierCode = valueObject.getString("Code"); if (!Objects.isNull(shop)) {
String SignBillStatus = valueObject.getString("Status"); opOutGoingOrderEntity.setShopCode(shop.getString("Code"));
OpSignBillEntity signBillEntity = opSignBillService.findEntityByCode(recevierCode); opOutGoingOrderEntity.setShopName(shop.getString("Name"));
if(Objects.isNull(signBillEntity)){ }
signBillEntity = new OpSignBillEntity(); opOutGoingOrderEntity.setStoreCode(store.getString("Code"));
signBillEntity.setOutGoingOrderId(outGoingOrderId); opOutGoingOrderEntity.setStoreName(store.getString("Name"));
signBillEntity.setCode(recevierCode);
if("新建".equals(SignBillStatus)){
signBillEntity.setSignBillStatus(0);
}else if("已签收".equals(SignBillStatus)){
signBillEntity.setSignBillStatus(1);
}else if("部分签收".equals(SignBillStatus)){
signBillEntity.setSignBillStatus(2);
}
signBillEntity.setSignPerson(valueObject.getString("SignPerson"));
signBillEntity.setSignPhone(valueObject.getString("SignPhone"));
signBillEntity.setSignAddress(valueObject.getString("SignAddress"));
String da =valueObject.getString("SignTime");
Date signTime = CommonUtil.StringToDateByT(da);
signBillEntity.setSignTime(signTime);
signBillEntity.setRemark(valueObject.getString("Remark"));
signBillEntity.setOutGoingOrderCode(outGoingOrderCode);
signBillEntity.setAgainsendReason(valueObject.getString("AgainsendReason"));
signBillEntity.setDescription(valueObject.getString("Description"));
Boolean isAgainsend = valueObject.getBoolean("IsAgainsend");
if(isAgainsend){
signBillEntity.setIsAgainsend(1);
}else{
signBillEntity.setIsAgainsend(0);
}
signBillEntity.setCreator(valueObject.getString("Creator"));
signBillEntity.setCreateTime(CommonUtil.StringToDateByT(valueObject.getString("CreateTime")));
signBillEntity.setCustomerRate(valueObject.getBigDecimal("CustomerRate"));
signBillEntity.setCustomerFeedback(valueObject.getString("CustomerFeedback"));
if (!Objects.isNull(store)) {
JSONObject shop = store.getJSONObject("Shop");
if(!Objects.isNull(shop)){
signBillEntity.setShopCode(shop.getString("Code"));
signBillEntity.setShopName(shop.getString("Name"));
} }
signBillEntity.setStoreCode(store.getString("Code")); opOutGoingOrderEntity.setSendTime(CommonUtil.StringToDateByT(outGoingOrder.getString("SendTime")));
signBillEntity.setStoreName(store.getString("Name")); opOutGoingOrderService.save(opOutGoingOrderEntity);
} outGoingOrderId = opOutGoingOrderEntity.getId();
signBillEntity.setDriverPhone(valueObject.getString("DriverPhone")); } else {
signBillEntity.setDriverName(valueObject.getString("DriverName")); if ("新建".equals(status)) {
signBillEntity.setDeliveryTime(CommonUtil.StringToDateByT(valueObject.getString("DeliveryTime"))); opOutGoingOrderEntity.setOutGoingOrderStatus(0);
opSignBillService.save(signBillEntity); } else if ("已调度".equals(status)) {
signBillId = signBillEntity.getId(); opOutGoingOrderEntity.setOutGoingOrderStatus(1);
}else{ } else if ("已发运".equals(status)) {
if("新建".equals(SignBillStatus)){ opOutGoingOrderEntity.setOutGoingOrderStatus(2);
signBillEntity.setSignBillStatus(0); } else if ("已签收".equals(status)) {
}else if("已签收".equals(SignBillStatus)){ opOutGoingOrderEntity.setOutGoingOrderStatus(3);
signBillEntity.setSignBillStatus(1); } else if ("部分签收".equals(status)) {
}else if("部分签收".equals(SignBillStatus)){ opOutGoingOrderEntity.setOutGoingOrderStatus(4);
signBillEntity.setSignBillStatus(2); } else if ("待处理".equals(status)) {
opOutGoingOrderEntity.setOutGoingOrderStatus(5);
}
opOutGoingOrderService.updateById(opOutGoingOrderEntity);
outGoingOrderId = opOutGoingOrderEntity.getId();
} }
opSignBillService.updateById(signBillEntity);
signBillId = signBillEntity.getId();
}
//存入包件数据 //处理签收单数据
for (int j = 0; j <packages.size(); j++) { Long signBillId = null;
JSONObject packagesJSONObject = packages.getJSONObject(j); String recevierCode = valueObject.getString("Code");
String code = packagesJSONObject.getString("Code"); String SignBillStatus = valueObject.getString("Status");
String packageStatus = packagesJSONObject.getString("PackageStatus"); OpSignBillEntity signBillEntity = opSignBillService.findEntityByCode(recevierCode);
OpSignPackageEntity signPackageEntity = opSignPackageService.findEntityByOrderPackageCode(code); if (Objects.isNull(signBillEntity)) {
if(Objects.isNull(signPackageEntity)){ signBillEntity = new OpSignBillEntity();
signPackageEntity = new OpSignPackageEntity(); signBillEntity.setOutGoingOrderId(outGoingOrderId);
signPackageEntity.setSignBillId(signBillId); signBillEntity.setCode(recevierCode);
signPackageEntity.setOrderPackageCode(code); if ("新建".equals(SignBillStatus)) {
if ("已调度".equals(packageStatus)) { signBillEntity.setSignBillStatus(0);
signPackageEntity.setPackageStatus(1); } else if ("已签收".equals(SignBillStatus)) {
} else if ("已装车".equals(packageStatus)) { signBillEntity.setSignBillStatus(1);
signPackageEntity.setPackageStatus(2); } else if ("部分签收".equals(SignBillStatus)) {
} else if ("待收货".equals(packageStatus)) { signBillEntity.setSignBillStatus(2);
signPackageEntity.setPackageStatus(3); }
} else if ("已收货".equals(packageStatus)) { signBillEntity.setSignPerson(valueObject.getString("SignPerson"));
signPackageEntity.setPackageStatus(4); signBillEntity.setSignPhone(valueObject.getString("SignPhone"));
} else if ("已在库".equals(packageStatus)) { signBillEntity.setSignAddress(valueObject.getString("SignAddress"));
signPackageEntity.setPackageStatus(5); String da = valueObject.getString("SignTime");
} else if ("待理货".equals(packageStatus)) { Date signTime = CommonUtil.StringToDateByT(da);
signPackageEntity.setPackageStatus(6); signBillEntity.setSignTime(signTime);
} else if ("待上架".equals(packageStatus)) { signBillEntity.setRemark(valueObject.getString("Remark"));
signPackageEntity.setPackageStatus(7); signBillEntity.setOutGoingOrderCode(outGoingOrderCode);
} else if ("已上架".equals(packageStatus)) { signBillEntity.setAgainsendReason(valueObject.getString("AgainsendReason"));
signPackageEntity.setPackageStatus(8); signBillEntity.setDescription(valueObject.getString("Description"));
} else if ("已下架".equals(packageStatus)) { Boolean isAgainsend = valueObject.getBoolean("IsAgainsend");
signPackageEntity.setPackageStatus(9); if (isAgainsend) {
} else if ("已发运".equals(packageStatus)) { signBillEntity.setIsAgainsend(1);
signPackageEntity.setPackageStatus(10);
} else if ("已签收".equals(packageStatus)) {
signPackageEntity.setPackageStatus(11);
} else if ("待返货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(12);
} else if ("已提件".equals(packageStatus)) {
signPackageEntity.setPackageStatus(13);
} else if ("已拒收".equals(packageStatus)) {
signPackageEntity.setPackageStatus(14);
} else if ("异常".equals(packageStatus)) {
signPackageEntity.setPackageStatus(-1);
} else { } else {
signPackageEntity.setPackageStatus(0); signBillEntity.setIsAgainsend(0);
} }
signBillEntity.setCreator(valueObject.getString("Creator"));
Boolean isInventory = packagesJSONObject.getBoolean("IsInventory"); signBillEntity.setCreateTime(CommonUtil.StringToDateByT(valueObject.getString("CreateTime")));
if(isInventory){ signBillEntity.setCustomerRate(valueObject.getBigDecimal("CustomerRate"));
signPackageEntity.setIsInventory(1); signBillEntity.setCustomerFeedback(valueObject.getString("CustomerFeedback"));
}else{ if (!Objects.isNull(store)) {
signPackageEntity.setIsInventory(0); JSONObject shop = store.getJSONObject("Shop");
if (!Objects.isNull(shop)) {
signBillEntity.setShopCode(shop.getString("Code"));
signBillEntity.setShopName(shop.getString("Name"));
}
signBillEntity.setStoreCode(store.getString("Code"));
signBillEntity.setStoreName(store.getString("Name"));
}
signBillEntity.setDriverPhone(valueObject.getString("DriverPhone"));
signBillEntity.setDriverName(valueObject.getString("DriverName"));
signBillEntity.setDeliveryTime(CommonUtil.StringToDateByT(valueObject.getString("DeliveryTime")));
opSignBillService.save(signBillEntity);
signBillId = signBillEntity.getId();
} else {
if ("新建".equals(SignBillStatus)) {
signBillEntity.setSignBillStatus(0);
} else if ("已签收".equals(SignBillStatus)) {
signBillEntity.setSignBillStatus(1);
} else if ("部分签收".equals(SignBillStatus)) {
signBillEntity.setSignBillStatus(2);
} }
opSignPackageService.save(signPackageEntity); opSignBillService.updateById(signBillEntity);
}else{ signBillId = signBillEntity.getId();
if ("已调度".equals(packageStatus)) { }
signPackageEntity.setPackageStatus(1);
} else if ("已装车".equals(packageStatus)) { //存入包件数据
signPackageEntity.setPackageStatus(2); for (int j = 0; j < packages.size(); j++) {
} else if ("待收货".equals(packageStatus)) { JSONObject packagesJSONObject = packages.getJSONObject(j);
signPackageEntity.setPackageStatus(3); String code = packagesJSONObject.getString("Code");
} else if ("已收货".equals(packageStatus)) { String packageStatus = packagesJSONObject.getString("PackageStatus");
signPackageEntity.setPackageStatus(4); OpSignPackageEntity signPackageEntity = opSignPackageService.findEntityByOrderPackageCode(code);
} else if ("已在库".equals(packageStatus)) { if (Objects.isNull(signPackageEntity)) {
signPackageEntity.setPackageStatus(5); signPackageEntity = new OpSignPackageEntity();
} else if ("待理货".equals(packageStatus)) { signPackageEntity.setSignBillId(signBillId);
signPackageEntity.setPackageStatus(6); signPackageEntity.setOrderPackageCode(code);
} else if ("待上架".equals(packageStatus)) { if ("已调度".equals(packageStatus)) {
signPackageEntity.setPackageStatus(7); signPackageEntity.setPackageStatus(1);
} else if ("已上架".equals(packageStatus)) { } else if ("已装车".equals(packageStatus)) {
signPackageEntity.setPackageStatus(8); signPackageEntity.setPackageStatus(2);
} else if ("已下架".equals(packageStatus)) { } else if ("待收货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(9); signPackageEntity.setPackageStatus(3);
} else if ("已发运".equals(packageStatus)) { } else if ("已收货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(10); signPackageEntity.setPackageStatus(4);
} else if ("已签收".equals(packageStatus)) { } else if ("已在库".equals(packageStatus)) {
signPackageEntity.setPackageStatus(11); signPackageEntity.setPackageStatus(5);
} else if ("待返货".equals(packageStatus)) { } else if ("待理货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(12); signPackageEntity.setPackageStatus(6);
} else if ("已提件".equals(packageStatus)) { } else if ("待上架".equals(packageStatus)) {
signPackageEntity.setPackageStatus(13); signPackageEntity.setPackageStatus(7);
} else if ("已拒收".equals(packageStatus)) { } else if ("已上架".equals(packageStatus)) {
signPackageEntity.setPackageStatus(14); signPackageEntity.setPackageStatus(8);
} else if ("异常".equals(packageStatus)) { } else if ("已下架".equals(packageStatus)) {
signPackageEntity.setPackageStatus(-1); signPackageEntity.setPackageStatus(9);
} else if ("已发运".equals(packageStatus)) {
signPackageEntity.setPackageStatus(10);
} else if ("已签收".equals(packageStatus)) {
signPackageEntity.setPackageStatus(11);
} else if ("待返货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(12);
} else if ("已提件".equals(packageStatus)) {
signPackageEntity.setPackageStatus(13);
} else if ("已拒收".equals(packageStatus)) {
signPackageEntity.setPackageStatus(14);
} else if ("异常".equals(packageStatus)) {
signPackageEntity.setPackageStatus(-1);
} else {
signPackageEntity.setPackageStatus(0);
}
Boolean isInventory = packagesJSONObject.getBoolean("IsInventory");
if (isInventory) {
signPackageEntity.setIsInventory(1);
} else {
signPackageEntity.setIsInventory(0);
}
opSignPackageService.save(signPackageEntity);
} else { } else {
signPackageEntity.setPackageStatus(0); if ("已调度".equals(packageStatus)) {
signPackageEntity.setPackageStatus(1);
} else if ("已装车".equals(packageStatus)) {
signPackageEntity.setPackageStatus(2);
} else if ("待收货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(3);
} else if ("已收货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(4);
} else if ("已在库".equals(packageStatus)) {
signPackageEntity.setPackageStatus(5);
} else if ("待理货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(6);
} else if ("待上架".equals(packageStatus)) {
signPackageEntity.setPackageStatus(7);
} else if ("已上架".equals(packageStatus)) {
signPackageEntity.setPackageStatus(8);
} else if ("已下架".equals(packageStatus)) {
signPackageEntity.setPackageStatus(9);
} else if ("已发运".equals(packageStatus)) {
signPackageEntity.setPackageStatus(10);
} else if ("已签收".equals(packageStatus)) {
signPackageEntity.setPackageStatus(11);
} else if ("待返货".equals(packageStatus)) {
signPackageEntity.setPackageStatus(12);
} else if ("已提件".equals(packageStatus)) {
signPackageEntity.setPackageStatus(13);
} else if ("已拒收".equals(packageStatus)) {
signPackageEntity.setPackageStatus(14);
} else if ("异常".equals(packageStatus)) {
signPackageEntity.setPackageStatus(-1);
} else {
signPackageEntity.setPackageStatus(0);
}
opSignPackageService.updateById(signPackageEntity);
} }
opSignPackageService.updateById(signPackageEntity);
} }
} }
} catch (Exception e) {
log.error("opSignDataHandler error {}", e.getMessage());
} }
} }
} }

17
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
Unescape View File

@ -58,10 +58,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
// 对返回i的数据进行处理 按照 发车单-->订单-->包件 完成保存 // 对返回i的数据进行处理 按照 发车单-->订单-->包件 完成保存
handleData(code); handleData(code);
// todo 暂时关闭对老系统的数据推送 需要确认数据的仓库归属后在进行
if (ObjectUtils.isNotNull(code)) { // if (ObjectUtils.isNotNull(code)) {
asyncDataService.handlerOuPaiDataToHt(code); // asyncDataService.handlerOuPaiDataToHt(code);
} // }
return code; return code;
} }
@ -189,7 +189,6 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
map.put("messageData", opOrderStatusLogEntity); map.put("messageData", opOrderStatusLogEntity);
map.put("createTime", new Date().getTime()); map.put("createTime", new Date().getTime());
try { try {
rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map); rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map);
} catch (Exception e) { } catch (Exception e) {
log.error("############handlePackageData: {}", e.getMessage()); log.error("############handlePackageData: {}", e.getMessage());
@ -200,7 +199,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
} }
private OpOrderStatusLogEntity sendRequestData(String url, Integer event) { private OpOrderStatusLogEntity sendRequestData(String url, Integer event) {
log.info("#################sendRequestData: 请求地址 url={}", url); // log.info("#################sendRequestData: 请求地址 url={}", url);
String token = buildToken(); String token = buildToken();
// log.info(">>> Authorization token {}",token); // log.info(">>> Authorization token {}",token);
@ -208,7 +207,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute(); HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute();
String result = httpResponse.body(); String result = httpResponse.body();
log.info("#################sendRequestData: 返回数据 result={}", result); // log.info("#################sendRequestData: 返回数据 result={}", result);
OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity(); OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity();
orderStatusLog.setArgs(result); orderStatusLog.setArgs(result);
@ -567,7 +566,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
"&$expand=SendWarehouse($select=Name,Code)" + "&$expand=SendWarehouse($select=Name,Code)" +
")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)"; ")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)";
log.info(">>> findOurPaiDataByCarNumber url {}", url); // log.info(">>> findOurPaiDataByCarNumber url {}", url);
String token = buildToken(); String token = buildToken();
// log.info(">>> Authorization token {}",token); // log.info(">>> Authorization token {}",token);
@ -575,7 +574,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute(); HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute();
String result = httpResponse.body(); String result = httpResponse.body();
log.info(">>> findOurPaiDataByCarNumber result {}", result); // log.info(">>> findOurPaiDataByCarNumber result {}", result);
OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity(); OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity();
orderStatusLog.setArgs(result); orderStatusLog.setArgs(result);

1
blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java
Unescape View File

@ -17,4 +17,5 @@ public class OuPaiProperties {
private String uri; private String uri;
} }

12
blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
Unescape View File

@ -121,8 +121,16 @@
<select id="getByCarNum" resultType="string" > <select id="getByCarNum" resultType="string" >
SELECT cls.unitNo FROM ht_cars_load_scan cls LEFT JOIN ht_advance_detail ad on ad.unitNo=cls.unitNo WHERE cls.start_cars_no=#{unloadCarNum} and cls.type=0 and ad.type="梦天" SELECT
cls.unitNo
FROM
ht_cars_load_scan cls
LEFT JOIN ht_advance_detail ad ON ad.unitNo = cls.unitNo
LEFT JOIN ht_cars_load hcl on hcl.id=cls.cars_load_id
WHERE
hcl.start_cars_no=#{unloadCarNum}
AND cls.type = 0
AND ad.type = "梦天"
</select> </select>
<select id="findAdvanceDetailEntityByPackageCode" resultMap="advanceDetailResultMap" > <select id="findAdvanceDetailEntityByPackageCode" resultMap="advanceDetailResultMap" >

4
blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java
Unescape View File

@ -81,9 +81,7 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService {
@Override @Override
public List<String> getByCarNum(String unloadCarNum) { public List<String> getByCarNum(String unloadCarNum) {
List<String> ls = advanceDetailMapper.getByCarNum(unloadCarNum); return advanceDetailMapper.getByCarNum(unloadCarNum);
return ls;
} }
@Override @Override

Write Preview
Loading…
Cancel
Save