完善查询商品信息

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<AsServiceItemMapper, AsServiceItem> {
 
     @Resource
-    private WmsManufacturerFeign wmsManufacturerFeign;
+    private BaseManufacturerFeign baseManufacturerFeign;
     @Resource
     private BaseVehicleModelFeign baseVehicleModelFeign;
     @Autowired
@@ -101,9 +101,9 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
         if (orgSidByPath.getSuccess()) {
             useOrgSid = orgSidByPath.getData();
         }
-        List<WmsManufacturerVo> wmsManufacturerVos = wmsManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData();
-        if (!wmsManufacturerVos.isEmpty()) {
-            for (WmsManufacturerVo wmsManufacturerVo : wmsManufacturerVos) {
+        List<BaseManufacturerVo> manufacturerVos = baseManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData();
+        if (!manufacturerVos.isEmpty()) {
+            for (BaseManufacturerVo wmsManufacturerVo : manufacturerVos) {
                 ManufacturerVo vo = new ManufacturerVo();
                 vo.setManufacturerSid(wmsManufacturerVo.getSid());
                 vo.setManufacturer(wmsManufacturerVo.getManufacturerName());

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<AsServicePackage
     @Autowired
     private AsServicePackageSitemService asServicePackageSitemService;
     @Resource
-    private WmsGoodsFeign wmsGoodsFeign;
+    private WmsInventoryFeign wmsInventoryFeign;
 
     private QueryWrapper<AsServicePackage> createQueryWrapper(AsServicePackageQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -282,7 +282,7 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
     }
 
     public PagerVo<GoodsListVo> selGoodsInfo(PagerQuery<PackageGoodsQuery> pq) {
-        PagerQuery<WmsGoodsPackageQuery> query = new PagerQuery<>();
+        PagerQuery<WmsInventoryPackageQuery> query = new PagerQuery<>();
         BeanUtil.copyProperties(pq, query);
         PackageGoodsQuery params = pq.getParams();
 //        ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath());
@@ -291,10 +291,10 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
 //            WmsGoodsPackageQuery queryParams = query.getParams();
 //            queryParams.setUseOrgSid(useOrgSid);
 //        }
-        ResultBean<PagerVo<WmsGoodsPackageVo>> voResultBean = wmsGoodsFeign.getPackageGoodsVo(query);
+        ResultBean<PagerVo<WmsInventoryPackageVo>> voResultBean = wmsInventoryFeign.getPackageGoodsVo(query);
         PagerVo<GoodsListVo> vo = new PagerVo<>();
         if (voResultBean.getSuccess()) {
-            PagerVo<WmsGoodsPackageVo> data = voResultBean.getData();
+            PagerVo<WmsInventoryPackageVo> data = voResultBean.getData();
             BeanUtil.copyProperties(data, vo);
         }
         return vo;

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java → 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<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
+    public ResultBean<List<BaseManufacturerVo>> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
 
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeignFallback.java → 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<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(String useOrgSid) {
+	public ResultBean<List<BaseManufacturerVo>> getAllTypeByUseOrgSid(String useOrgSid) {
 		return null;
 	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerVo.java → 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;

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java → 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<PagerVo<WmsGoodsPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsGoodsPackageQuery> pq);
+    public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> pq);
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java → 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(安瑞财务) <br/>
  * File: FinManufacturerBankFeignFallback.java <br/>
@@ -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<PagerVo<WmsGoodsPackageVo>> getPackageGoodsVo(PagerQuery<WmsGoodsPackageQuery> pq) {
+	public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(PagerQuery<WmsInventoryPackageQuery> pq) {
 		return null;
 	}
 }

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java → 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; // 商品名称

yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java → 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("商品名称")