luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature：客户信息导入、物料引用税率取值不对、影响系统接口对接

Browse Source
release
gaorl 2 years ago
parent 73145eaab8
commit 63ad14c4e7
10 changed files with 244 additions and 132 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java
  2. 4
      order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
  3. 27
      order-management-common/src/main/java/com/dxhy/order/model/OutputInvoiceRequest.java
  4. 196
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  5. 20
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
  6. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java
  7. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java
  8. 91
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
  9. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java
  10. 18
      order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java

2
order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/dao/CommodityMapper.java
Unescape View File

@ -42,7 +42,7 @@ public interface CommodityMapper {
CommodityCodeEntity queryByCommodityXmmc(@Param("xmmc") String xmmc, @Param("xhfNsrsbh") String xhfNsrsbh); CommodityCodeEntity queryByCommodityXmmc(@Param("xmmc") String xmmc, @Param("xhfNsrsbh") String xhfNsrsbh);
List<CommodityCodeEntity> queryByCommodityXmmcCompany(@Param("xmmc") String xmmc); List<CommodityCodeEntity> queryByCommoditySpbmCompany(@Param("spbm") String spbm);
/** /**
* 修改商品信息 * 修改商品信息

4
order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
Unescape View File

@ -1167,12 +1167,12 @@
and cc.xhf_nsrsbh = #{xhfNsrsbh} limit 1 and cc.xhf_nsrsbh = #{xhfNsrsbh} limit 1
</select> </select>
<select id="queryByCommodityXmmcCompany" parameterType="map" resultMap="commodityCodeResultMap"> <select id="queryByCommoditySpbmCompany" parameterType="map" resultMap="commodityCodeResultMap">
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM FROM
commodity_code cc commodity_code cc
WHERE cc.merchandise_name like concat("%",#{xmmc},"%") WHERE cc.encoding = =#{spbm}
</select> </select>

27
order-management-common/src/main/java/com/dxhy/order/model/OutputInvoiceRequest.java
Unescape View File

@ -0,0 +1,27 @@
package com.dxhy.order.model;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Description：大象销项入参
* @Date 2023-04-10
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class OutputInvoiceRequest {
private String billNum;//报账单号
private String companyCode;//公司代码
private List<InvoiceInfo> invoiceList;//新增发票列表
private List<InvoiceInfo> deleteList;//删除发票列表
}

196
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
Unescape View File

@ -401,7 +401,12 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
//按照接口类型获取对应的报文数据 //按照接口类型获取对应的报文数据
//推送影像系统 //推送影像系统
String content = getPushContent(fpTsMqData, pushInfo, shList); String content = getPushContent(fpTsMqData, pushInfo, shList);
//sendImageSys(content,"",""); try {
//推送影像系统
sendImageSys(content);
} catch (Exception e) {
e.printStackTrace();
}
if (StrUtil.isBlank(content)) { if (StrUtil.isBlank(content)) {
log.warn("税号:{},组装请求报文为空,不进行推送数据", fpTsMqData.getNsrsbh()); log.warn("税号:{},组装请求报文为空,不进行推送数据", fpTsMqData.getNsrsbh());
continue; continue;
@ -574,103 +579,126 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
return r; return r;
} }
private SNInvoice buildSNInvoice(String content){ private void sendImageSys(String content){
DdfpzxxV5 ddfpzxxV5 = JsonUtils.getInstance().parseObject(content.substring(1,content.length()-1), DdfpzxxV5.class);
DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX(); OutputInvoiceRequest outputInvoiceRequest = buildInvoiceRequest(content);
JdctxxV5 jdctxx = ddfpzxxV5.getJDCTXX(); if(outputInvoiceRequest.getInvoiceList() != null && outputInvoiceRequest.getInvoiceList().size() > 0){
List<DdmxxxV5> ddmxxx = ddfpzxxV5.getDDMXXX(); String fplxdm = outputInvoiceRequest.getInvoiceList().get(0).getInvoiceType();
List<SNInvoiceDetail> invoiceLineList = new ArrayList<>(); boolean b = OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(fplxdm)
SNInvoice invoice = new SNInvoice(); || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(fplxdm)
invoice.setInvoiceType(convertToSapType(ddfpxx.getFPLXDM())); || OrderInfoEnum.ORDER_INVOICE_TYPE_026.getKey().equals(fplxdm)
invoice.setInvoiceCode(ddfpxx.getFPDM()); || OrderInfoEnum.ORDER_INVOICE_TYPE_028.getKey().equals(fplxdm);
invoice.setInvoiceNumber(ddfpxx.getFPHM()); if(!b){
invoice.setBillingDate(ddfpxx.getKPRQ()); log.info("发票号码：{}为非电票不推送影像查验",outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber());
invoice.setPurchaserName(ddfpxx.getGMFMC()); return;
invoice.setPurchaserTaxNo(ddfpxx.getGMFSBH()); }
invoice.setPurchaserBank(ddfpxx.getGMFYH()+ddfpxx.getGMFZH());
invoice.setPurchaserAddressPhone(ddfpxx.getGMFDZ()+ddfpxx.getGMFDH());
invoice.setSalesName(ddfpxx.getXHFMC());
invoice.setSalesTaxNo(ddfpxx.getXHFSBH());
invoice.setSalesAddressPhone(ddfpxx.getXHFDZ()+ddfpxx.getXHFDH());
invoice.setSalesBank(ddfpxx.getXHFYH()+ddfpxx.getXHFZH());
invoice.setTotalAmount(ddfpxx.getHJJE());
invoice.setTotalTax(ddfpxx.getHJSE());
invoice.setAmountTax(ddfpxx.getJSHJ());
invoice.setCheckCode(ddfpxx.getJYM());
String state = "0";
if(StringUtils.isNotBlank(ddfpxx.getZFBZ())){
state = "1";
}
if(StringUtils.isNotBlank(ddfpxx.getCHBZ())){
state = "2";
}
invoice.setState(state);//发票状态（0-正常1-作废2-红冲3-失控4-异常）
invoice.setRemarks(ddfpxx.getBZ());
for (DdmxxxV5 ddmxxxV5 : ddmxxx) {
SNInvoiceDetail snInvoiceDetail = new SNInvoiceDetail();
snInvoiceDetail.setRowNo(ddmxxxV5.getXH());
snInvoiceDetail.setCommodityCode(ddmxxxV5.getSPBM());
snInvoiceDetail.setCommodityName(ddmxxxV5.getXMMC());
snInvoiceDetail.setSpecificationModel(ddmxxxV5.getGGXH());
snInvoiceDetail.setUnit(ddmxxxV5.getDW());
snInvoiceDetail.setQuantity(ddmxxxV5.getSPSL());
snInvoiceDetail.setUnitPrice(ddmxxxV5.getDJ());
snInvoiceDetail.setAmount(ddmxxxV5.getJE());
snInvoiceDetail.setTax(ddmxxxV5.getSE());
snInvoiceDetail.setTaxRate(ddmxxxV5.getSL());
invoiceLineList.add(snInvoiceDetail);
} }
invoice.setInvoiceLineList(invoiceLineList);
return invoice;
}
private void sendImageSys(String content,String imageId,String compCode){
JSONObject request = new JSONObject();
List<SAPInvoiceInfo> sapInvoiceInfos = new ArrayList<>();
SNSAPObject object = new SNSAPObject();
SNInvoice invoice = buildSNInvoice(content);
object.setSYSID("FPXT");
object.setIFYWID("FI845");
object.setBSKEY(UUID.randomUUID().toString().replace("-", ""));
object.setSAPKEY("");
object.setZORG("公司代码");
object.setZFILED1("");
object.setZFILED2("");
object.setZFILED3("");
object.setZFILED4("");
object.setZFILED5(invoiceConfig.getEnvironment());
SAPInvoiceInfo info = convertToSapOnject(invoice, imageId, compCode);
sapInvoiceInfos.add(info);
object.setZDATA(JSONObject.toJSONString(sapInvoiceInfos));
request.put("IS_INPUT", object);
try { try {
HttpUtils.pushCheckResultToSAP(request.toJSONString(),invoiceConfig.getSnYxUrl(),invoiceConfig.getSapUserName(),invoiceConfig.getSapPassword()); String md5Encode = MD5.getMd5Encode(invoiceConfig.getSapSalt() + outputInvoiceRequest.getBillNum());
Map<String, String> headerMap = Maps.newHashMap();
headerMap.put("Authorization",md5Encode);
log.info("调用影像查验接口，调用地址：{}，请求头：{}，请求参数：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),JSONObject.toJSONString(outputInvoiceRequest));
String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body();
log.info("调用影像查验接口返回参数：{}",body);
JSONObject jsonObject = JSONObject.parseObject(body);
String status = jsonObject.getString("status");//200 成功、 500 失败
String message = jsonObject.getString("message");
String data = jsonObject.getString("data");
//暂时不保存状态
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
private String convertToSapType(String invoiceType) {
private OutputInvoiceRequest buildInvoiceRequest(String content){
DdfpzxxV5 ddfpzxxV5 = JsonUtils.getInstance().parseObject(content.substring(1,content.length()-1), DdfpzxxV5.class);
DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX();
String fplxdm = ddfpxx.getFPLXDM();
List<InvoiceInfo> invoiceList = new ArrayList<>();
List<InvoiceInfo> invalidList = new ArrayList<>();
OutputInvoiceRequest invoiceRequest = new OutputInvoiceRequest();
invoiceRequest.setBillNum(ddfpxx.getBillNum());
invoiceRequest.setCompanyCode(ddfpxx.getCompanyCode());
if("1".equals(ddfpxx.getZFBZ())){
InvoiceInfo invalidInfo = new InvoiceInfo();
invalidInfo.setInvoiceType(convertToSapType(ddfpxx.getFPLXDM()));
invalidInfo.setInvoiceCode(ddfpxx.getFPDM());
invalidInfo.setInvoiceNumber(ddfpxx.getFPHM());
invalidList.add(invalidInfo);
invoiceList.clear();
invoiceRequest.setDeleteList(invalidList);
}else {
InvoiceInfo invoiceInfo = new InvoiceInfo();
invoiceInfo.setInvoiceType(convertToSapType(ddfpxx.getFPLXDM()));
invoiceInfo.setInvoiceCode(ddfpxx.getFPDM());
invoiceInfo.setInvoiceNumber(ddfpxx.getFPHM());
invoiceInfo.setFileName(ddfpxx.getFileName());
invoiceInfo.setPdfOrImg(ddfpxx.getZJLLX());
invoiceInfo.setFileByte(ddfpxx.getPDFZJL());
invoiceInfo.setBillingDate(ddfpxx.getKPRQ());
invoiceInfo.setPurchaserName(ddfpxx.getGMFMC());
invoiceInfo.setPurchaserTaxNo(ddfpxx.getGMFSBH());
invoiceInfo.setPurchaserAddressPhone(String.format("%s%s",StringUtils.isNotBlank(ddfpxx.getGMFDZ())?ddfpxx.getGMFDZ():"",StringUtils.isNotBlank(ddfpxx.getGMFDH())?ddfpxx.getGMFDH():""));
invoiceInfo.setPurchaserBank(String.format("%s%s",StringUtils.isNotBlank(ddfpxx.getGMFYH())?ddfpxx.getGMFYH():"",StringUtils.isNotBlank(ddfpxx.getGMFZH())?ddfpxx.getGMFZH():""));
invoiceInfo.setSalesName(ddfpxx.getXHFMC());
invoiceInfo.setSalesTaxNo(ddfpxx.getXHFSBH());
invoiceInfo.setSalesAddressPhone(ddfpxx.getXHFDZ()+ddfpxx.getXHFDH());
invoiceInfo.setSalesBank(ddfpxx.getXHFYH()+ddfpxx.getXHFZH());
invoiceInfo.setTotalAmount(ddfpxx.getHJJE());
invoiceInfo.setTotalTax(ddfpxx.getHJSE());
invoiceInfo.setAmountTax(ddfpxx.getJSHJ());
invoiceInfo.setCheckCode(StringUtils.isNotBlank(ddfpxx.getJYM())?ddfpxx.getJYM():"");
// String state = "1".equals(ddfpxx.getZFBZ()) ? "1" : "1".equals(ddfpxx.getCHBZ()) ? "2" : "0";
invoiceInfo.setState("0");
invoiceInfo.setRemarks(StringUtils.isNotBlank(ddfpxx.getBZ())?ddfpxx.getBZ():"");
//invoiceInfo.setSource(ddfpxx.getDDLX());
invoiceInfo.setMachineCode(ddfpxx.getJQBH());
invoiceList.add(invoiceInfo);
invoiceRequest.setInvoiceList(invoiceList);
if(StringUtils.isNotBlank(ddfpxx.getYFPDM())&&StringUtils.isNotBlank(ddfpxx.getFPHM())){
InvoiceInfo invalidInfo = new InvoiceInfo();
invalidInfo.setInvoiceType(convertToSapType(ddfpxx.getYFPLX()));
invalidInfo.setInvoiceCode(ddfpxx.getYFPDM());
invalidInfo.setInvoiceNumber(ddfpxx.getYFPHM());
invalidList.add(invalidInfo);
invoiceRequest.setDeleteList(invalidList);
}
}
return invoiceRequest;
}
private static String convertToSapType(String invoiceType) {
switch (invoiceType) { switch (invoiceType) {
case "0":// 增值税专用发票 case "004":// 增值税专用发票
invoiceType = "01"; invoiceType = "100";
break;
case "007":
invoiceType = "101";
break; break;
case "2": case "026":
invoiceType = "04"; invoiceType = "102";
break; break;
case "51": case "028":
invoiceType = "10"; invoiceType = "121";
break; break;
case "52": case "001":
invoiceType = "08"; invoiceType = "130";
break; break;
case "01": case "002":
invoiceType = "31"; invoiceType = "131";
break; break;
case "02": case "006":
invoiceType = "32"; invoiceType = "105";
break;
case "005":
invoiceType = "104";
break; break;
default: default:
invoiceType = ""; invoiceType = "";
@ -680,6 +708,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
return invoiceType; return invoiceType;
} }
private SAPInvoiceInfo convertToSapOnject(SNInvoice snInvoice, String imageId, String compCode) { private SAPInvoiceInfo convertToSapOnject(SNInvoice snInvoice, String imageId, String compCode) {
//转换时间格式 //转换时间格式

20
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
Unescape View File

@ -129,6 +129,9 @@ public class BuyerController {
// 购货方企业类型 默认值01 企业 // 购货方企业类型 默认值01 企业
buyerEntity.setGhfQylx(OrderInfoEnum.GHF_QYLX_01.getKey()); buyerEntity.setGhfQylx(OrderInfoEnum.GHF_QYLX_01.getKey());
if(StringUtils.isBlank(buyerEntity.getEntId())||StringUtils.isBlank(buyerEntity.getBuyerCode())){
return R.error("请求参数有误");
}
// 购方名称 带中文括号的转换成英文括号 // 购方名称 带中文括号的转换成英文括号
buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true)); buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true));
@ -145,10 +148,21 @@ public class BuyerController {
buyerEntity.setModifyUserId(userId.toString()); buyerEntity.setModifyUserId(userId.toString());
buyerEntity.setCreateUserId(userId.toString()); buyerEntity.setCreateUserId(userId.toString());
} }
buyerEntity.setSyncOrder("0"); buyerEntity.setSynchronizeOrders(false);
if(buyerEntity.getSynchronizeOrders()){ List<BuyerEntityDetail> list = new ArrayList<>();
buyerEntity.setSyncOrder("1"); if(StringUtils.isNotBlank(buyerEntity.getAddress())||StringUtils.isNotBlank(buyerEntity.getPhone())||StringUtils.isNotBlank(buyerEntity.getBankNumber())||StringUtils.isNotBlank(buyerEntity.getBankOfDeposit())){
BuyerEntityDetail buyerEntityDetail = new BuyerEntityDetail();
buyerEntityDetail.setDefaultMark("0");
buyerEntityDetail.setAddress(StringUtils.isNotBlank(buyerEntity.getAddress())?buyerEntity.getAddress():"");
buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():"");
buyerEntityDetail.setBankName(StringUtils.isNotBlank(buyerEntity.getBankOfDeposit())?buyerEntity.getBankOfDeposit():"");
buyerEntityDetail.setBankAccount(StringUtils.isNotBlank(buyerEntity.getBankNumber())?buyerEntity.getBankNumber():"");
buyerEntityDetail.setCreateTime(new Date());
buyerEntityDetail.setUpdateTime(new Date());
list.add(buyerEntityDetail);
buyerEntity.setBuyerEntityDetail(list);
} }
return buyerService.saveOrUpdateBuyerInfo(buyerEntity); return buyerService.saveOrUpdateBuyerInfo(buyerEntity);
} }

12
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java
Unescape View File

@ -326,6 +326,18 @@ public class DdfpxxV5 {
* 字节流类型针对pdfzjl进行处理,OFD和PDF * 字节流类型针对pdfzjl进行处理,OFD和PDF
*/ */
private String ZJLLX; private String ZJLLX;
/**
* 板式文件名
*/
private String fileName;
/**
* 报账单号
*/
private String billNum;
/*
* 公司代码
*/
private String companyCode;
/** /**
* ofd转pdf流文件 * ofd转pdf流文件

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java
Unescape View File

@ -584,7 +584,7 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 {
if (ObjectUtil.isNotEmpty(fileDownLoadList)) { if (ObjectUtil.isNotEmpty(fileDownLoadList)) {
ddfpxx.setPDFZJL(fileDownLoadList.get(0).getFileContent()); ddfpxx.setPDFZJL(fileDownLoadList.get(0).getFileContent());
ddfpxx.setZJLLX(CommonUtils.getZjlLx(fileDownLoadList.get(0).getFileSuffix())); ddfpxx.setZJLLX(CommonUtils.getZjlLx(fileDownLoadList.get(0).getFileSuffix()));
ddfpxx.setFileName(fileDownLoadList.get(0).getFileName());
//新增pop推送pdf逻辑 //新增pop推送pdf逻辑
boolean pushPdf = false; boolean pushPdf = false;
String simsBackQd = simsBackService.getSimsBackQd(orderProcessInfo.getXhfNsrsbh(), orderProcessInfo.getEntId()); String simsBackQd = simsBackService.getSimsBackQd(orderProcessInfo.getXhfNsrsbh(), orderProcessInfo.getEntId());

91
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
Unescape View File

@ -222,30 +222,43 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24()); buyerAddress = buyerAddress.concat(StringUtils.isEmpty(tempMdmGmfxxtbReqBO.getDESC24()) ? "" : tempMdmGmfxxtbReqBO.getDESC24());
buyerEntity.setAddress(buyerAddress); buyerEntity.setAddress(buyerAddress);
List<MdmGmfxxtbMulticodeValuelistBO> valuelistBOS = tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST(); List<MdmGmfxxtbMulticodeValuelistBO> valuelistBOS = tempMdmGmfxxtbReqBO.getMULTICODE().getVALUELIST();
MdmGmfxxtbMulticodeValuelistBO firstValueList = valuelistBOS.get(0); List<BuyerEntityDetail> buyerEntityDetails = new ArrayList<>();
if (firstValueList != null) { if(valuelistBOS != null && valuelistBOS.size() > 0){
buyerEntity.setBankOfDeposit(firstValueList.getDESC3()); MdmGmfxxtbMulticodeValuelistBO firstValueList = valuelistBOS.get(0);
buyerEntity.setBankNumber(firstValueList.getDESC4()); if (firstValueList != null) {
} buyerEntity.setBankOfDeposit(firstValueList.getDESC3());
buyerEntity.setBankNumber(firstValueList.getDESC4());
List<BuyerEntityDetail> buyerEntityDetail = new ArrayList<>(); }
String finalBuyerAddress = buyerAddress; String finalBuyerAddress = buyerAddress;
int i = 0; int i = 0;
for (MdmGmfxxtbMulticodeValuelistBO valuelistBO : valuelistBOS) { for (MdmGmfxxtbMulticodeValuelistBO valuelistBO : valuelistBOS) {
BuyerEntityDetail buyerEntityDetail1 = new BuyerEntityDetail(); BuyerEntityDetail buyerEntityDetail = new BuyerEntityDetail();
buyerEntityDetail1.setDefaultMark("1"); buyerEntityDetail.setDefaultMark("1");
if(i==0){ if(i==0){
buyerEntityDetail1.setDefaultMark("0"); buyerEntityDetail.setDefaultMark("0");
}
buyerEntityDetail.setBankAccount(valuelistBO.getDESC4());
buyerEntityDetail.setBankName(valuelistBO.getDESC3());
buyerEntityDetail.setPhone(tempMdmGmfxxtbReqBO.getDESC27());
buyerEntityDetail.setAddress(finalBuyerAddress);
buyerEntityDetail.setBuyerManageId(buyerEntity.getId());
buyerEntityDetails.add(buyerEntityDetail);
i++;
} }
buyerEntityDetail1.setBankAccount(valuelistBO.getDESC4()); }else if(StringUtils.isNotBlank(tempMdmGmfxxtbReqBO.getDESC27())||StringUtils.isNotBlank(buyerAddress)){
buyerEntityDetail1.setBankName(valuelistBO.getDESC3()); BuyerEntityDetail buyerEntityDetail = new BuyerEntityDetail();
buyerEntityDetail1.setPhone(tempMdmGmfxxtbReqBO.getDESC27()); buyerEntityDetail.setDefaultMark("0");
buyerEntityDetail1.setAddress(finalBuyerAddress); buyerEntityDetail.setBuyerManageId(buyerEntity.getId());
buyerEntityDetail1.setBuyerManageId(buyerEntity.getId()); buyerEntityDetail.setAddress(StringUtils.isNotBlank(buyerEntity.getAddress())?buyerEntity.getAddress():"");
buyerEntityDetail.add(buyerEntityDetail1); buyerEntityDetail.setPhone(StringUtils.isNotBlank(buyerEntity.getPhone())?buyerEntity.getPhone():"");
i++; buyerEntityDetail.setBankName("");
buyerEntityDetail.setBankAccount("");
buyerEntityDetail.setCreateTime(new Date());
buyerEntityDetail.setUpdateTime(new Date());
buyerEntityDetails.add(buyerEntityDetail);
} }
buyerEntity.setBuyerEntityDetail(buyerEntityDetail); buyerEntity.setBuyerEntityDetail(buyerEntityDetails);
} }
} }
@ -275,7 +288,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
// 先查找物料分类编码和税收分类编码对应的字段 // 先查找物料分类编码和税收分类编码对应的字段
// 1.先去所有子公司库中匹配税编，以第一条为准；如果未匹配到，再去根据物料编码匹配 // 1.先去所有子公司库中匹配税编，以第一条为准；如果未匹配到，再去根据物料编码匹配
CommodityCodeEntity codeEntityForMatch = new CommodityCodeEntity(); CommodityCodeEntity codeEntityForMatch = new CommodityCodeEntity();
List<CommodityCodeEntity> commodityCodeEntities = commodityMapper.queryByCommodityXmmcCompany(reqBO.getDESC1()); List<CommodityCodeEntity> commodityCodeEntities = commodityMapper.queryByCommoditySpbmCompany(reqBO.getCODE());
if(commodityCodeEntities != null && commodityCodeEntities.size() > 0){ if(commodityCodeEntities != null && commodityCodeEntities.size() > 0){
commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码 commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
commodityCodeEntity.setXmdw(reqBO.getDESC5()); commodityCodeEntity.setXmdw(reqBO.getDESC5());
@ -285,6 +298,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE()); commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME()); commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
commodityCodeEntity.setDataSource("4"); commodityCodeEntity.setDataSource("4");
matchCommodityCode(commodityCodeEntity);
List<String> ids = commodityCodeEntities.stream().map(t -> t.getId()).collect(Collectors.toList()); List<String> ids = commodityCodeEntities.stream().map(t -> t.getId()).collect(Collectors.toList());
commodityMapper.batchUpdateCommodity(commodityCodeEntity,ids); commodityMapper.batchUpdateCommodity(commodityCodeEntity,ids);
}else{ }else{
@ -363,7 +377,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
String xmmc = commodityCodeEntity.getXmmc(); String xmmc = commodityCodeEntity.getXmmc();
CommodityCodeEntity codeEntityForMatch = groupCommodityCodeMapper.queryCommodityCodeByXmmcInChildCompany(xmmc); CommodityCodeEntity codeEntityForMatch = groupCommodityCodeMapper.queryCommodityCodeByXmmcInChildCompany(xmmc);
if (codeEntityForMatch != null) { if (codeEntityForMatch != null) {
// 查找原codeEntity // 查找原codeEntityR
BeanUtils.copyProperties(codeEntityForMatch, commodityCodeEntity); BeanUtils.copyProperties(codeEntityForMatch, commodityCodeEntity);
commodityCodeEntity.setXhfNsrsbh("-1"); commodityCodeEntity.setXhfNsrsbh("-1");
commodityCodeEntity.setHsbz("1"); commodityCodeEntity.setHsbz("1");
@ -373,19 +387,26 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
SdenergyTaxCodeMatch taxCodeMatch = sdenergyTaxCodeMatchDao.queryByWlflbm(commodityCodeEntity.getWlflbm()); SdenergyTaxCodeMatch taxCodeMatch = sdenergyTaxCodeMatchDao.queryByWlflbm(commodityCodeEntity.getWlflbm());
if (taxCodeMatch != null && StringUtils.isNotBlank(taxCodeMatch.getSsflbm())) { if (taxCodeMatch != null && StringUtils.isNotBlank(taxCodeMatch.getSsflbm())) {
// 如果匹配到了物料分类编码，去查一下税收分类编码找到对应的简称等信息 // 如果匹配到了物料分类编码，去查一下税收分类编码找到对应的简称等信息
TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(taxCodeMatch.getSsflbm()); Map<String, Object> paramMap = new HashMap<>();
commodityCodeEntity.setSpsm(taxClassCodeEntity.getSm()); paramMap.put("parameter", xmmc);
commodityCodeEntity.setSpjm(taxClassCodeEntity.getSpjc()); List<TaxClassCodeEntity> taxClassCodeEntitys = taxClassCodeMapper.selectTaxClassCode(paramMap);
commodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc()); //TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(taxCodeMatch.getSsflbm());
commodityCodeEntity.setYhzcbs(taxClassCodeEntity.getZzstsgl()); if(!CollectionUtils.isEmpty(taxClassCodeEntitys)){
commodityCodeEntity.setHsbz("1"); TaxClassCodeEntity taxClassCodeEntity = taxClassCodeEntitys.get(0);
commodityCodeEntity.setSpsm(taxClassCodeEntity.getSm());
commodityCodeEntity.setSpjm(taxClassCodeEntity.getSpjc());
commodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc());
commodityCodeEntity.setYhzcbs(taxClassCodeEntity.getZzstsgl());
commodityCodeEntity.setHsbz("1");
// commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl()); // commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl());
commodityCodeEntity.setYhzcbs("0"); commodityCodeEntity.setYhzcbs("0");
if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) { if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) {
commodityCodeEntity.setYhzcbs("1"); commodityCodeEntity.setYhzcbs("1");
commodityCodeEntity.setZzstsgl(taxClassCodeEntity.getYhzcmc()); commodityCodeEntity.setZzstsgl(taxClassCodeEntity.getYhzcmc());
}
commodityCodeEntity.setSpbm(taxClassCodeEntity.getSpbm());
} }
commodityCodeEntity.setSpbm(taxClassCodeEntity.getSpbm());
commodityCodeEntity.setSsflMc(taxCodeMatch.getSsflmc()); commodityCodeEntity.setSsflMc(taxCodeMatch.getSsflmc());
} }
} }

4
order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java
Unescape View File

@ -39,6 +39,8 @@ public class BeanTransitionV5Utils {
ddfpxxV5.setKPFS(orderProcessInfo.getKpfs()); ddfpxxV5.setKPFS(orderProcessInfo.getKpfs());
ddfpxxV5.setDDLY(orderProcessInfo.getDdly()); ddfpxxV5.setDDLY(orderProcessInfo.getDdly());
ddfpxxV5.setDDLX(orderProcessInfo.getDdlx()); ddfpxxV5.setDDLX(orderProcessInfo.getDdlx());
ddfpxxV5.setBillNum(orderProcessInfo.getBzdh());
ddfpxxV5.setCompanyCode(orderProcessInfo.getGsdm());
return ddfpxxV5; return ddfpxxV5;
} }
@ -104,6 +106,8 @@ public class BeanTransitionV5Utils {
ddfpxxV5.setFWM(StringUtils.isEmpty(orderInvoiceInfo.getFwm()) ? "" : orderInvoiceInfo.getFwm()); ddfpxxV5.setFWM(StringUtils.isEmpty(orderInvoiceInfo.getFwm()) ? "" : orderInvoiceInfo.getFwm());
ddfpxxV5.setPDFZJL(""); ddfpxxV5.setPDFZJL("");
ddfpxxV5.setHZXXBBH(StringUtils.isEmpty(orderInvoiceInfo.getHzxxbbh()) ? "" : orderInvoiceInfo.getHzxxbbh()); ddfpxxV5.setHZXXBBH(StringUtils.isEmpty(orderInvoiceInfo.getHzxxbbh()) ? "" : orderInvoiceInfo.getHzxxbbh());
ddfpxxV5.setZFBZ(StringUtils.isEmpty(orderInvoiceInfo.getZfBz()) ? "" : orderInvoiceInfo.getZfBz());
ddfpxxV5.setCHBZ(StringUtils.isEmpty(orderInvoiceInfo.getChBz()) ? "" : orderInvoiceInfo.getChBz());
} else { } else {
ddfpxxV5.setJQBH(""); ddfpxxV5.setJQBH("");
ddfpxxV5.setFPDM(""); ddfpxxV5.setFPDM("");

18
order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java
Unescape View File

@ -208,17 +208,21 @@ public class InvoiceConfig {
@Value("${order.sys.url}") @Value("${order.sys.url}")
public String sysUrl; public String sysUrl;
@Value("${order.sap.userName}") // @Value("${order.sap.userName}")
private String sapUserName; // private String sapUserName;
//
@Value("${order.sap.password}") // @Value("${order.sap.password}")
private String sapPassword; // private String sapPassword;
@Value("${order.sap.snYxUrl}") @Value("${order.sap.snYxUrl}")
private String snYxUrl; private String snYxUrl;
@Value("${order.sap.environment}") // @Value("${order.sap.environment}")
private String environment; // private String environment;
@Value("${order.sap.salt}")
private String sapSalt;
/** /**
* mqtt相关配置 * mqtt相关配置

Write Preview
Loading…
Cancel
Save