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..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<BusSalesOrderMapper
         /*************************************************主车信息*****************************************************/
         BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
         if (busSalesOrderModelDetailsVo != null) {
-            String modelSidAndConfigSid =  baseMapper.selectByMcSid(busSalesOrderModelDetailsVo.getModelSid(),busSalesOrderModelDetailsVo.getModelConfigSid(),vo.getUseOrgSid());
+            String modelSidAndConfigSid = baseMapper.selectByMcSid(busSalesOrderModelDetailsVo.getModelSid(), busSalesOrderModelDetailsVo.getModelConfigSid(), vo.getUseOrgSid());
             busSalesOrderModelDetailsVo.setModelSidAndConfigSid(modelSidAndConfigSid);
             //查询现车车辆
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
@@ -2029,26 +2029,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 record.setClosingDate("-");
             }
             record.setShowFinancialBtn(false);
-            /*LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
-            if (null != data) {
-                if (StringUtils.isNotBlank(record.getSaleOrderState())) {
-                    if (record.getSaleOrderState().equals("已办结")) {
-                        //查询金融方案
-                        LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
-                        if (solutions != null) {
-                            String solutionsSid = solutions.getSid();
-                            BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
-                            if (null != busSolutionsChange) {
-                                if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
-                                    record.setShowFinancialBtn(true);
-                                }
-                            } else {
-                                record.setShowFinancialBtn(true);
-                            }
-                        }
-                    }
-                }
-            }*/
+            //是否显示金融方案变更按钮
+//            LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+//            if (null != data) {
+//                if (StringUtils.isNotBlank(record.getSaleOrderState())) {
+//                    if (record.getSaleOrderState().equals("已办结")) {
+//                        //查询金融方案
+//                        LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+//                        if (solutions != null) {
+//                            String solutionsSid = solutions.getSid();
+//                            BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
+//                            if (null != busSolutionsChange) {
+//                                if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
+//                                    record.setShowFinancialBtn(true);
+//                                }
+//                            } else {
+//                                record.setShowFinancialBtn(true);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
 
 
 
@@ -2246,18 +2247,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (StringUtils.isBlank(dto.getUserSid())) {
             return rb.setMsg("用户sid不能为空");
         }
-        if("1".equals(dto.getPayTypeKey())){
-            if(StringUtils.isBlank(dto.getAffiliatedOrgSid())){
+        if ("1".equals(dto.getPayTypeKey())) {
+            if (StringUtils.isBlank(dto.getAffiliatedOrgSid())) {
                 return rb.setMsg("开票信息为必选项");
             }
-        }else{
+        } else {
             dto.setAffiliatedOrgNameChoose("");
             dto.setAffiliatedOrgSid("");
         }
-        if(StringUtils.isNotBlank(dto.getAffiliatedOrgSid())){
-            if("02".equals(dto.getBillingTypeKey())){//增值税
+        if (StringUtils.isNotBlank(dto.getAffiliatedOrgSid())) {
+            if ("02".equals(dto.getBillingTypeKey())) {//增值税
                 CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
-                if(crmCustomerTemp != null){
+                if (crmCustomerTemp != null) {
                     return rb.setMsg("个人不能开具增值税专用发票");
                 }
             }
@@ -2290,12 +2291,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                     FinCompanyInvoicing finCompanyInvoicing = baseMapper.selectDis(dto.getAffiliatedOrgSid());
-                    if(finCompanyInvoicing == null){
+                    if (finCompanyInvoicing == null) {
                         CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
-                        if(crmCustomerTemp != null){
+                        if (crmCustomerTemp != null) {
                             busSalesOrder.setAffiliatedCompanyType(1);
                         }
-                    }else{
+                    } else {
                         busSalesOrder.setAffiliatedCompanyType(0);
                     }
                 }
@@ -2376,12 +2377,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                     FinCompanyInvoicing finCompanyInvoicing = baseMapper.selectDis(dto.getAffiliatedOrgSid());
-                    if(finCompanyInvoicing == null){
+                    if (finCompanyInvoicing == null) {
                         CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
-                        if(crmCustomerTemp != null){
+                        if (crmCustomerTemp != null) {
                             busSalesOrder.setAffiliatedCompanyType(1);
                         }
-                    }else{
+                    } else {
                         busSalesOrder.setAffiliatedCompanyType(0);
                     }
                 }
@@ -3294,7 +3295,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 return rb.setMsg("此销售类型下金融方案不能为空");
             }
         }
-        if(StringUtils.isBlank(busSalesOrder.getFinancePlan())){
+        if (StringUtils.isBlank(busSalesOrder.getFinancePlan())) {
             return rb.setMsg("单据信息中付款方式请选择");
         }
         return rb.success();
@@ -5483,8 +5484,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
-                }else{
-                    updateNo(bv.getBusinessSid(),busSalesOrder.getContractNo());
+                } else {
+                    updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
                 }
                 busSalesOrder = fetchBySid(bv.getBusinessSid());
                 //==============================修改车辆的持久状态组装数据
@@ -5639,7 +5640,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     }
 
-    public void updateNo(String sid,String contractNo){
+    public void updateNo(String sid, String contractNo) {
         BusSalesOrder busSalesOrder = fetchBySid(sid);
         ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
@@ -6704,8 +6705,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
                 if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
                     saveContract(orderContractQuery);
-                }else{
-                    updateNo(bv.getBusinessSid(),busSalesOrder.getContractNo());
+                } else {
+                    updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
                 }
             }
         } else {
@@ -7171,10 +7172,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
         String kpj = baseMapper.selKpj(contractNo);
-        if (StringUtils.isNotBlank(kpj)){
+        if (StringUtils.isNotBlank(kpj)) {
             busSalesOrderIsDTKPJVo.setIsEdit(true);
             busSalesOrderIsDTKPJVo.setOneBillMoney(kpj);
-        }else {
+        } else {
             busSalesOrderIsDTKPJVo.setIsEdit(false);
             busSalesOrderIsDTKPJVo.setOneBillMoney("");
         }
@@ -7766,7 +7767,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
         //删除销售订单车辆表中的贷款人的名称
-        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid,busSalesOrderBorrower.getSalesOrderSid());
+        List<BusSalesOrderVehicle> 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<BusSalesOrderMapper
                     //-------家访准备补充推送createBySid---------
                     homeVisitDto.setCreateBySid(busSalesOrder.getCreateBySid());
                     loanHomevisitPrepFeign.saveHomeVisit(homeVisitDto);
-                }else{
+                } else {
                     busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
                 }
             }
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<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());
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<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;
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<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
+    public ResultBean<List<BaseManufacturerVo>> 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<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(String useOrgSid) {
+	public ResultBean<List<BaseManufacturerVo>> 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<PagerVo<WmsGoodsPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsGoodsPackageQuery> pq);
+    public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> 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(安瑞财务) <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;
 	}
 }
\ 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("商品名称")