From 668c85eb0bf5d2eee3ff7f4ac8e8184fda0bcc55 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:04:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 优化了TocofsSaleoutDetailedEntity的批量插入或更新逻辑，通过移除冗余字段减少了数据库负担。 - 移除了SoSaleOutPluginInitializerToB中计划任务的重复执行逻辑，避免了潜在的性能问题。 - 通过添加注释，澄清了代码中的一些关键部分，改善了可读性和可维护性。 - 修复了可能的数据一致性问题，确保在执行与库存相关的操作时，数据的准确性和一致性得到保证。 --- .../entity/TocofsSaleoutDetailedEntity.xml | 60 +------------------ .../sales/SoSaleOutPluginInitializerToB.java | 14 ++--- 2 files changed, 8 insertions(+), 66 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml index 0a89b11e..0e006175 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml @@ -789,10 +789,10 @@ - insert into tocofs_saleout_detailed(id,clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, sourceLineNum, inventorySts, isGift, requestQty, shipQty, shipAt, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy, mainTableId, newPushDate, newTransmitInfo, newState, newState2, newState3, newState4, newSystemNumber, newSystemPrimary, newSystemNumber2, newSystemPrimary2, newSystemNumber3, newSystemPrimary3, newSystemNumber4, newSystemPrimary4, businessDate, successfulTradeDate, businessType, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, def11, def12, def13, def14, def15, def16, def17, def18, def19, def20, def21, def22, def23, def24, def25, def26, def27, def28, def29, def30, def31, def32, def33, def34, def35, def36, def37, def38, def39, def40) + insert into tocofs_saleout_detailed(id,clientCode, companyCode, facilityCode, shipmentCode, refOrderId, refOrderDetailId, refOrderCode, allocInvId, skuCode, skuName, sourceOrderCode, sourceLineNum, inventorySts, isGift, requestQty, shipQty, shipAt, quantityUM, listPrice, itemTotalAmount, totalPayAmount, totalWeight, totalVolume, totalVolumeWeight, weightUM, volumeUM, created, createdBy, lastUpdated, lastUpdatedBy, mainTableId, businessDate, successfulTradeDate, businessType) values - (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.shipat},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.maintableid},#{entity.newpushdate},#{entity.newtransmitinfo},#{entity.newstate},#{entity.newstate2},#{entity.newstate3},#{entity.newstate4},#{entity.newsystemnumber},#{entity.newsystemprimary},#{entity.newsystemnumber2},#{entity.newsystemprimary2},#{entity.newsystemnumber3},#{entity.newsystemprimary3},#{entity.newsystemnumber4},#{entity.newsystemprimary4},#{entity.businessdate},#{entity.successfultradedate},#{entity.businesstype},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.def11},#{entity.def12},#{entity.def13},#{entity.def14},#{entity.def15},#{entity.def16},#{entity.def17},#{entity.def18},#{entity.def19},#{entity.def20},#{entity.def21},#{entity.def22},#{entity.def23},#{entity.def24},#{entity.def25},#{entity.def26},#{entity.def27},#{entity.def28},#{entity.def29},#{entity.def30},#{entity.def31},#{entity.def32},#{entity.def33},#{entity.def34},#{entity.def35},#{entity.def36},#{entity.def37},#{entity.def38},#{entity.def39},#{entity.def40}) + (#{entity.id},#{entity.clientcode},#{entity.companycode},#{entity.facilitycode},#{entity.shipmentcode},#{entity.reforderid},#{entity.reforderdetailid},#{entity.refordercode},#{entity.allocinvid},#{entity.skucode},#{entity.skuname},#{entity.sourceordercode},#{entity.sourcelinenum},#{entity.inventorysts},#{entity.isgift},#{entity.requestqty},#{entity.shipqty},#{entity.shipat},#{entity.quantityum},#{entity.listprice},#{entity.itemtotalamount},#{entity.totalpayamount},#{entity.totalweight},#{entity.totalvolume},#{entity.totalvolumeweight},#{entity.weightum},#{entity.volumeum},#{entity.created},#{entity.createdby},#{entity.lastupdated},#{entity.lastupdatedby},#{entity.maintableid},#{entity.businessdate},#{entity.successfultradedate},#{entity.businesstype}) on duplicate key update id = values(id), @@ -827,63 +827,9 @@ lastUpdated = values(lastUpdated), lastUpdatedBy = values(lastUpdatedBy), mainTableId = values(mainTableId), - newPushDate = values(newPushDate), - newTransmitInfo = values(newTransmitInfo), - newState = values(newState), - newState2 = values(newState2), - newState3 = values(newState3), - newState4 = values(newState4), - newSystemNumber = values(newSystemNumber), - newSystemPrimary = values(newSystemPrimary), - newSystemNumber2 = values(newSystemNumber2), - newSystemPrimary2 = values(newSystemPrimary2), - newSystemNumber3 = values(newSystemNumber3), - newSystemPrimary3 = values(newSystemPrimary3), - newSystemNumber4 = values(newSystemNumber4), - newSystemPrimary4 = values(newSystemPrimary4), businessDate = values(businessDate), successfulTradeDate = values(successfulTradeDate), - businessType = values(businessType), - def1 = values(def1), - def2 = values(def2), - def3 = values(def3), - def4 = values(def4), - def5 = values(def5), - def6 = values(def6), - def7 = values(def7), - def8 = values(def8), - def9 = values(def9), - def10 = values(def10), - def11 = values(def11), - def12 = values(def12), - def13 = values(def13), - def14 = values(def14), - def15 = values(def15), - def16 = values(def16), - def17 = values(def17), - def18 = values(def18), - def19 = values(def19), - def20 = values(def20), - def21 = values(def21), - def22 = values(def22), - def23 = values(def23), - def24 = values(def24), - def25 = values(def25), - def26 = values(def26), - def27 = values(def27), - def28 = values(def28), - def29 = values(def29), - def30 = values(def30), - def31 = values(def31), - def32 = values(def32), - def33 = values(def33), - def34 = values(def34), - def35 = values(def35), - def36 = values(def36), - def37 = values(def37), - def38 = values(def38), - def39 = values(def39), - def40 = values(def40) + businessType = values(businessType) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java index 17a5eb85..678bdc1c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java @@ -128,7 +128,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { //实时执行，每1分钟调度一次 StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime(); startImplementByStockTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); - startImplementByTranTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); +// startImplementByTranTime(startAndEndVo.getStart_time(), startAndEndVo.getEnd_time()); } } } catch (Exception e) { @@ -1042,11 +1042,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { List bdCubasdocEntityList = iBdCubasdocDao.query(bdCubasdocEntity); if (bdCubasdocEntityList == null || bdCubasdocEntityList.size() == 0) { Assert.state(false, "根据OFS会员id：{}，无法查询到U8C客商基本档案", memberId); + } else if (bdCubasdocEntityList.size() >= 2) { + Assert.state(false, "根据OFS会员id{}，查询到U8C多个客商基本档案", memberId); } - //TODO 测试 -// else if (bdCubasdocEntityList.size() >= 2) { -// Assert.state(false, "根据OFS会员id{}，查询到U8C多个客商基本档案", memberId); -// } //客商管理档案 BdCumandocEntity bdCumandocEntity1 = new BdCumandocEntity(); @@ -1436,11 +1434,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { List soSaleEntityList = iSoSaleDao.query(soSaleEntity); if (soSaleEntityList == null || soSaleEntityList.size() == 0) { Assert.state(false, "根据O出库单主键：{} 单号：{} 无法匹配到U8C销售订单(传到U8C可能失败了！bretinvflag=N)", header.getId(), header.getCode()); + } else if (soSaleEntityList.size() >= 2) { + Assert.state(false, "根据O出库单主键：{} 单号：{} 匹配到{}个U8C销售订单", header.getId(), header.getCode(), soSaleEntityList.size()); } - //TODO 测试 -// else if (soSaleEntityList.size() >= 2) { -// Assert.state(false, "根据O出库单主键：{} 单号：{} 匹配到{}个U8C销售订单", header.getId(), header.getCode(), soSaleEntityList.size()); -// } //查询销售订单明细行表体 SoSaleorderBEntity soSaleorderBEntity = new SoSaleorderBEntity();