From fecbd840976fbf45db9caddd7f0a7e5b82d2c563 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 25 May 2022 10:47:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemodelconfig/BaseModelConfig.java | 3 + .../basemodelconfig/BaseModelConfigDto.java | 3 + .../basemodelconfig/BaseModelConfigVo.java | 11 +++- .../BaseVehicleModelDetailsVo.java | 16 +++-- .../BaseVehicleModelFeign.java | 13 +++- .../BaseVehicleModelFeignFallback.java | 6 ++ .../BaseVehicleModelQuery.java | 4 ++ .../basevehiclemodel/BaseVehicleModelVo.java | 2 + .../BaseVehmodelConfigFeign.java | 6 +- .../BaseVehmodelConfigFeignFallback.java | 5 +- .../basemodelconfig/BaseModelConfigRest.java | 16 +++++ .../BaseVehicleModelMapper.java | 1 + .../BaseVehicleModelMapper.xml | 7 +- .../BaseVehicleModelRest.java | 9 +++ .../BaseVehicleModelService.java | 65 ++++++++++++++++--- .../BaseVehmodelConfigMapper.java | 4 ++ .../BaseVehmodelConfigMapper.xml | 8 +++ .../BaseVehmodelConfigRest.java | 8 ++- .../BaseVehmodelConfigService.java | 26 ++++++-- .../api/scmmaterial/ScmMaterialDetailsVo.java | 3 +- .../ScmRealTimeInventoryVo.java | 2 +- .../anrui/scm/api/scmreturn/ScmReturnVo.java | 4 +- .../scm/biz/scmmaterial/ScmMaterialMapper.xml | 1 + .../biz/scmmaterial/ScmMaterialService.java | 16 ----- .../ScmRealTimeInventoryService.java | 4 +- .../scm/biz/scmreturn/ScmReturnService.java | 30 +-------- 26 files changed, 191 insertions(+), 82 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java index a30f5b4c53..04f7797ff8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java @@ -131,6 +131,9 @@ public class BaseModelConfig extends BaseEntity { @ApiModelProperty("货箱(重汽、欧曼)") private String packingCase; + @ApiModelProperty("货箱key(重汽、欧曼)") + private String packingCaseKey; + /* @ApiModelProperty("上装装置(欧曼)") private String installingDevice;*/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java index 7326b37cb0..c8197099a7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java @@ -130,6 +130,9 @@ public class BaseModelConfigDto implements Dto { @ApiModelProperty("货箱(重汽、欧曼)") private String packingCase; + @ApiModelProperty("货箱key(重汽、欧曼)") + private String packingCaseKey; + /* @ApiModelProperty("上装装置(欧曼)") private String installingDevice;*/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java index 1a4823a112..43d0efdced 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java @@ -95,7 +95,10 @@ public class BaseModelConfigVo implements Vo { private String suspension; @ApiModelProperty("货箱(重汽、欧曼)") private String packingCase; - /* @ApiModelProperty("上装装置(欧曼)") + @ApiModelProperty("货箱key(重汽、欧曼)") + private String packingCaseKey; + + /* @ApiModelProperty("上装装置(欧曼)") private String installingDevice;*/ @ApiModelProperty("座椅key") private String seatKey; @@ -125,6 +128,12 @@ public class BaseModelConfigVo implements Vo { private String configName; @ApiModelProperty(value = "备注") private String remarks; + @ApiModelProperty(value = "关联状态(1已关联,0未关联)") + private Integer isRelationState; + @ApiModelProperty(value = "使用状态(1已使用,0未使用)") + private Integer isUseState; + @ApiModelProperty(value = "销售指导价") + private String guidedPrice; /* @ApiModelProperty(value = "车型名称") private String modelName; @ApiModelProperty(value = "发动机型号") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java index dcb14e255c..f31764c8e6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java @@ -7,6 +7,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author dimengzhe * @date 2021/9/29 8:53 @@ -63,10 +65,6 @@ public class BaseVehicleModelDetailsVo implements Vo { private String engineType; @ApiModelProperty(value = "发动机型号value") private String engineTypeValue; - @ApiModelProperty("系列key") - private String series; - @ApiModelProperty("系列value") - private String seriesValue; /* @ApiModelProperty(value = "悬架key") private String suspension; @ApiModelProperty(value = "悬架value值") @@ -109,9 +107,15 @@ public class BaseVehicleModelDetailsVo implements Vo { @ApiModelProperty(value = "内部编码(欧曼特有)") private String insideCode; - @ApiModelProperty(value = "系别(欧曼特有)") + @ApiModelProperty(value = "车型编码") + private String vehicleTypeCode; + + @ApiModelProperty(value = "系别key(欧曼特有)") private String department; + @ApiModelProperty(value = "系别value(欧曼特有)") + private String departmentValue; + /*@ApiModelProperty(value = "是否常用车型") private Integer isCommonModel;*/ @@ -119,5 +123,5 @@ public class BaseVehicleModelDetailsVo implements Vo { private Integer isDel; @ApiModelProperty("简述配置信息") - private BaseModelConfigVo baseModelConfigVo; + private List baseModelConfigVo; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java index f7e72dedd8..e6b5d60a42 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java @@ -74,7 +74,7 @@ public interface BaseVehicleModelFeign { @ApiOperation("车型图片上传") @ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class) @PostMapping("/pictureUpload") - public ResultBean pictureUpload (@RequestParam("modelSid") String modelSid, @RequestParam(value = "file") MultipartFile file); + public ResultBean pictureUpload(@RequestParam("modelSid") String modelSid, @RequestParam(value = "file") MultipartFile file); /** * 删除、批量删除 @@ -108,7 +108,6 @@ public interface BaseVehicleModelFeign { public ResultBean getAll(@PathVariable("sid") String sid); - /** * 车型列表导出 * @@ -194,4 +193,14 @@ public interface BaseVehicleModelFeign { @ApiOperation("新增意向车型选择车型查询车型列表") @PostMapping("/listPageByVehmodel") public ResultBean> listPageByVehmodel(@RequestBody PagerQuery pq); + + /** + * 根据常用配置sid查询关联车型 + * + * @return + */ + @ApiOperation("根据常用配置sid查询关联车型") + @PostMapping("/selectVehModelByConfigSid") + public ResultBean> selectVehModelByConfigSid(@RequestBody PagerQuery pagerQuery); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java index 4591b77cd9..c588a43915 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java @@ -108,6 +108,12 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { return null; } + @Override + public ResultBean> selectVehModelByConfigSid(PagerQuery pagerQuery) { + return null; + } + + /*@Override public ResultBean> selectPage(PagerQuery query) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java index e28673ce19..394bdb0136 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java @@ -23,6 +23,10 @@ import lombok.Data; @Data public class BaseVehicleModelQuery implements Query { + @ApiModelProperty(value = "常用配置sid") + private String configSid; + @ApiModelProperty(value = "车型sid") + private String modelSid; @ApiModelProperty(value = "品牌sid") private String carBrand; @ApiModelProperty(value = "功能key") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java index 2d1a5c98d7..87afa45e5a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java @@ -28,6 +28,8 @@ public class BaseVehicleModelVo implements Vo { @ApiModelProperty(value = "车型sid") private String sid; + @ApiModelProperty(value = "配置sid") + private String configSid; @ApiModelProperty(value = "品牌名称") private String brandName; @ApiModelProperty(value = "车辆类型(牵引车、挂车等)") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java index 6ea081b664..927f10bfaf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java @@ -34,6 +34,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Project: anrui-base(车型信息)
* File: BaseVehmodelConfigFeign.java
@@ -69,7 +73,7 @@ public interface BaseVehmodelConfigFeign { @ApiOperation("车型与常用配置解除关联关系") @DeleteMapping("/checkRelieve") - public ResultBean checkRelieve(@RequestParam("modelSid") String modelSid, @RequestParam("configurationItemsSid") String configurationItemsSid); + public ResultBean checkRelieve(@RequestBody List> maps); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java index 58b0cd45c6..cc0a10a1f6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java @@ -31,6 +31,9 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; + /** * Project: anrui-base(车型信息)
* File: BaseVehmodelConfigFeignFallback.java
@@ -64,7 +67,7 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign } @Override - public ResultBean checkRelieve(String modelSid, String configurationItemsSid) { + public ResultBean checkRelieve(List> maps) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java index 1af227feef..1dab671675 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.*; import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; +import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -44,12 +46,26 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { private BaseModelConfigService baseModelConfigService; @Autowired private BaseVehicleModelService baseVehicleModelService; + @Autowired + private BaseVehmodelConfigService baseVehmodelConfigService; @Override public ResultBean> pagerList(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); IPage page = baseModelConfigService.pagerList(pagerQuery); + List records = page.getRecords(); + for (BaseModelConfigVo record : records) { + String sid = record.getSid(); + List baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(sid); + if (baseVehmodelConfigVos.size() > 0){ + record.setIsRelationState(1); + record.setIsUseState(1); + }else { + record.setIsRelationState(0); + record.setIsUseState(0); + } + } PagerVo pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); return rb.success().setData(pv1); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java index c6e3a3ea9b..58569d77c1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java @@ -147,4 +147,5 @@ public interface BaseVehicleModelMapper extends BaseMapper { IPage listPageByVehmodel(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml index ca75a6917e..1fec5715e3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml @@ -159,17 +159,13 @@ + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java index 23ff4de69f..6a7b3a45b6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java @@ -37,6 +37,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Project: anrui-base(车型信息)
* File: BaseVehmodelConfigFeignFallback.java
@@ -84,8 +88,8 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { } @Override - public ResultBean checkRelieve(String modelSid, String configurationItemsSid) { - return baseVehmodelConfigService.checkRelieve(modelSid, configurationItemsSid); + public ResultBean checkRelieve(List> maps) { + return baseVehmodelConfigService.checkRelieve(maps); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 84bacca3c6..0c822487d1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -46,7 +46,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * Project: anrui-base(车型信息)
@@ -415,14 +417,18 @@ public class BaseVehmodelConfigService extends MybatisBaseService> maps) { ResultBean rb = ResultBean.fireFail(); - BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid); - if (vo == null) { - return rb.setMsg("当前常用配置信息未关联当前车型,请重新选择"); + for (Map map : maps) { + String modelSid = map.get("modelSid"); + String configurationItemsSid = map.get("configurationItemsSid"); + BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid); + if (vo == null) { + return rb.setMsg("当前常用配置信息未关联当前车型,请重新选择"); + } + String sid = vo.getSid(); + deleteBySid(sid); } - String sid = vo.getSid(); - deleteBySid(sid); return rb.success().setMsg("解除成功"); } @@ -510,4 +516,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService getListByConfigSid(String sid) { + return baseMapper.getListByConfigSid(sid); + } + + public List getVehModByModelSid(String sid) { + return baseMapper.getVehModByModelSid(sid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java index d634fcaa17..e206f19ac0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmmaterial/ScmMaterialDetailsVo.java @@ -17,7 +17,8 @@ public class ScmMaterialDetailsVo implements Vo { private static final long serialVersionUID = -501888339245178616L; @ApiModelProperty("使用组织sid全路径") - private String[][] useOrgSid; + private String useOrgSid; + @ApiModelProperty(value = "使用组织名称") private String useOrg; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java index 9ab2933e84..df3c7eb825 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmrealtimeinventory/ScmRealTimeInventoryVo.java @@ -74,7 +74,7 @@ public class ScmRealTimeInventoryVo implements Vo { private String availableQuantity; // 可用量(主单位) @ApiModelProperty("库存组织sid") - private String[][] stockOrgNameSid; // 库存组织sid + private String stockOrgNameSid; // 库存组织sid @ApiModelProperty("库存组织") private String stockOrgName; // 库存组织 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java index fe56959dca..bcb717bb4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmreturn/ScmReturnVo.java @@ -78,7 +78,7 @@ public class ScmReturnVo implements Vo { private String returnCustomer; // 退货客户 @ApiModelProperty("库存组织sid") - private String[][] stockOrgSid; // 库存组织sid + private String stockOrgSid; // 库存组织sid @ApiModelProperty("库存组织") private String stockOrgName; // 库存组织 @@ -117,7 +117,7 @@ public class ScmReturnVo implements Vo { private String warehouseKeeperName; // 仓管员 @ApiModelProperty("销售组织sid") - private String[][] salesOrgSid; // 销售组织sid + private String salesOrgSid; // 销售组织sid @ApiModelProperty("销售组织") private String salesOrgName; // 销售组织 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml index 85efbab84d..90f294fbff 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialMapper.xml @@ -53,6 +53,7 @@ SELECT sid, useOrg, + useOrgSid, createOrg, createOrgSid, remarks, diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java index 997e26bc96..a0f715ce52 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmmaterial/ScmMaterialService.java @@ -165,23 +165,7 @@ public class ScmMaterialService extends MybatisBaseService list = Arrays.asList(scmMaterial.getUseOrgSid().split(",")); - String[][] s = new String[list.size()][]; - for (int i = 0; i < list.size(); i++) { - String[] list1 = {}; - //根据使用组织查询上级 - ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i)); - if (resultBean.getSuccess()) { - list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(","); - } - s[i] = list1; - } - scmMaterialDetailsVo.setUseOrgSid(s); - } return scmMaterialDetailsVo; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java index a473a75783..fbe9f086c1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmrealtimeinventory/ScmRealTimeInventoryService.java @@ -182,7 +182,7 @@ public class ScmRealTimeInventoryService extends MybatisBaseService list = Arrays.asList(entity.getStockOrgNameSid().split(",")); String[][] s = new String[list.size()][]; for (int i = 0; i < list.size(); i++) { @@ -195,7 +195,7 @@ public class ScmRealTimeInventoryService extends MybatisBaseService list = dto.getList(); for (ScmReturnDetailDto scmReturnDetailDto : list) { @@ -352,20 +352,6 @@ public class ScmReturnService extends MybatisBaseService list = scmReturnDetailService.details(sid); scmReturnVo.setList(list); } - if (StringUtils.isNotBlank(scmReturn.getStockOrgSid())) { //库存组织sid - List list = Arrays.asList(scmReturn.getStockOrgSid().split(",")); - String[][] s = new String[list.size()][]; - for (int i = 0; i < list.size(); i++) { - String[] list1 = {}; - //根据使用组织查询上级 - ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i)); - if (resultBean.getSuccess()) { - list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(","); - } - s[i] = list1; - } - scmReturnVo.setStockOrgSid(s); - } if (StringUtils.isNotBlank(scmReturn.getStockDepSid())) { //库存部门sid List list = Arrays.asList(scmReturn.getStockDepSid().split(",")); String[][] s = new String[list.size()][]; @@ -380,20 +366,6 @@ public class ScmReturnService extends MybatisBaseService list = Arrays.asList(scmReturn.getSalesOrgSid().split(",")); - String[][] s = new String[list.size()][]; - for (int i = 0; i < list.size(); i++) { - String[] list1 = {}; - //根据使用组织查询上级 - ResultBean resultBean = sysOrganizationFeign.selectBySid(list.get(i)); - if (resultBean.getSuccess()) { - list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(","); - } - s[i] = list1; - } - scmReturnVo.setSalesOrgSid(s); - } return rb.success().setData(scmReturnVo); }