From 42e4fd0d638a6e979ae95cebf132bb19305a5459 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 25 Mar 2024 08:49:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=8F=98=E6=9B=B4=E6=8C=89=E9=92=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index d24fa4eee1..1202cc1b6a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2029,7 +2029,7 @@ public class BusSalesOrderService extends MybatisBaseService Date: Mon, 25 Mar 2024 11:33:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/asserviceitem/AsServiceItemService.java | 12 ++++++------ .../AsServicePackageService.java | 14 +++++++------- .../basemanufacturer/BaseManufacturerFeign.java} | 13 ++++++------- .../BaseManufacturerFeignFallback.java} | 8 +++----- .../basemanufacturer/BaseManufacturerVo.java} | 4 ++-- .../WmsInventoryFeign.java} | 16 ++++++---------- .../WmsInventoryFeignFallback.java} | 8 +++----- .../WmsInventoryPackageQuery.java} | 4 ++-- .../WmsInventoryPackageVo.java} | 7 ++----- 9 files changed, 37 insertions(+), 49 deletions(-) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/{wms/wmsmanufacturer/WmsManufacturerFeign.java => base/basemanufacturer/BaseManufacturerFeign.java} (57%) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/{wms/wmsmanufacturer/WmsManufacturerFeignFallback.java => base/basemanufacturer/BaseManufacturerFeignFallback.java} (87%) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/{wms/wmsmanufacturer/WmsManufacturerVo.java => base/basemanufacturer/BaseManufacturerVo.java} (89%) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/{wmsgoods/WmsGoodsFeign.java => wmsInventory/WmsInventoryFeign.java} (55%) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/{wmsgoods/WmsGoodsFeignFallback.java => wmsInventory/WmsInventoryFeignFallback.java} (90%) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/{wmsgoods/WmsGoodsPackageQuery.java => wmsInventory/WmsInventoryPackageQuery.java} (86%) rename yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/{wmsgoods/WmsGoodsPackageVo.java => wmsInventory/WmsInventoryPackageVo.java} (89%) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java index 673392a4b9..6c82bc081e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java @@ -8,8 +8,8 @@ import com.yxt.anrui.as.api.asserviceitem.*; import com.yxt.anrui.as.feign.base.basevehiclemodel.BaseVehModelVo; import com.yxt.anrui.as.feign.base.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.as.feign.wms.wmsmanufacturer.WmsManufacturerFeign; -import com.yxt.anrui.as.feign.wms.wmsmanufacturer.WmsManufacturerVo; +import com.yxt.anrui.as.feign.base.basemanufacturer.BaseManufacturerFeign; +import com.yxt.anrui.as.feign.base.basemanufacturer.BaseManufacturerVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -30,7 +30,7 @@ import java.util.List; public class AsServiceItemService extends MybatisBaseService { @Resource - private WmsManufacturerFeign wmsManufacturerFeign; + private BaseManufacturerFeign baseManufacturerFeign; @Resource private BaseVehicleModelFeign baseVehicleModelFeign; @Autowired @@ -101,9 +101,9 @@ public class AsServiceItemService extends MybatisBaseService wmsManufacturerVos = wmsManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData(); - if (!wmsManufacturerVos.isEmpty()) { - for (WmsManufacturerVo wmsManufacturerVo : wmsManufacturerVos) { + List manufacturerVos = baseManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData(); + if (!manufacturerVos.isEmpty()) { + for (BaseManufacturerVo wmsManufacturerVo : manufacturerVos) { ManufacturerVo vo = new ManufacturerVo(); vo.setManufacturerSid(wmsManufacturerVo.getSid()); vo.setManufacturer(wmsManufacturerVo.getManufacturerName()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java index fc426b7986..83a9ffd1b5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java @@ -36,9 +36,9 @@ import com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemService; import com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsService; import com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemService; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsFeign; -import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsPackageQuery; -import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsPackageVo; +import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryFeign; +import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryPackageQuery; +import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryPackageVo; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -78,7 +78,7 @@ public class AsServicePackageService extends MybatisBaseService createQueryWrapper(AsServicePackageQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -282,7 +282,7 @@ public class AsServicePackageService extends MybatisBaseService selGoodsInfo(PagerQuery pq) { - PagerQuery query = new PagerQuery<>(); + PagerQuery query = new PagerQuery<>(); BeanUtil.copyProperties(pq, query); PackageGoodsQuery params = pq.getParams(); // ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()); @@ -291,10 +291,10 @@ public class AsServicePackageService extends MybatisBaseService> voResultBean = wmsGoodsFeign.getPackageGoodsVo(query); + ResultBean> voResultBean = wmsInventoryFeign.getPackageGoodsVo(query); PagerVo vo = new PagerVo<>(); if (voResultBean.getSuccess()) { - PagerVo data = voResultBean.getData(); + PagerVo data = voResultBean.getData(); BeanUtil.copyProperties(data, vo); } return vo; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeign.java similarity index 57% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeign.java index 11e9f27b4d..9f530d1b04 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeign.java @@ -1,11 +1,10 @@ -package com.yxt.anrui.as.feign.wms.wmsmanufacturer; +package com.yxt.anrui.as.feign.base.basemanufacturer; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import java.util.List; @@ -15,15 +14,15 @@ import java.util.List; * @date: 2024/3/7 **/ @FeignClient( - contextId = "yxt-wms-WmsManufacturer", - name = "yxt-wms", + contextId = "yxt-wms-BaseManufacturer", + name = "yxt-base", path = "apiadmin/base/basemanufacturer", - fallback = WmsManufacturerFeignFallback.class + fallback = BaseManufacturerFeignFallback.class ) -public interface WmsManufacturerFeign { +public interface BaseManufacturerFeign { @ApiOperation("查询分公司下所有的厂家") @GetMapping("/getAllTypeByUseOrgSid") - public ResultBean> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid); + public ResultBean> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeignFallback.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java similarity index 87% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeignFallback.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java index 07066d06ea..7009943678 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeignFallback.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java @@ -23,11 +23,9 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.as.feign.wms.wmsmanufacturer; +package com.yxt.anrui.as.feign.base.basemanufacturer; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; @@ -46,11 +44,11 @@ import java.util.List; * @since 1.0 */ @Component -public class WmsManufacturerFeignFallback implements WmsManufacturerFeign { +public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { @Override - public ResultBean> getAllTypeByUseOrgSid(String useOrgSid) { + public ResultBean> getAllTypeByUseOrgSid(String useOrgSid) { return null; } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerVo.java similarity index 89% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerVo.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerVo.java index 87faaab1a1..e18febdc1e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerVo.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.as.feign.wms.wmsmanufacturer; +package com.yxt.anrui.as.feign.base.basemanufacturer; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.Date; * @date 2024/3/7 14:29 */ @Data -public class WmsManufacturerVo { +public class BaseManufacturerVo { private String id; private String sid; private String lockVersion; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java similarity index 55% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java index 799e244f9d..3498896645 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java @@ -1,16 +1,12 @@ -package com.yxt.anrui.as.feign.wms.wmsgoods; +package com.yxt.anrui.as.feign.wms.wmsInventory; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; /** * @description: 商品基础信息 @@ -18,14 +14,14 @@ import java.util.List; * @date: 2024/3/7 **/ @FeignClient( - contextId = "yxt-wms-WmsGoods", + contextId = "yxt-wms-WmsInventory", name = "yxt-wms", - path = "apiadmin/base/wmsgoods", - fallback = WmsGoodsFeignFallback.class + path = "apiadmin/inventory/wmsinventory", + fallback = WmsInventoryFeignFallback.class ) -public interface WmsGoodsFeign { +public interface WmsInventoryFeign { @ApiOperation("查询分公司下所有的商品信息") @PostMapping("/getPackageGoodsVo") - public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq); + public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java similarity index 90% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java index 7d72e00b2e..7d5c489e91 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java @@ -23,15 +23,13 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.as.feign.wms.wmsgoods; +package com.yxt.anrui.as.feign.wms.wmsInventory; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-fin(安瑞财务)
* File: FinManufacturerBankFeignFallback.java
@@ -46,11 +44,11 @@ import java.util.List; * @since 1.0 */ @Component -public class WmsGoodsFeignFallback implements WmsGoodsFeign { +public class WmsInventoryFeignFallback implements WmsInventoryFeign { @Override - public ResultBean> getPackageGoodsVo(PagerQuery pq) { + public ResultBean> getPackageGoodsVo(PagerQuery pq) { return null; } } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java similarity index 86% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java index dbf97c55fd..2ea9bcc166 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.as.feign.wms.wmsgoods; +package com.yxt.anrui.as.feign.wms.wmsInventory; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import lombok.Data; * @date 2024/3/12 15:33 */ @Data -public class WmsGoodsPackageQuery implements Query { +public class WmsInventoryPackageQuery implements Query { private String useOrgSid; @ApiModelProperty("商品名称") private String goodsName; // 商品名称 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageVo.java similarity index 89% rename from yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java rename to yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageVo.java index 9813f3bc60..2cadd0dee8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageVo.java @@ -1,18 +1,15 @@ -package com.yxt.anrui.as.feign.wms.wmsgoods; +package com.yxt.anrui.as.feign.wms.wmsInventory; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * @author Fan * @description * @date 2024/3/7 14:29 */ @Data -public class WmsGoodsPackageVo { +public class WmsInventoryPackageVo { @ApiModelProperty("商品sid") private String goodsSid; // 商品sid @ApiModelProperty("商品名称") From a5e5e4044231c17b20b9528ad8bcfa97cac35284 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 25 Mar 2024 15:04:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E5=8F=98=E6=9B=B4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 87 ++++++++++--------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 1202cc1b6a..8ea6546185 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -487,7 +487,7 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(sid); AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); @@ -6704,8 +6705,8 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid,busSalesOrderBorrower.getSalesOrderSid()); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid, busSalesOrderBorrower.getSalesOrderSid()); busSalesOrderVehicleList.removeAll(Collections.singleton(null)); if (!busSalesOrderVehicleList.isEmpty()) { for (int i = 0; i < busSalesOrderVehicleList.size(); i++) { @@ -7821,7 +7822,7 @@ public class BusSalesOrderService extends MybatisBaseService