feature:山能易行接口对接

release
gaorl 2 years ago
parent f63ba685d2
commit 006d324675
  1. 1
      order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java
  2. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  3. 8
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java
  4. 27
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java
  5. BIN
      order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx
  6. BIN
      order-management-consumer/src/main/resources/download/OrderExcel.xlsx
  7. BIN
      order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx

@ -407,6 +407,7 @@ public enum OrderInfoEnum {
SYS_SOURCE_DSXT("DSXT","DSXT"),
SYS_SOURCE_DSXT01("DSXT01","DSXT01"),
SYS_SOURCE_DSXT02("DSXT02","DSXT02"),
SYS_SOURCE_SNYXX("SNYXX","SNYXX"),
/**
* 订单类型0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据

@ -444,6 +444,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
Map map = Maps.newHashMap();
map.put("ec-key",baseServiceConfig.getEcKey());
result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map);
} else if (OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isNotBlank(pushInfo.getByzd1())
&& pushInfo.getByzd1().equals(orderProcessInfo.getXtly())) {
result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword());
}
} else {
result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap);

@ -23,6 +23,10 @@ public class FpkjReqSap {
* 数据来源
*/
private String ZSJLY;
/**
* 山能易行系统来源
*/
private String ZSNYX;
/**
* 操作状态
*/
@ -39,6 +43,10 @@ public class FpkjReqSap {
* 购方编码
*/
private String ZGFBH;
/**
* 开票类型
*/
private String ZKPLX;
/**
* 不含税金额(SAP)
*/

@ -64,6 +64,7 @@ import org.springframework.beans.BeanUtils;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author 杨士勇
@ -3537,6 +3538,9 @@ public class BeanTransitionUtils {
if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){
ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL());
}
if(StringUtils.isNotBlank(req.getZSNYX())){
ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey());
}
ddtxxBO.setGSDM(req.getBUKRS());
ddtxxBO.setENTID(deptEntity.getDeptId());
ddtxxBO.setBHZT(ConfigureConstant.STRING_0);
@ -3630,9 +3634,26 @@ public class BeanTransitionUtils {
ddtxxBO.setHJSE("0");
}
}
ddzxxBO.setDDTXX(ddtxxBO);
ddzxxBO.setDDMXXX(ddmxList);
ddzxxList.add(ddzxxBO);
//如果是山能易行按照物料编码分组拆分订单
if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){
Map<String, List<DdmxxxBO>> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM()));
for (int i = 0; i < collect.size(); i++) {
DdzxxBO ddzxxBONew = new DdzxxBO();
DdtxxBO ddtxxBONew = new DdtxxBO();
List<DdmxxxBO> ddmxLists = new ArrayList<>();
BeanUtils.copyProperties(ddtxxBO,ddtxxBONew);
ddmxLists.addAll(collect.get(i));
ddzxxBONew.setDDTXX(ddtxxBO);
ddzxxBONew.setDDMXXX(ddmxList);
ddzxxList.add(ddzxxBONew);
}
}else{
ddzxxBO.setDDTXX(ddtxxBO);
ddzxxBO.setDDMXXX(ddmxList);
ddzxxList.add(ddzxxBO);
}
ddpcxxReqBO.setDDPCXX(ddpcxxBO);
ddpcxxReqBO.setDDZXX(ddzxxList);
log.info("转换后的DdpcxxReqBO:{}", JSONObject.toJSONString(ddpcxxReqBO));

Loading…
Cancel
Save