From 85bbbddb92b0b7389ba828527b2177110f35ff49 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:14:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E7=94=9F=E6=88=90=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E4=B8=8E=E6=9C=80=E6=96=B0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E4=B8=80=E8=87=B4=E3=80=82=E6=9C=AC?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9=E6=B6=89=E5=8F=8A=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=B1=BB=E4=B8=8E=E6=96=B9=E6=B3=95=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=8C=E5=85=B7=E4=BD=93=E5=8C=85=E6=8B=AC=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=81=E4=BF=AE=E6=AD=A3=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=8C=E7=9A=84=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=80=81=E4=BB=A5=E5=8F=8A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3DTO=E7=B1=BB=E3=80=82=E6=AD=A4=E5=A4=96?= =?UTF-8?q?=EF=BC=8C=E8=BF=98=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9U8C?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BB=A5=E7=A1=AE=E4=BF=9D=E6=95=B0=E6=8D=AE=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: 接口`sendU8CPoOrder`方法签名已更改，从`PoOrderHeadBodyDto`返回类型更改为`PoOrderResultDto`。调用此方法的代码需要处理新的返回类型。 --- .../purchase/ProxyPurchaseWarehousOrder.java | 15 +- .../ProxyPurchaseWarehousWarehouse.java | 242 ++++++++----- .../frame/plugin/lets/u8cdto/PoOrderBody.java | 77 ++++ .../frame/plugin/lets/u8cdto/PoOrderHead.java | 60 +++ .../plugin/lets/u8cdto/PoOrderResultDto.java | 14 + .../plugin/lets/u8cdto/PoOrderSonDto.java | 10 + .../lets/u8cdto/PurchaseReceiptHeadDto.java | 341 +----------------- .../ProxyPurchaseWarehousOrderTest.java | 4 +- .../purchase/ProxyPurchaseWarehousTest.java | 2 +- .../ProxyPurchaseWarehousWarehouseTest.java | 31 ++ .../IntegrationTaskLivingDetailsEntity.java | 218 +---------- 11 files changed, 364 insertions(+), 650 deletions(-) create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderBody.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderHead.java create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderResultDto.java create mode 100644 buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index 025f2031..7d3f6de5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -432,26 +432,12 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { for (int j = 0; j < details.size(); j++) { OfsPoOrderDetails ofsPoOrderDetails = details.get(j); -// OfsPoOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(ofsPoOrderDataDetails, stockinB); - - //TODO 测试 -// stockinB.setReceivedQty("1"); -// ofsPoOrderDetail.setFulfillAmount("10"); //2024年8月20日 16:02:21 已经和妮姐、万万确认，采购公司和收货公司目前是一致的，暂时不用区分取数逻辑 BdInvmandocEntity bdInvmandocEntity = queryInventoryMan(ofsPoOrderDetails, bdCorpEntity.getPkCorp()); String receivedQty = ofsPoOrderDetails.getRequestQty();//请求数量 String buyPrice = ofsPoOrderDetails.getDiscountPrice();//实际进价 - //原币含税单价 -// BigDecimal noriginalcurprice = null; -// try { -// noriginalcurprice = new BigDecimal(fulfillAmount).divide(new BigDecimal(receivedQty), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP); -// } catch (Exception e) { -// logger.error("计算采购入库单原币含税单价失败", e); -// Assert.state(false, "计算采购入库单原币含税单价失败 原因：{}", e.getMessage()); -// } - PoOrderChildrenDto poOrderChildrenDto = new PoOrderChildrenDto(); poOrderChildrenDto.setCmangid(bdInvmandocEntity.getPkInvmandoc());//存货管理id poOrderChildrenDto.setNordernum(receivedQty);//订货数量 @@ -463,6 +449,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { // poOrderChildrenDto.setIisreplenish(false);//补货标识 * poOrderChildrenDto.setCoperator(OverallConstant.getOverAllValue("u8cApiZdrPK"));//操作员id // poOrderChildrenDto.setBreceiveplan(false);//存在到货计划 + poOrderChildrenDto.setVdef20(ofsPoOrderDetails.getId());//O采购订单明细行 poOrderChildrenDtoList.add(poOrderChildrenDto); //2024年8月20日 16:00:03 已经和佳妮总确认，计划到货日期，不用进行传递 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java index df82a351..10856c77 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java @@ -32,7 +32,7 @@ import java.math.BigDecimal; import java.util.*; /** - * 代理品牌采购业务：（代理品牌采购）OFS采购入库单生成U8C采购入库单，关联原采购订单 + * 代理品牌采购业务：（代理品牌采购）OFS采购入库单生成U8C采购入库单(关联原采购订单) * * @Author：liuyang * @Package：com.hzya.frame.plugin.lets.plugin.purchase @@ -93,6 +93,12 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { @Autowired private OffsetTimeTime offsetTimeTime; + @Autowired + private IPoOrderDao iPoOrderDao; + + @Autowired + private IPoOrderBDao iPoOrderBDao; + private static final String PROD_FILED = "prod"; @Override @@ -135,7 +141,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { if (ProfilesActiveConstant.TYPE_VBILLCODE.equals(requestJson.get("type"))) { //按单号推送 if (param != null && !"".equals(param)) { - startImplement(param); + startImplementByCode(param); } } else if (ProfilesActiveConstant.TYPE_TIME_FRAME.equals(requestJson.get("type"))) { //前台页面功能日期推送，或者接口调用也行 @@ -147,7 +153,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(PROD_FILED)) { //默认被定时器执行，实时执行，计算时间偏移量 StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime(); - startImplement(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); + startImplementByTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); } } } catch (Exception e) { @@ -159,11 +165,11 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { } /** - * 根据单号查询 + * 根据时间范围查询 * * @author liuyang */ - public void startImplement(String startTime, String endTime) { + public void startImplementByTime(String startTime, String endTime) { long startMillis = System.currentTimeMillis(); String threadNameStrStart = StrUtil.format("开始（代理品牌采购）OFS采购入库单生成U8C采购订单 开始时间：{} 结束时间：{}", startTime, endTime); logger.info(threadNameStrStart); @@ -209,7 +215,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { * * @author liuyang */ - public void startImplement(String code) { + public void startImplementByCode(String code) { long startTime = System.currentTimeMillis(); String threadNameStrStart = StrUtil.format("（代理品牌采购）OFS采购入库单生成U8C采购订单开始 采购入库单号：{}", code); logger.info(threadNameStrStart); @@ -225,7 +231,8 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { queryOfsSoSaleOutVo.setPageSize(50L); queryOfsSoSaleOutVo.setCode(code); queryOfsSoSaleOutVo.setInternalInstructionType("PURCHASE"); - queryOfsSoSaleOutVo.setStatus(900L); + //TODO 测试 +// queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { @@ -393,109 +400,128 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { OfsPoOrderHeader ofsPoOrderDataHeader = ofsPoOrderData.getHeader(); List ofsPoOrderDataDetails = ofsPoOrderData.getDetails(); + PoOrderEntity poOrderEntity = poOrderSonDto.getPoOrderEntity();//U8C采购订单 + List poOrderBEntityList = poOrderSonDto.getPoOrderBEntityList();//U8C采购订单明细 + //采购订单表头 - PoOrderParentDto poOrderParentDto = new PoOrderParentDto(); + PurchaseReceiptHeadDto poOrderParentDto = new PurchaseReceiptHeadDto(); poOrderParentDto.setCbiztype(bdBusitypeEntity.getPkBusitype());//业务流程 - poOrderParentDto.setCdeptid(bdDeptdocEntity.getPkDeptdoc());//采购部门 - poOrderParentDto.setCoperator(OverallConstant.getOverAllValue("u8cApiZdrPK"));//制单人 - poOrderParentDto.setCpurorganization(bdPurorgEntity.getPkPurorg());//采购组织 + poOrderParentDto.setCdptid(bdDeptdocEntity.getPkDeptdoc());//采购部门 + poOrderParentDto.setCbizid(OverallConstant.getOverAllValue("u8cApiZdrPK"));//制单人 + poOrderParentDto.setCoperatorid(OverallConstant.getOverAllValue("u8cApiZdrPK"));//操作员 poOrderParentDto.setPk_corp(bdCorpEntity.getPkCorp());//采购公司 - poOrderParentDto.setCvendormangid(bdCumandocEntity.getPkCumandoc());//供应商管理档案 - poOrderParentDto.setDauditdate(generateBusinessDate);//审批日期 - poOrderParentDto.setDorderdate(generateBusinessDate);//订单日期 - poOrderParentDto.setDrevisiondate(generateBusinessDate);//修改日期 - //2024年8月21日 13:34:07 对比了手工建单和接口传单，发现接口传单少了这个：是否由销售订单协同生成、补货标志、是否已协同生成销售订单 默认为N - poOrderParentDto.setBsocooptome(false);//是否由销售订单协同生成 - poOrderParentDto.setBisreplenish(false);//补货标志 - poOrderParentDto.setBcooptoso(false);//是否已协同生成销售订单 - poOrderParentDto.setCgiveinvoicevendor(bdCumandocEntity.getPkCumandoc());//发票方id + poOrderParentDto.setCproviderid(bdCumandocEntity.getPkCumandoc());//供应商管理档案 + poOrderParentDto.setDaccountdate(generateBusinessDate);//审批日期 + poOrderParentDto.setDbilldate(generateBusinessDate);//订单日期 + poOrderParentDto.setCwarehouseid(bdStordocEntity.getPkStordoc());//入库仓库 + poOrderParentDto.setFreplenishflag(false);//退货标志(Y/N) + poOrderParentDto.setPk_calbody(bdCalbodyEntity.getPkCalbody());//库存组织 + poOrderParentDto.setCdispatcherid(bdRdclEntity.getPkRdcl());//收发类别 poOrderParentDto.setVdef17(ProfilesActiveConstant.sourceSystem1);//来源系统 poOrderParentDto.setVdef19(poOrderSonDto.getCode());//原单单号 poOrderParentDto.setVdef20(poOrderSonDto.getId());//原单主键 - //收发类别 - poOrderParentDto.setPk_defdoc3(bdRdclEntity.getPkRdcl()); - poOrderParentDto.setVdef3(bdRdclEntity.getRdname()); - - //采购订单明细行 - List poOrderChildrenDtoList = new ArrayList<>(); + //采购入库单明细行 + List purchaseReceiptBodyDtos = new ArrayList<>(); for (int j = 0; j < details.size(); j++) { StockinOrderSearchResponse.StockinOrder.StockinB stockinB = details.get(j); - OfsPoOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(ofsPoOrderDataDetails, stockinB); - //TODO 测试 -// stockinB.setReceivedQty("1"); -// ofsPoOrderDetail.setFulfillAmount("10"); + //OFS采购订单明细行 + OfsPoOrderDetails ofsPoOrderDetail = findOfsPoOrderDetail(ofsPoOrderDataDetails, stockinB); + //U8C采购订单明细行 + PoOrderBEntity poOrderBEntity = findPoOrderBEntity(stockinB, poOrderBEntityList); //2024年8月20日 16:02:21 已经和妮姐、万万确认，采购公司和收货公司目前是一致的，暂时不用区分取数逻辑 BdInvmandocEntity bdInvmandocEntity = queryInventoryMan(stockinB, bdCorpEntity.getPkCorp()); String receivedQty = stockinB.getReceivedQty();//实收数量 - String fulfillAmount = ofsPoOrderDetail.getFulfillAmount();//实收累计总金额 + String discountPrice = ofsPoOrderDetail.getDiscountPrice();//实际进价 - //原币含税单价 + //含税单价 BigDecimal noriginalcurprice = null; + //含税金额=含税单价*数量 + BigDecimal ntaxmny = null; try { - noriginalcurprice = new BigDecimal(fulfillAmount).divide(new BigDecimal(receivedQty), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP); + noriginalcurprice = new BigDecimal(discountPrice); + ntaxmny = noriginalcurprice.multiply(new BigDecimal(receivedQty)).setScale(2, BigDecimal.ROUND_HALF_UP); } catch (Exception e) { logger.error("计算采购入库单原币含税单价失败", e); Assert.state(false, "计算采购入库单原币含税单价失败 原因：{}", e.getMessage()); } - PoOrderChildrenDto poOrderChildrenDto = new PoOrderChildrenDto(); - poOrderChildrenDto.setCmangid(bdInvmandocEntity.getPkInvmandoc());//存货管理id - poOrderChildrenDto.setNordernum(receivedQty);//订货数量 - poOrderChildrenDto.setNorgtaxprice(noriginalcurprice.stripTrailingZeros().toPlainString());//原币含税单价 - poOrderChildrenDto.setPk_arrvcorp(bdCorpEntity.getPkCorp());//收货公司 - poOrderChildrenDto.setPk_arrvstoorg(bdCalbodyEntity.getPkCalbody());//收货库存组织 - poOrderChildrenDto.setCwarehouseid(bdStordocEntity.getPkStordoc());//收货仓库 - poOrderChildrenDto.setPk_reqcorp(bdCorpEntity.getPkCorp());//需求公司 * -// poOrderChildrenDto.setIisreplenish(false);//补货标识 * - poOrderChildrenDto.setCoperator(OverallConstant.getOverAllValue("u8cApiZdrPK"));//操作员id -// poOrderChildrenDto.setBreceiveplan(false);//存在到货计划 - poOrderChildrenDtoList.add(poOrderChildrenDto); + String bsourcelargess = "N"; + if (noriginalcurprice.longValue() == 0) { + bsourcelargess = "Y"; + } - //2024年8月20日 16:00:03 已经和佳妮总确认，计划到货日期，不用进行传递 + PurchaseReceiptBodyDto purchaseReceiptBodyDto = new PurchaseReceiptBodyDto(); + purchaseReceiptBodyDto.setBonroadflag("N");//是否在途 + purchaseReceiptBodyDto.setBsourcelargess(bsourcelargess);//来源是否赠品 + purchaseReceiptBodyDto.setFlargess(bsourcelargess);//是否赠品 + purchaseReceiptBodyDto.setCfirstbillbid(poOrderBEntity.getCorderBid());//源头单据表体ID + purchaseReceiptBodyDto.setCfirstbillhid(poOrderEntity.getCorderid());//源头单据表头ID + purchaseReceiptBodyDto.setCsourcebillbid(poOrderBEntity.getCorderBid());//来源单据表体pk + purchaseReceiptBodyDto.setCsourcebillhid(poOrderEntity.getCorderid());//来源单据表头pk + purchaseReceiptBodyDto.setCfirsttype("21");//源头单据类型 + purchaseReceiptBodyDto.setCsourcetype("21");//来源单据类型 + purchaseReceiptBodyDto.setCinventoryid(bdInvmandocEntity.getPkInvmandoc());//存货id + purchaseReceiptBodyDto.setCvendorid(bdCumandocEntity.getPkCumandoc());//供应商id + purchaseReceiptBodyDto.setDbizdate(generateBusinessDate);//入库日期 + purchaseReceiptBodyDto.setNinnum(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString());//实收数量 + purchaseReceiptBodyDto.setVfirstbillcode(poOrderEntity.getVordercode());//源头单据号 +// purchaseReceiptBodyDto.setNmny(nmny.stripTrailingZeros().toPlainString());// ？？？ 这个金额是如何计算的，和前台的计算逻辑不一样，接口按单价（无税单价）*数量、 +// purchaseReceiptBodyDto.setNprice(nprice.stripTrailingZeros().toPlainString());//单价=无税单价=含税单价/(1+税率) + purchaseReceiptBodyDto.setNshouldinnum(new BigDecimal(poOrderBEntity.getNordernum()).stripTrailingZeros().toPlainString());//应入数量=采购订单上的采购数量 + purchaseReceiptBodyDto.setNtaxmny(ntaxmny.stripTrailingZeros().toPlainString());//含税金额=含税单价*数量 + purchaseReceiptBodyDto.setNtaxprice(noriginalcurprice.stripTrailingZeros().toPlainString());//含税单价=旺店通税后价格 + purchaseReceiptBodyDto.setPk_reqcorp(poOrderBEntity.getPkReqcorp());//需求公司:取采购单明细的收货公司 + purchaseReceiptBodyDto.setVsourcebillcode(poOrderEntity.getVordercode());//来源单据号 + purchaseReceiptBodyDto.setVsourcerowno(poOrderBEntity.getCrowno());//来源单据行号 + purchaseReceiptBodyDto.setBbarcodeclose("N"); + purchaseReceiptBodyDto.setBtoouttoiaflag("N"); + purchaseReceiptBodyDto.setCcurrencytypeid("00010000000000000001");//币种 + purchaseReceiptBodyDto.setPk_invoicecorp(poOrderEntity.getPkCorp());//开票公司：取采购单表头的采购公司 + purchaseReceiptBodyDto.setPk_reqstoorg(poOrderBEntityList.get(0).getPkArrvstoorg());//需求库存组织 + purchaseReceiptBodyDto.setPk_corp(poOrderEntity.getPkCorp());//公司=收货公司 + purchaseReceiptBodyDtos.add(purchaseReceiptBodyDto); } - List poOrderParentChildrenDtoList = new ArrayList<>(); - PoOrderParentChildrenDto poOrderParentChildrenDto = new PoOrderParentChildrenDto(); - poOrderParentChildrenDto.setParentvo(poOrderParentDto); - poOrderParentChildrenDto.setChildrenvo(poOrderChildrenDtoList); - poOrderParentChildrenDtoList.add(poOrderParentChildrenDto); + List purchaseReceiptDtoArrayList = new ArrayList<>(); - Map> stringStringMap = new HashMap<>(); - stringStringMap.put("puordervo", poOrderParentChildrenDtoList); - PoOrderHeadBodyDto poOrderHeadBodyDto = sendU8CPoOrder(JSON.toJSONString(stringStringMap)); + PurchaseReceiptDto purchaseReceiptDto = new PurchaseReceiptDto(); + purchaseReceiptDto.setParentvo(poOrderParentDto); + purchaseReceiptDto.setChildrenvo(purchaseReceiptBodyDtos); + purchaseReceiptDtoArrayList.add(purchaseReceiptDto); - String corderid = null; - String vordercode = null; - PoOrderHeadDto parentvo = poOrderHeadBodyDto.getParentvo(); - List childrenvo = poOrderHeadBodyDto.getChildrenvo(); + Map> stringStringMap = new HashMap<>(); + stringStringMap.put("GeneralBillVO", purchaseReceiptDtoArrayList); + PoOrderResultDto poOrderResultDto = sendU8CPoOrder(JSON.toJSONString(stringStringMap)); + + String cgeneralhid = null; + String vbillcode = null; + PoOrderHead parentvo = poOrderResultDto.getParentvo(); if (parentvo != null) { - corderid = parentvo.getCorderid(); + cgeneralhid = parentvo.getCgeneralhid(); + vbillcode = parentvo.getVbillcode(); } - if (childrenvo != null) { - vordercode = parentvo.getVordercode(); - } - logger.info("推送U8C代理品牌采购订单采购！U8C采购订单主键：{} U8C采购订单编码：{}", corderid, vordercode); + logger.info("推送U8C代理品牌采购入库单成功！U8C采购订单主键：{} U8C采购订单编码：{}", cgeneralhid, vbillcode); // 成功记录日志 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y); integrationTaskLivingDetailsEntity.setRootAppNewData(JSON.toJSONString(poOrderSonDto));//原始数据json - integrationTaskLivingDetailsEntity.setNewTransmitInfo(JSON.toJSONString(poOrderHeadBodyDto));//返回结果 + integrationTaskLivingDetailsEntity.setNewTransmitInfo(JSON.toJSONString(poOrderResultDto));//返回结果 integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(generateBusinessDate); integrationTaskLivingDetailsEntity.setRootAppPk(poOrderSonDto.getId()); integrationTaskLivingDetailsEntity.setRootAppBill(poOrderSonDto.getCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); - integrationTaskLivingDetailsEntity.setNewSystemNumber(vordercode);//下游单据编码 - integrationTaskLivingDetailsEntity.setNewSystemPrimary(corderid);//下游单据主键 + integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillcode);//下游单据编码 + integrationTaskLivingDetailsEntity.setNewSystemPrimary(cgeneralhid);//下游单据主键 saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); } catch (Exception e) { - logger.error("推送U8C代理品牌采购订单采购失败", e); + logger.error("推送U8C代理品牌采购入库单失败", e); // 失败记录日志 String message = e.getMessage(); @@ -565,7 +591,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { } //采购部门：其他 - String deptName = "其他部门"; + String deptName = "业务部门"; BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDr(0); @@ -594,6 +620,8 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { //2024年8月20日 14:47:55 丽知商城、OFS 供应商客商档案、传递到U8C的客商， //其中自定义项1作为原系统编码，因此统一传到自定义项一，已经和大家确认好了，没有关系的，放心大胆传吧，宝贝 String shipFromCode = header.getShipFromCode(); + //TODO 测试 + shipFromCode = "dy-off"; Assert.notNull(shipFromCode, "O供应商编码不能为空，没有办法完成业务逻辑，请配置供应商编码(采购)"); Assert.state(!"".equals(shipFromCode.trim()), "O供应商编码不能为空，没有办法完成业务逻辑，请配置供应商编码(采购)！"); BdCubasdocEntity bdCubasdocEntity = new BdCubasdocEntity(); @@ -648,6 +676,29 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { Assert.state(false, "根据O仓库编码+U8C收货库存组织主键，匹配到U8C仓库多个", facilityCode, bdCalbodyEntities.get(0).getPkCalbody()); } + //查询对应的U8C采购订单 + PoOrderEntity poOrderEntity = new PoOrderEntity(); + poOrderEntity.setDr(0L); + poOrderEntity.setVdef19(header.getRefOrderCode()); + poOrderEntity.setVdef20(header.getRefOrderId()); + poOrderEntity.setDataSourceCode("lets_u8c"); + List poOrderEntityList = iPoOrderDao.query(poOrderEntity); + if (poOrderEntityList == null || poOrderEntityList.size() == 0) { + Assert.state(false, "无法匹配到U8C采购订单 原单单号：{} 原单主键：{}", header.getRefOrderCode(), header.getRefOrderId()); + } else if (poOrderEntityList.size() >= 2) { + Assert.state(false, "匹配到{}个U8C采购订单，存在歧义！ 原单单号：{} 原单主键：{}", poOrderEntityList.size(), header.getRefOrderCode(), header.getRefOrderId()); + } + + //查询对应的U8C采购订单明细行 + PoOrderBEntity poOrderBEntity = new PoOrderBEntity(); + poOrderBEntity.setDr(0L); + poOrderBEntity.setCorderid(poOrderEntityList.get(0).getCorderid()); + poOrderBEntity.setDataSourceCode("lets_u8c"); + List poOrderBEntityList = iPoOrderBDao.query(poOrderBEntity); + if (poOrderBEntityList == null || poOrderBEntityList.size() == 0) { + Assert.state(false, "根据采购订单主键：{} 无法查询到U8C采购订单明细行", poOrderEntityList.get(0).getCorderid()); + } + PoOrderSonDto poOrderSonDto = new PoOrderSonDto(); poOrderSonDto.setBdCorpEntity(bdCorpEntityList.get(0)); poOrderSonDto.setBdDeptdocEntity(bdDeptdocEntityList.get(0)); @@ -657,6 +708,8 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { poOrderSonDto.setOfsPoOrderData(ofsPoOrderData); poOrderSonDto.setBdCalbodyEntity(bdCalbodyEntities.get(0)); poOrderSonDto.setBdStordocEntity(bdStordocEntityList.get(0)); + poOrderSonDto.setPoOrderEntity(poOrderEntityList.get(0)); + poOrderSonDto.setPoOrderBEntityList(poOrderBEntityList); poOrderSonDto.setDetails(details); BeanUtil.copyPropertiesV2(header, poOrderSonDto); @@ -700,7 +753,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { private BdBusitypeEntity u8cOperationFlow() throws Exception { //查询业务流程 //2024年8月6日 11:33:07 具体的业务流程名称，还需要实施提供 - String processName = "代理品牌采购"; + String processName = "渠道品牌采购"; BdBusitypeEntity bdBusitypeEntity = queryBdBusitypeUtil.queryBdBusitype(processName); Assert.notNull(bdBusitypeEntity, "根据业务流程名称({})没有查询到业务流程", processName); return bdBusitypeEntity; @@ -713,11 +766,11 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { * @author liuyang */ private String createGenerateBusinessDate(PoOrderSonDto poOrderSonDto) { - if (poOrderSonDto != null && poOrderSonDto.getShipAt() != null) { - String shipAt = poOrderSonDto.getShipAt(); + if (poOrderSonDto != null && poOrderSonDto.getCheckInTo() != null) { + String checkInTo = poOrderSonDto.getCheckInTo(); String businessFormat = null; try { - Date dbill = DateUtil.parse(shipAt); + Date dbill = DateUtil.parse(checkInTo); businessFormat = DateUtil.format(dbill, "yyyy-MM-dd"); } catch (Exception e) { logger.error("业务日期生成失败", e); @@ -815,10 +868,10 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { * * @author liuyang */ - public PoOrderHeadBodyDto sendU8CPoOrder(String param) throws Exception { + public PoOrderResultDto sendU8CPoOrder(String param) throws Exception { long startLong = System.currentTimeMillis(); - logger.info("代理品牌采购推送开始，推送参数：" + param + ",U8C_URL:" + OverallConstant.getOverAllValue("u8c_url")); - String apiCode = "8000370004"; + logger.info("代理品牌采购入库推送开始，推送参数：" + param + ",U8C_URL:" + OverallConstant.getOverAllValue("u8c_url")); + String apiCode = "8000370035"; String result = HttpRequest.post(OverallConstant.getOverAllValue("u8c_url")).header("appId", OverallConstant.getOverAllValue("appId"))//头信息，多个头信息多次调用此方法即可 .header("usercode", OverallConstant.getOverAllValue("u8cApiUsercodePK")).header("password", OverallConstant.getOverAllValue("u8cApiPasswordPK")).header("system", OverallConstant.getOverAllValue("u8cApiSystemPK")).header("trantype", OverallConstant.getOverAllValue("u8cApiTrantypePK")).header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可 .header("publicKey", OverallConstant.getOverAllValue("publicKey"))//头信息，多个头信息多次调用此方法即可 @@ -826,9 +879,9 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { .body(param)//表单内容 .timeout(600000)//超时，毫秒 .execute().body(); - logger.info("代理品牌采购推送结束，返回参数：" + result); + logger.info("代理品牌采购入库推送结束，返回参数：" + result); long endLong = System.currentTimeMillis(); - logger.info("U8C采购订单接口请求耗时：" + (endLong - startLong)); + logger.info("U8C采购入库接口请求耗时：" + (endLong - startLong)); //2024年8月21日 13:17:57 如果结果返回为null，则赋予""，后面的处理逻辑能满足需求 if (result == null) { @@ -839,18 +892,18 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { result = String.valueOf(jsonObject.get("attribute")); boolean isSuccess = false; - PoOrderHeadBodyDto poOrderHeadBodyDto = null; + PoOrderResultDto poOrderResultDto = null; if (result != null && !"".equals(result)) { ReusltStrDto reusltStrDto = JSON.parseObject(result, ReusltStrDto.class); if ("success".equals(reusltStrDto.getStatus())) { - poOrderHeadBodyDto = resultDataHandle(reusltStrDto.getData()); + poOrderResultDto = resultDataHandle(reusltStrDto.getData()); isSuccess = true; } } if (!isSuccess) { Assert.state(false, "代理品牌采购业务推送U8C采购订单失败 接口返回结果：{}", result); } - return poOrderHeadBodyDto; + return poOrderResultDto; } /** @@ -858,13 +911,13 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { * * @author liuyang */ - private PoOrderHeadBodyDto resultDataHandle(String resultData) { + private PoOrderResultDto resultDataHandle(String resultData) { try { if (resultData != null && !"".equals(resultData)) { if (resultData.contains("[")) { resultData = resultData.substring(1, resultData.length() - 1); } - return JSON.parseObject(resultData, PoOrderHeadBodyDto.class); + return JSON.parseObject(resultData, PoOrderResultDto.class); } } catch (Exception e) { logger.error("resultDataHandle方法解析返回参数失败的错误", e); @@ -889,15 +942,36 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { for (int i = 0; i < params.length; i++) { String indexStr = params[i]; String[] split = indexStr.split(","); - startImplement(split[0], split[1]); + startImplementByTime(split[0], split[1]); } } } else { String[] split = param.split(","); - startImplement(split[0], split[1]); + startImplementByTime(split[0], split[1]); } } catch (Exception e) { logger.info("记录splitDateAndPush方法抛出的异常", e); } } + + /** + * 查找U8C表体明细行 + * + * @author liuyang + */ + private PoOrderBEntity findPoOrderBEntity(StockinOrderSearchResponse.StockinOrder.StockinB stockinB, List poOrderBEntityList) throws Exception { + Assert.notNull(stockinB, "stockinB不能为空"); + Assert.notNull(poOrderBEntityList, "poOrderBEntityList不能为空"); + + for (int i = 0; i < poOrderBEntityList.size(); i++) { + PoOrderBEntity poOrderBEntity = poOrderBEntityList.get(i); + if (poOrderBEntity.getVdef20() != null) { + if (poOrderBEntity.getVdef20().equals(stockinB.getRefOrderDetailId())) { + return poOrderBEntity; + } + } + } + Assert.state(false, "无法匹配到U8C采购订单明细行！refOrderDetailId：{}", stockinB.getRefOrderDetailId()); + return null; + } } \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderBody.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderBody.java new file mode 100644 index 00000000..e26c4bae --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderBody.java @@ -0,0 +1,77 @@ +package com.hzya.frame.plugin.lets.u8cdto; + +import lombok.Data; + +/** + * Auto-generated: 2024-09-20 11:3:53 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +@Data +public class PoOrderBody { + private String cinventoryid; + private String inventory_code; + private String inventory_name; + private String cvendorid; + private String vendor_code; + private String vendor_name; + private String pk_measdoc; + private String measdoc_code; + private String measdocname; + private String nictaxrate; + private String noritaxmny; + private String bbarcodeclose; + private String bonroadflag; + private String breturnprofit; + private String bsafeprice; + private String bsourcelargess; + private String bsupplyflag; + private String btoinzgflag; + private String btoouttoiaflag; + private String btou8rm; + private String bzgflag; + private String cbodybilltypecode; + private String cbodywarehouseid; + private String bodywarehouse_code; + private String bodywarehouse_name; + private String cfirstbillbid; + private String cfirstbillhid; + private String cfirsttype; + private String cgeneralbid; + private String cgeneralhid; + private String crowno; + private String csourcebillbid; + private String csourcebillhid; + private String csourcetype; + private String dbizdate; + private String fassertcardflag; + private String fchecked; + private String flargess; + private String idesatype; + private String isok; + private String ninnum; + private String nmny; + private String nprice; + private String npricesettlebill; + private String nshouldinnum; + private String ntaxmny; + private String ntaxprice; + private String pk_bodycalbody; + private String bodycalbody_code; + private String bodycalbody_name; + private String pk_corp; + private String corp_code; + private String corp_name; + private String pk_invoicecorp; + private String invoicecorp_code; + private String invoicecorp_name; + private String pk_reqstoorg; + private String reqstoorg_code; + private String reqstoorg_name; + private String ts; + private String vfirstbillcode; + private String vsourcebillcode; + private String vsourcerowno; + private String vuserdef20; +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderHead.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderHead.java new file mode 100644 index 00000000..dcf0452d --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderHead.java @@ -0,0 +1,60 @@ +/** + * Copyright 2024 bejson.com + */ +package com.hzya.frame.plugin.lets.u8cdto; + +import lombok.Data; + +import java.util.Date; + +@Data +public class PoOrderHead { + private String cbizid; + private String cbiztype; + private String biztype_code; + private String biztype_name; + private String cdispatcherid; + private String dispatcher_code; + private String dispatcher_name; + private String cdptid; + private String dept_code; + private String dept_name; + private String coperatorid; + private String operator_code; + private String operator_name; + private String cproviderid; + private String provider_code; + private String provider_name; + private String cwarehouseid; + private String warehouseid_code; + private String warehouseid_name; + private String pk_calbody; + private String calbody_code; + private String calbody_name; + private String pk_corp; + private String corp_code; + private String corp_name; + private String vbillcode; + private String dbilldate; + private String freplenishflag; + private String bassetcard; + private String bdirecttranflag; + private String cbilltypecode; + private String cgeneralhid; + private String clastmodiid; + private String lastmodi_code; + private String lastmodi_name; + private String cregister; + private String register_code; + private String register_name; + private String daccountdate; + private String fbillflag; + private String pk_purcorp; + private String purcorp_code; + private String purcorp_name; + private String taccounttime; + private String tlastmoditime; + private String tmaketime; + private String ts; + private String pk_cubasdoc; +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderResultDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderResultDto.java new file mode 100644 index 00000000..a9477953 --- /dev/null +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderResultDto.java @@ -0,0 +1,14 @@ +/** + * Copyright 2024 bejson.com + */ +package com.hzya.frame.plugin.lets.u8cdto; + +import lombok.Data; + +import java.util.List; + +@Data +public class PoOrderResultDto { + private PoOrderHead parentvo; + private List childrenvo; +} \ No newline at end of file diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderSonDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderSonDto.java index 7fd845f2..3d40826e 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderSonDto.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PoOrderSonDto.java @@ -61,4 +61,14 @@ public class PoOrderSonDto extends StockinOrderSearchResponse.StockinOrder.Stock * 收货仓库 */ private BdStordocEntity bdStordocEntity; + + /** + * U8C采购订单 + */ + private PoOrderEntity poOrderEntity; + + /** + * U8C采购订单明细行 + */ + private List poOrderBEntityList; } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java index 007ddcdf..209b79a6 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/PurchaseReceiptHeadDto.java @@ -1,10 +1,13 @@ package com.hzya.frame.plugin.lets.u8cdto; +import lombok.Data; + /** * 采购入库单表头 * * @author liuyang */ +@Data public class PurchaseReceiptHeadDto { private String cbizid; private String cbiztype; @@ -15,7 +18,7 @@ public class PurchaseReceiptHeadDto { private String cwarehouseid; private String cwhsmanagerid; private String dbilldate; - private String freplenishflag; + private Boolean freplenishflag; private String pk_calbody; private String pk_corp; private String pk_defdoc1; @@ -41,340 +44,14 @@ public class PurchaseReceiptHeadDto { private String vbillcode; private String vheadnote2; private String vnote; - private String vuserdef10; private String vuserdef11; private String vuserdef12; private String vuserdef13; private String vuserdef14; - private String pk_purcorp; - - public String getPk_purcorp() { - return pk_purcorp; - } - - public void setPk_purcorp(String pk_purcorp) { - this.pk_purcorp = pk_purcorp; - } - - public String getVuserdef10() { - return vuserdef10; - } - - public void setVuserdef10(String vuserdef10) { - this.vuserdef10 = vuserdef10; - } - - public String getVuserdef11() { - return vuserdef11; - } - - public void setVuserdef11(String vuserdef11) { - this.vuserdef11 = vuserdef11; - } - - public String getVuserdef12() { - return vuserdef12; - } - - public void setVuserdef12(String vuserdef12) { - this.vuserdef12 = vuserdef12; - } - - public String getVuserdef13() { - return vuserdef13; - } - - public void setVuserdef13(String vuserdef13) { - this.vuserdef13 = vuserdef13; - } - - public String getVuserdef14() { - return vuserdef14; - } - - public void setVuserdef14(String vuserdef14) { - this.vuserdef14 = vuserdef14; - } - - public String getCbizid() { - return cbizid; - } - - public void setCbizid(String cbizid) { - this.cbizid = cbizid; - } - - public String getCbiztype() { - return cbiztype; - } - - public void setCbiztype(String cbiztype) { - this.cbiztype = cbiztype; - } - - public String getCdispatcherid() { - return cdispatcherid; - } - - public void setCdispatcherid(String cdispatcherid) { - this.cdispatcherid = cdispatcherid; - } - - public String getCdptid() { - return cdptid; - } - - public void setCdptid(String cdptid) { - this.cdptid = cdptid; - } - - public String getCoperatorid() { - return coperatorid; - } - - public void setCoperatorid(String coperatorid) { - this.coperatorid = coperatorid; - } - - public String getCproviderid() { - return cproviderid; - } - - public void setCproviderid(String cproviderid) { - this.cproviderid = cproviderid; - } - - public String getCwarehouseid() { - return cwarehouseid; - } - - public void setCwarehouseid(String cwarehouseid) { - this.cwarehouseid = cwarehouseid; - } - - public String getCwhsmanagerid() { - return cwhsmanagerid; - } - - public void setCwhsmanagerid(String cwhsmanagerid) { - this.cwhsmanagerid = cwhsmanagerid; - } - - public String getDbilldate() { - return dbilldate; - } - - public void setDbilldate(String dbilldate) { - this.dbilldate = dbilldate; - } - - public String getFreplenishflag() { - return freplenishflag; - } - - public void setFreplenishflag(String freplenishflag) { - this.freplenishflag = freplenishflag; - } - - public String getPk_calbody() { - return pk_calbody; - } - - public void setPk_calbody(String pk_calbody) { - this.pk_calbody = pk_calbody; - } - - public String getPk_corp() { - return pk_corp; - } - - public void setPk_corp(String pk_corp) { - this.pk_corp = pk_corp; - } - - public String getPk_defdoc1() { - return pk_defdoc1; - } - - public void setPk_defdoc1(String pk_defdoc1) { - this.pk_defdoc1 = pk_defdoc1; - } - - public String getPk_defdoc10() { - return pk_defdoc10; - } - - public void setPk_defdoc10(String pk_defdoc10) { - this.pk_defdoc10 = pk_defdoc10; - } - - public String getPk_defdoc11() { - return pk_defdoc11; - } - - public void setPk_defdoc11(String pk_defdoc11) { - this.pk_defdoc11 = pk_defdoc11; - } - - public String getPk_defdoc12() { - return pk_defdoc12; - } - - public void setPk_defdoc12(String pk_defdoc12) { - this.pk_defdoc12 = pk_defdoc12; - } - - public String getPk_defdoc13() { - return pk_defdoc13; - } - - public void setPk_defdoc13(String pk_defdoc13) { - this.pk_defdoc13 = pk_defdoc13; - } - - public String getPk_defdoc14() { - return pk_defdoc14; - } - - public void setPk_defdoc14(String pk_defdoc14) { - this.pk_defdoc14 = pk_defdoc14; - } - - public String getPk_defdoc15() { - return pk_defdoc15; - } - - public void setPk_defdoc15(String pk_defdoc15) { - this.pk_defdoc15 = pk_defdoc15; - } - - public String getPk_defdoc16() { - return pk_defdoc16; - } - - public void setPk_defdoc16(String pk_defdoc16) { - this.pk_defdoc16 = pk_defdoc16; - } - - public String getPk_defdoc17() { - return pk_defdoc17; - } - - public void setPk_defdoc17(String pk_defdoc17) { - this.pk_defdoc17 = pk_defdoc17; - } - - public String getPk_defdoc18() { - return pk_defdoc18; - } - - public void setPk_defdoc18(String pk_defdoc18) { - this.pk_defdoc18 = pk_defdoc18; - } - - public String getPk_defdoc19() { - return pk_defdoc19; - } - - public void setPk_defdoc19(String pk_defdoc19) { - this.pk_defdoc19 = pk_defdoc19; - } - - public String getPk_defdoc2() { - return pk_defdoc2; - } - - public void setPk_defdoc2(String pk_defdoc2) { - this.pk_defdoc2 = pk_defdoc2; - } - - public String getPk_defdoc20() { - return pk_defdoc20; - } - - public void setPk_defdoc20(String pk_defdoc20) { - this.pk_defdoc20 = pk_defdoc20; - } - - public String getPk_defdoc3() { - return pk_defdoc3; - } - - public void setPk_defdoc3(String pk_defdoc3) { - this.pk_defdoc3 = pk_defdoc3; - } - - public String getPk_defdoc4() { - return pk_defdoc4; - } - - public void setPk_defdoc4(String pk_defdoc4) { - this.pk_defdoc4 = pk_defdoc4; - } - - public String getPk_defdoc5() { - return pk_defdoc5; - } - - public void setPk_defdoc5(String pk_defdoc5) { - this.pk_defdoc5 = pk_defdoc5; - } - - public String getPk_defdoc6() { - return pk_defdoc6; - } - - public void setPk_defdoc6(String pk_defdoc6) { - this.pk_defdoc6 = pk_defdoc6; - } - - public String getPk_defdoc7() { - return pk_defdoc7; - } - - public void setPk_defdoc7(String pk_defdoc7) { - this.pk_defdoc7 = pk_defdoc7; - } - - public String getPk_defdoc8() { - return pk_defdoc8; - } - - public void setPk_defdoc8(String pk_defdoc8) { - this.pk_defdoc8 = pk_defdoc8; - } - - public String getPk_defdoc9() { - return pk_defdoc9; - } - - public void setPk_defdoc9(String pk_defdoc9) { - this.pk_defdoc9 = pk_defdoc9; - } - - public String getVbillcode() { - return vbillcode; - } - - public void setVbillcode(String vbillcode) { - this.vbillcode = vbillcode; - } - - public String getVheadnote2() { - return vheadnote2; - } - - public void setVheadnote2(String vheadnote2) { - this.vheadnote2 = vheadnote2; - } - - public String getVnote() { - return vnote; - } - - public void setVnote(String vnote) { - this.vnote = vnote; - } -} + private String daccountdate; + private String vdef17; + private String vdef19; + private String vdef20; +} \ No newline at end of file diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java index 39722b2b..fba65e3a 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrderTest.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import static org.junit.Assert.*; - /** + * I2240919000001 + * * @Author：liuyang * @Package：com.hzya.frame.plugin.lets.plugin.purchase * @Project：kangarooDataCenterV3 diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousTest.java index dff6a589..1c164cd9 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousTest.java @@ -25,7 +25,7 @@ public class ProxyPurchaseWarehousTest { @Test public void startImplement() { try { - proxyPurchaseWarehous.startImplement("LETS-RE2024082100000013"); +// proxyPurchaseWarehous.startImplement("LETS-RE2024082100000013"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java new file mode 100644 index 00000000..540cf9e5 --- /dev/null +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouseTest.java @@ -0,0 +1,31 @@ +package com.hzya.frame.plugin.lets.plugin.purchase; + +import com.hzya.frame.WebappApplication; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.junit.Assert.*; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.plugin.lets.plugin.purchase + * @Project：kangarooDataCenterV3 + * @name：ProxyPurchaseWarehousWarehouseTest + * @Date：2024/9/19 17:57 + * @Filename：ProxyPurchaseWarehousWarehouseTest + */ +@RunWith(SpringRunner.class) +@SpringBootTest(classes = WebappApplication.class) +public class ProxyPurchaseWarehousWarehouseTest { + + @Autowired + private ProxyPurchaseWarehousWarehouse proxyPurchaseWarehousWarehouse; + + @Test + public void startImplementByCode() { + proxyPurchaseWarehousWarehouse.startImplementByCode("LETS-RE2024091800000001"); + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java index 25bc2307..cf6388d2 100644 --- a/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java +++ b/service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.java @@ -11,6 +11,7 @@ import lombok.Data; * @author makejava * @since 2024-05-15 14:06:41 */ +@Data public class IntegrationTaskLivingDetailsEntity extends BaseEntity { /** * 集成任务-实例_id @@ -116,222 +117,5 @@ public class IntegrationTaskLivingDetailsEntity extends BaseEntity { private String root_app_pk_s; private String param_new_state; - - public String getRoot_app_pk_s() { - return root_app_pk_s; - } - - public void setRoot_app_pk_s(String root_app_pk_s) { - this.root_app_pk_s = root_app_pk_s; - } - - public String getParam_new_state() { - return param_new_state; - } - - public void setParam_new_state(String param_new_state) { - this.param_new_state = param_new_state; - } - - public String getTaskLinvingId() { - return taskLinvingId; - } - - public void setTaskLinvingId(String taskLinvingId) { - this.taskLinvingId = taskLinvingId; - } - - public String getResult() { - return result; - } - - public void setResult(String result) { - this.result = result; - } - - public String getQueryCondition() { - return queryCondition; - } - - public void setQueryCondition(String queryCondition) { - this.queryCondition = queryCondition; - } - - public String getRootAppPk() { - return rootAppPk; - } - - public void setRootAppPk(String rootAppPk) { - this.rootAppPk = rootAppPk; - } - - public String getRootAppBill() { - return rootAppBill; - } - - public void setRootAppBill(String rootAppBill) { - this.rootAppBill = rootAppBill; - } - - public String getRootAppNewData() { - return rootAppNewData; - } - - public void setRootAppNewData(String rootAppNewData) { - this.rootAppNewData = rootAppNewData; - } - - public String getNewTransmitInfo() { - return newTransmitInfo; - } - - public void setNewTransmitInfo(String newTransmitInfo) { - this.newTransmitInfo = newTransmitInfo; - } - - public Date getNewPushDate() { - return newPushDate; - } - - public void setNewPushDate(Date newPushDate) { - this.newPushDate = newPushDate; - } - - public String getRepairPust() { - return repairPust; - } - - public void setRepairPust(String repairPust) { - this.repairPust = repairPust; - } - - public String getSenceId() { - return senceId; - } - - public void setSenceId(String senceId) { - this.senceId = senceId; - } - - public String getNewState() { - return newState; - } - - public void setNewState(String newState) { - this.newState = newState; - } - - public String getBusinessDate() { - return businessDate; - } - - public void setBusinessDate(String businessDate) { - this.businessDate = businessDate; - } - - public String getPluginId() { - return pluginId; - } - - public void setPluginId(String pluginId) { - this.pluginId = pluginId; - } - - public Date getProcessingTime() { - return processingTime; - } - - public void setProcessingTime(Date processingTime) { - this.processingTime = processingTime; - } - - public String getProcessingRemarks() { - return processingRemarks; - } - - public void setProcessingRemarks(String processingRemarks) { - this.processingRemarks = processingRemarks; - } - - public String getProcessorName() { - return processorName; - } - - public void setProcessorName(String processorName) { - this.processorName = processorName; - } - - public String getProcessor() { - return processor; - } - - public void setProcessor(String processor) { - this.processor = processor; - } - - public String getNewSystemNumber() { - return newSystemNumber; - } - - public void setNewSystemNumber(String newSystemNumber) { - this.newSystemNumber = newSystemNumber; - } - - public String getNewSystemPrimary() { - return newSystemPrimary; - } - - public void setNewSystemPrimary(String newSystemPrimary) { - this.newSystemPrimary = newSystemPrimary; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getDef1() { - return def1; - } - - public void setDef1(String def1) { - this.def1 = def1; - } - - public String getDef2() { - return def2; - } - - public void setDef2(String def2) { - this.def2 = def2; - } - - public String getDef3() { - return def3; - } - - public void setDef3(String def3) { - this.def3 = def3; - } - - public String getDef4() { - return def4; - } - - public void setDef4(String def4) { - this.def4 = def4; - } - - public String getDef5() { - return def5; - } - - public void setDef5(String def5) { - this.def5 = def5; - } - }