diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java index 5089b77a..a8b4f7c8 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/BuyerService.java @@ -63,7 +63,7 @@ public interface BuyerService { * @param buyerCode * @return */ - BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode); + BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode,String entId); /** * 同步购货方信息 diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index b700b4c8..c8d1a82a 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -296,12 +296,15 @@ public class BuyerServiceImpl implements BuyerService { @Override - public BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode) { + public BuyerEntity queryBuyerInfoByxhfNsrsbhAndBuyerCode(String xhfNsrsbh, String buyerCode,String entId) { log.info("{}根据销方税号:{}和自编ID查询购方信息{}", LOGGER_MSG, xhfNsrsbh, buyerCode); List shList = new ArrayList<>(); - shList.add(xhfNsrsbh); + if(StringUtils.isBlank(entId)){ + shList.add(xhfNsrsbh); + } BuyerEntity buyerEntity = new BuyerEntity(); buyerEntity.setBuyerCode(buyerCode); + buyerEntity.setEntId(entId); List buyerEntities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity, shList); log.info("{}根据销方税号和自编ID查询购方信息结果{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity)); @@ -327,7 +330,7 @@ public class BuyerServiceImpl implements BuyerService { //查询数据库中是否有当前请求信息 List shList = new ArrayList<>(); shList.add(buyerEntity.getXhfNsrsbh()); - BuyerEntity buyerEntityOld = queryBuyerInfoByxhfNsrsbhAndBuyerCode(buyerEntity.getXhfNsrsbh(), buyerEntity.getBuyerCode()); + BuyerEntity buyerEntityOld = queryBuyerInfoByxhfNsrsbhAndBuyerCode(buyerEntity.getXhfNsrsbh(), buyerEntity.getBuyerCode(),null); switch (operationType) { case "0": if (Objects.isNull(buyerEntityOld)) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java index 9aa41f5b..72175910 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java @@ -129,6 +129,7 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService CommodityCodeEntity newCommodityCodeEntity = new CommodityCodeEntity(); try { BeanUtils.copyProperties(newCommodityCodeEntity, commodityCodeEntity); + newCommodityCodeEntity.setEntId(quoteGroupCommodityDTO.getDeptId()); } catch (IllegalAccessException e) { log.error("{}引用物料异常", LOGGER_MSG, e); } catch (InvocationTargetException e) { @@ -143,7 +144,6 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService }else{ newCommodityCodeEntity.setId(baseService.getGenerateShotKey()); newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh()); - newCommodityCodeEntity.setEntId(quoteGroupCommodityDTO.getDeptId()); newCommodityCodeEntity.setDataState("0"); newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc()); newCommodityCodeEntity.setHsbz("1"); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 5d77c2fb..a362fd01 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -173,9 +173,9 @@ public class InvoiceServiceImpl implements InvoiceService { List orderItemInfoList = commonOrderInfo.getOrderItemInfo(); BuyerEntity buyerEntity = null; if (StrUtil.isNotBlank(orderInfo.getGhfId())) { - buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId()); + buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId(),commonOrderInfo.getEntId()); if (ObjectUtil.isNull(buyerEntity)) { - buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId()); + buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId(),null); } } if (ObjectUtil.isNotNull(buyerEntity) && ConfigureConstant.STRING_0.equals(buyerEntity.getStatus())) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 8ed26d11..eb9499d0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -601,7 +601,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { String md5Encode = MD5.getMd5Encode(outputInvoiceRequest.getBillNum() + invoiceConfig.getSapSalt() ); Map headerMap = Maps.newHashMap(); headerMap.put("Authorization",md5Encode); - log.info("call image check request url:{},header:{},parameter:{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),JSONObject.toJSONString(outputInvoiceRequest)); + String param = JSONObject.toJSONString(outputInvoiceRequest); + if(StringUtils.isNotBlank(param) && param.length() > 400){ + param = param.substring(400); + } + log.info("call image check request url:{},header:{},parameter:{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param); String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body(); log.info("call image check return parameter:{}",body); JSONObject jsonObject = JSONObject.parseObject(body); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java index 07b39c2d..5729f8ee 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java @@ -359,7 +359,7 @@ public class ReceiveOrderController { long t3 = System.currentTimeMillis(); log.debug("excel校验开始,当前时间{}", t3); - Map examinByMap = orderExcelReadService.examinByMap(orderExcelMap, xhfNsrsbh, userId, terminalCode, qdfwlx); + Map examinByMap = orderExcelReadService.examinByMap(orderExcelMap, xhfNsrsbh, userId, terminalCode, qdfwlx,entId); long t4 = System.currentTimeMillis(); log.debug("excel校验结束,当前时间{},耗时:{}", t4, t4 - t3); if (!(boolean) examinByMap.get(ConfigureConstant.STRING_IS_PASS)) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderExcelReadService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderExcelReadService.java index 74e4ef41..371ed417 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderExcelReadService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderExcelReadService.java @@ -44,7 +44,7 @@ public interface OrderExcelReadService { * @return */ Map examinByMap(Map> readOrderInfoFromExcelxls, String xhfNsrsbh, - String userId, String terminalCode, String qdfwlx); + String userId, String terminalCode, String qdfwlx,String entId); /** * 导出订单数据 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java index ab2fb6af..62dbf7b2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java @@ -142,7 +142,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { * Map @exception */ private Map examinData(NewOrderExcel orderExcel, NewOrderExcel lastOrderExcel, String xhfNsrsbh, - Set ggxhSet, int itemCount, String userId, String terminalCode) { + Set ggxhSet, int itemCount, String userId, String terminalCode,String entId) { Map resultMap = new HashMap<>(10); boolean isValid = false; List shList = new ArrayList<>(); @@ -259,7 +259,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { //购方编码不为空时,根据购方编码查询购方信息,校验查询的购方信息是否存在 BuyerEntity buyer = null; if (StringUtils.isNotBlank(orderExcel.getGhfId())) { - buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(xhfNsrsbh, orderExcel.getGhfId()); + buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(xhfNsrsbh, orderExcel.getGhfId(),entId); if (Objects.isNull(buyer)) { isValid = true; resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDER_GHFNSRSBH.getCellName(), @@ -1588,7 +1588,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { */ @Override public Map examinByMap(Map> readOrderInfoFromExcelxls, String xhfNsrsbh, - String userId, String terminalCode, String qdfwlx) { + String userId, String terminalCode, String qdfwlx,String entId) { Map resultMap = new HashMap<>(5); List> errorList = new ArrayList<>(); boolean isPass = true; @@ -1649,7 +1649,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { } } else { Map examinData = examinData(newOrderExcel, lastOrderExcel, xhfNsrsbh, - ggxhSet, (i + 1), userId, terminalCode); + ggxhSet, (i + 1), userId, terminalCode,entId); List resultList = (List) examinData.get("resultList"); //验证扣除额是否合法 if (ObjectUtil.isNotNull(newOrderExcel) && StringUtils.isNotBlank(newOrderExcel.getKce())) { @@ -1872,7 +1872,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { if (checkIsBuyerEmpty(orderExcel2CommonOrderInfo)) { if (StringUtils.isNotBlank(value.get(0).getGhfId())) { - BuyerEntity buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(paramMap.get("xhfNsrsbh"), value.get(0).getGhfId()); + BuyerEntity buyer = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(paramMap.get("xhfNsrsbh"), value.get(0).getGhfId(),paramMap.get("entId")); if (buyer != null) { orderExcel2CommonOrderInfo.getOrderInfo().setGhfMc(buyer.getPurchaseName()); orderExcel2CommonOrderInfo.getOrderInfo().setGhfNsrsbh(buyer.getTaxpayerCode()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index ded94c75..f978e628 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -344,9 +344,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { oderDetailInfo.setGhfZh(orderInfo.getGhfZh()); BuyerEntity buyerEntity = null; if (StrUtil.isNotBlank(orderInfo.getGhfId())) { - buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId()); + buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId(),orderProcessInfo.getEntId()); if (ObjectUtil.isNull(buyerEntity)) { - buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId()); + buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId(),null); } } if (ObjectUtil.isNotNull(buyerEntity) && ConfigureConstant.STRING_0.equals(buyerEntity.getStatus())) { @@ -998,7 +998,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { List commonOrderInfoList = new ArrayList<>(); for (PageInvoiceItem pageInvoiceItem : pageInvoiceItems) { - commonOrderInfoList.add(getCommonOrderInfoAll(pageInvoiceItem.getOrderId(), NsrsbhUtils.transShListByNsrsbh(pageInvoiceItem.getXhfNsrsbh()))); + CommonOrderInfo commonOrderInfoAll = getCommonOrderInfoAll(pageInvoiceItem.getOrderId(), NsrsbhUtils.transShListByNsrsbh(pageInvoiceItem.getXhfNsrsbh())); + commonOrderInfoAll.setEntId(pageInvoiceItem.getEntId()); + commonOrderInfoList.add(commonOrderInfoAll); } return commonOrderInfoList; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java index 7db61e65..059a0d66 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java @@ -4207,7 +4207,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder * 购买方编码 */ if (StringUtils.isNotBlank(ddfpxx.getGMFBM())) { - BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM()); + BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpzxx.getDDFPXX().getENTID()); //购方税号 ddfpxx.setGMFSBH(buyerEntity.getTaxpayerCode()); //购方名称 @@ -4652,7 +4652,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) { return checkResultMap; } - BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM()); + BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpxx.getENTID()); if (Objects.isNull(buyerEntity)) { //如果按购买方识别号在数据库中未查询到信息则返回提示信息 return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_GMFMC_ERROR_144136); @@ -4716,7 +4716,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) { return checkResultMap; } - BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM()); + BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpxx.getENTID()); if (Objects.isNull(buyerEntity)) { //如果按购买方识别号在数据库中未查询到信息则返回提示信息 return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_GMFMC_ERROR_144136); @@ -4917,7 +4917,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) { return checkResultMap; } - BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM()); + BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ddfpxx.getXHFSBH(), ddfpxx.getGMFBM(),ddfpxx.getENTID()); if (Objects.isNull(buyerEntity)) { //如果按购买方识别号在数据库中未查询到信息则返回提示信息 return CheckParamUtil.generateErrorMap("", "", OrderInfoContentEnum.INVOICE_HEAD_INFO_GMFMC_ERROR_144136); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index a1f7957d..a64dbab0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -1148,8 +1148,8 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt // zxbm = StringUtils.right(zxbm, 6); // 见下dealOrderItem中 line:550左右注释 commonOrderInfo.getOrderInfo().setGhfId(zxbm); //TODO 这儿最好是使用entid查购方 - BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm); - if (buyerEntity != null && StringUtils.isNotBlank(buyerEntity.getTaxpayerCode())) { + BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm,commonOrderInfo.getOrderInfo().getEntId()); + if (buyerEntity != null ) { //&& StringUtils.isNotBlank(buyerEntity.getTaxpayerCode()) BeanTransitionUtils.transitionOrderBuyerInfo(commonOrderInfo, buyerEntity); }else { log.error("{}补全购方信息异常,根据购方编号未查询到购方或者购方税号为空", LOGGER_MSG); diff --git a/order-management-consumer/src/test/java/com/dxhy/order/consumer/CreatePDF.java b/order-management-consumer/src/test/java/com/dxhy/order/consumer/CreatePDF.java new file mode 100644 index 00000000..d55597a3 --- /dev/null +++ b/order-management-consumer/src/test/java/com/dxhy/order/consumer/CreatePDF.java @@ -0,0 +1,21 @@ +package com.dxhy.order.consumer; + +import org.springframework.util.Base64Utils; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; + +public class CreatePDF { + public static void main(String[] args) { + String context = ""; + byte[] decode = Base64Utils.decode(context.getBytes()); + try { + FileOutputStream fos = new FileOutputStream(new File("D:\\test\\bb.pdf")); + fos.write(decode); + fos.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java index 9a4bfe57..586f952f 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/config/InvoiceConfig.java @@ -205,8 +205,8 @@ public class InvoiceConfig { @Value("${order.opentext.tempPath}") public String openTextTempPath; - @Value("${order.sys.url}") - public String sysUrl; +// @Value("${order.sys.url}") +// public String sysUrl; // @Value("${order.sap.userName}") // private String sapUserName;