diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index 3c80ba9373..625b35db3d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java @@ -190,4 +190,10 @@ public interface BaseManufacturerFeign { @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}") @ResponseBody ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid); + + @ApiOperation("根据车型sid查询品牌、厂商等信息") + @GetMapping("/getManDetails/{modelSid}") + @ResponseBody + ResultBean getManDetails(@PathVariable("modelSid")String modelSid); + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index 505866be1d..b8c8a8a9cd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java @@ -115,4 +115,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { return null; } + + @Override + public ResultBean getManDetails(String modelSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java new file mode 100644 index 0000000000..22836401ac --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseOutManuVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.base.api.basemanufacturer; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/19 16:28 + * @Description + */ +@Data +public class BaseOutManuVo implements Vo { + private static final long serialVersionUID = 1493324794029065913L; + @ApiModelProperty("品牌sid") + private String brandSid; + @ApiModelProperty("品牌名称") + private String brandName; + @ApiModelProperty("厂商sid") + private String manufacturerSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java index a50c061889..27061894c4 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java @@ -126,4 +126,6 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo { private CommonAppendixVo contract; // 备注 @ApiModelProperty("外采车辆列表") private List baseOutsourcingApplicationVehicleVos; // 外采车辆列表 + + private String createBySid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index 7a2e5235f0..f2738dc97c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java @@ -135,4 +135,6 @@ public interface BaseManufacturerMapper extends BaseMapper { List selectByMank(@Param("mankSid") String s, @Param("type") String type, @Param("orgSid") String orgSid); int updateMank(@Param("sid") String sid, @Param("name") String name, @Param("createName") String name1); + + BaseOutManuVo getManDetails(String modelSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index df1323a4b5..21fd3c748d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -288,7 +288,7 @@ where createOrg = #{orgSid} and manBankSid = #{mankSid} and supplierTypeValue = #{type} - AND isDelete = 0 + AND isDelete = 0 @@ -298,4 +298,11 @@ manufacturerName = #{name} where sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index d9a64a91b6..165aff7acc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -203,6 +203,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { @Override public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { - return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid,manufacturerSid); + return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid); + } + + @Override + public ResultBean getManDetails(String modelSid) { + return baseManufacturerService.getManDetails(modelSid); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 0d14d0914b..2498f26d06 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -630,4 +630,10 @@ public class BaseManufacturerService extends MybatisBaseService getManDetails(String modelSid) { + ResultBean rb = ResultBean.fireFail(); + BaseOutManuVo vo = baseMapper.getManDetails(modelSid); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java index 9cb109b167..eda41e18af 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryListPageQuery.java @@ -7,6 +7,7 @@ import lombok.Data; @Data public class AppScmVehicleStayInventoryListPageQuery implements Query { + private static final long serialVersionUID = 5599273643899587257L; @ApiModelProperty("用户sid") private String userSid; @@ -17,5 +18,5 @@ public class AppScmVehicleStayInventoryListPageQuery implements Query { private String warehouseSid; @ApiModelProperty("使用组织分公司sid") - private String useOrgSid; + private String orgPath; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 21729f65f6..7c55945046 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -32,6 +32,8 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; +import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; @@ -46,6 +48,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; @@ -114,6 +117,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -357,7 +362,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid); + if (sysUserInfoVoResultBean.getSuccess()) { + SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData(); + if (sysUserInfoVo != null) { + String orgDeptSid = sysUserInfoVo.getOrgSid(); + //采购系统及sid + baseVehicleDto.setPurchaseSystemSid(orgDeptSid); + baseVehicleDto.setPurchaseSystemName(sysUserInfoVo.getOrgName()); + } + } + //根据车型sid查询品牌及名称及厂商sid + ResultBean resultBeanBaseManu = baseManufacturerFeign.getManDetails(scmVehicleEnterlibrary.getModelSid()); + baseVehicleDto.setSupplierSid(applicationDetailsVo.getPurchasingUnitSid()); + if (resultBeanBaseManu.getData() != null) { + baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid()); + baseVehicleDto.setCarBrandSid(resultBeanBaseManu.getData().getBrandSid()); + baseVehicleDto.setCarBrandName(resultBeanBaseManu.getData().getBrandName()); + } } baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName()); @@ -404,6 +431,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService list = new ArrayList<>(); list.add(baseVehicleDto); baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index 5571196b22..9f9f5ec62c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -28,32 +28,25 @@ package com.yxt.anrui.scm.biz.scmvehicleinventory; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.itextpdf.text.pdf.PRAcroForm; -import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleinventory.*; -import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleStayInventoryQuery; import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDto; -import com.yxt.anrui.scm.api.scmvehiclestayinventory.*; -import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthVo; +import com.yxt.anrui.scm.api.scmvehiclestayinventory.ScmVehicleStayInventoryVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo; import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService; import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService; import com.yxt.common.base.config.component.FileUploadComponent; -import com.yxt.common.core.result.ResultBean; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - - -import org.apache.ibatis.annotations.Param; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -61,7 +54,6 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.List; @@ -220,15 +212,19 @@ public class ScmVehicleInventoryService extends MybatisBaseService getInventoryList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); QueryWrapper qw = new QueryWrapper<>(); + AppScmVehicleStayInventoryListPageQuery query = pagerQuery.getParams(); + String orgPath = query.getOrgPath(); + String userSid = query.getUserSid(); + if(StringUtils.isBlank(orgPath)){ + orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } + if(StringUtils.isNotBlank(orgPath)){ + qw.eq("createOrgSid", orgPath); + } + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); qw.eq("isDelete", 0); qw.eq("InventoryState", "无"); - if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) { - qw.eq("createOrgSid", pagerQuery.getParams().getUseOrgSid()); - } if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) { qw.eq("locationSid", pagerQuery.getParams().getWarehouseSid()); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java index 07ad82e6e4..40af9e69b6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/AppScmVehicleInventoryFeign.java @@ -48,7 +48,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "盘库记录") @FeignClient( - contextId = "anrui-scm-ScmVehicleInventory", + contextId = "anrui-terminal-ScmVehicleInventory", name = "anrui-terminal", path = "/supplychain/v1/inventory", fallback = AppScmVehicleInventoryFeignFallback.class) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java index 1e1d06fc3c..e3418b733c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/InventoryListPageQuery.java @@ -7,13 +7,14 @@ import lombok.Data; @Data public class InventoryListPageQuery implements Query { + private static final long serialVersionUID = 5831697424231715724L; @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("优先匹配车架号 盘库人员") private String names; - @ApiModelProperty("存放地点 “”/null 全部 有值时只查询当前存放地点的记录") private String warehouseSid; + @ApiModelProperty("机构sid") + private String orgPath; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java index b60112c0e8..fb08f9c1af 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java @@ -61,17 +61,17 @@ import javax.validation.Valid; fallback = AppScmVehicleGressionFeignFallback.class) public interface AppScmVehicleGressionFeign { - @ApiOperation("手机端-获取车辆移位列表") + @ApiOperation("手机端-获取车辆移位列表:已添加机构sid") @PostMapping("/getCarTransferList") @ResponseBody public ResultBean> getCarTransferList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("手机端-保存车库移库信息") + @ApiOperation("手机端-保存车库移库信息:已添加机构sid") @PostMapping("/saveCarTransferInfo") @ResponseBody public ResultBean saveCarTransferInfo(@Valid @RequestBody AppGressionDto dto); - @ApiOperation("手机端-初始化移库申请") + @ApiOperation("手机端-初始化移库申请:已添加机构sid") @GetMapping("/getCarTransferInfo/{sid}/{userSid}") @ResponseBody public ResultBean getCarTransferInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java index 334165bd28..7702b252d6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java @@ -42,7 +42,6 @@ import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import org.apache.axis.i18n.RB; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -145,11 +144,6 @@ public class AppScmVehicleGressionService { ResultBean rb = ResultBean.fireFail(); SubmitCarTransferDto submitCarTransferDto = new SubmitCarTransferDto(); BeanUtil.copyProperties(dto, submitCarTransferDto); -// //根据车架号查询车辆sid -// ResultBean stringResultBean = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()); -// if (stringResultBean.getSuccess()) { -// submitCarTransferDto.setVehicleSid(stringResultBean.getData().getSid()); -// } ResultBean resultBean = scmVehicleGressionFeign.submitCarTransfer(submitCarTransferDto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg());