From abbac60849602fe0577f99fe13e91993cde9fd53 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 5 Sep 2024 16:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleBrandRest.java | 8 +- .../sysorganization/SysOrganizationFeign.java | 16 ++++ .../SysOrganizationFeignFallback.java | 20 +++++ .../anrui/portal/api/sysuser/SysUserVo.java | 2 + .../anrui/portal/api/sysuser/app/OrgList.java | 3 + .../SysOrganizationMapper.java | 8 ++ .../sysorganization/SysOrganizationMapper.xml | 73 +++++++++++++++++++ .../sysorganization/SysOrganizationRest.java | 20 +++++ .../SysOrganizationService.java | 16 ++++ .../WmsInventoryAlloSelectList.java | 24 ++++-- .../wmsinventory/WmsInventoryMapper.xml | 17 +++-- .../WmsInventoryAllocateBill.java | 3 +- .../WmsInventoryAllocateBillDetailsVoNew.java | 6 +- .../WmsInventoryAllocateBillDtoNew.java | 6 +- .../WmsInventoryAllocateBillDetail.java | 50 ++++++------- .../WmsInventoryAllocateBillDetailDtoNew.java | 54 +++++++------- ...WmsInventoryAllocateBillDetailService.java | 8 -- ...ventoryAllocatebillDetailDetailsVoNew.java | 54 +++++++------- 18 files changed, 277 insertions(+), 111 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java index ab95799104..7c24b31e80 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandRest.java @@ -64,10 +64,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { ResultBean rb = ResultBean.fireFail(); String brandCode = dto.getBrandCode();//品牌编码 //查询品牌编码是否有重复的 - int count = baseVehicleBrandService.selectCountByBrandCode(brandCode); + /*int count = baseVehicleBrandService.selectCountByBrandCode(brandCode); if (count > 0) { return ResultBean.fireFail().setMsg("品牌编码已存在"); - } + }*/ BaseVehicleBrand entity = new BaseVehicleBrand(); dto.fillEntity(entity); boolean isSave = baseVehicleBrandService.save(entity); @@ -86,10 +86,10 @@ public class BaseVehicleBrandRest implements BaseVehicleBrandFeign { } String brandCode = dto.getBrandCode();//品牌编码 //查询品牌编码是否有重复的 - int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid); + /*int count = baseVehicleBrandService.selectCountByBrandCodeSid(brandCode, sid); if (count > 0) { return ResultBean.fireFail().setMsg("品牌编码已存在"); - } + }*/ int i = baseVehicleBrandService.updateBySid(dto.toMap(), sid); if (i == 0) { return ResultBean.fireFail().setMsg("修改失败"); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index 18fda29e5a..3b6dc92a7c 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -54,6 +54,22 @@ public interface SysOrganizationFeign { @GetMapping("/selectChildrenListBySid/{sid}") public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid); + @ApiOperation("调出一级站-调入当前一级站内所有二级站") + @GetMapping("/tranOne/{sid}") + public ResultBean> tranOne(@PathVariable("sid") String sid); + + @ApiOperation("调出一级站-调入当前分公司内所有一级站，不包含自身") + @GetMapping("/tranTwo/{sid}") + public ResultBean> tranTwo(@PathVariable("sid") String sid); + + @ApiOperation("调出一级站-本集团内调入所有一级站，不包含自身") + @GetMapping("/tranThree/{sid}") + public ResultBean> tranThree(@PathVariable("sid") String sid); + + @ApiOperation("调出二级站-调入上级一级站及站下所有二级站，不包含自身") + @GetMapping("/tranfour/{sid}") + public ResultBean> tranfour(@PathVariable("sid") String sid); + @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@RequestBody SysOrganizationDto dto); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index 86da604ebc..e8c81b494f 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -54,6 +54,26 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问"); } + @Override + public ResultBean> tranOne(String sid) { + return null; + } + + @Override + public ResultBean> tranTwo(String sid) { + return null; + } + + @Override + public ResultBean> tranThree(String sid) { + return null; + } + + @Override + public ResultBean> tranfour(String sid) { + return null; + } + @Override public ResultBean save(SysOrganizationDto dto) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问"); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java index cdb54502bb..58f0f42195 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java @@ -90,6 +90,8 @@ public class SysUserVo implements Vo { private String defaultDeptName; private String defaultDeptSid; + private String defaultOrgAttributeKey; + private String defaultOrgAttributeValue; @ApiModelProperty("是否需要更换密码") private Boolean needResetPsd; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java index 394edef935..f86e1a6b4e 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java @@ -18,4 +18,7 @@ public class OrgList implements Vo { private String deptName; private String deptSid; + + private String orgAttributeKey; + private String orgAttributeValue; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index b869be61a3..a8a832aed0 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -130,4 +130,12 @@ public interface SysOrganizationMapper extends BaseMapper { List selectByOrgDeptSid2(String orgDeptSid); List selectByOrgCodeAndPsid(@Param("orgCode") String orgCode, @Param("pSid") String pSid); + + List tranOne(String sid); + + List tranTwo(String sid); + + List tranThree(String sid); + + List tranfour(String sid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index f865a63a38..95938d9767 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -249,4 +249,77 @@ where psid = #{pSid} and orgCode =#{orgCode} + + + + + + + + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 8713261da6..40d6591de9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -109,6 +109,26 @@ public class SysOrganizationRest implements SysOrganizationFeign { return new ResultBean>().success().setData(sysOrganizationService.selectChildrenListBySid(sid)); } + @Override + public ResultBean> tranOne(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranOne(sid)); + } + + @Override + public ResultBean> tranTwo(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranTwo(sid)); + } + + @Override + public ResultBean> tranThree(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranThree(sid)); + } + + @Override + public ResultBean> tranfour(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.tranfour(sid)); + } + @Override @Transactional(rollbackFor = Exception.class) public ResultBean update(SysOrganizationDto dto, String sid) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 4776975b27..e879117e18 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -719,4 +719,20 @@ public class SysOrganizationService extends MybatisBaseService selectByOrgCodeAndPsid(String orgCode, String pSid) { return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid); } + + public List tranOne(String sid) { + return baseMapper.tranOne(sid); + } + + public List tranTwo(String sid) { + return baseMapper.tranTwo(sid); + } + + public List tranThree(String sid) { + return baseMapper.tranThree(sid); + } + + public List tranfour(String sid) { + return baseMapper.tranfour(sid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java index 92e3835cdd..0638752bf2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java @@ -12,28 +12,36 @@ public class WmsInventoryAlloSelectList { //sid private String sid; - //商品名称 + //商品spuSid + private String goodsSpuSid; + //商品spu名称 private String goodsSpuName; - //零件号 + //商品skuSid + private String goodsSkuSid; + //商品sku名称 + private String goodsSkuTitle; + //图号 private String goodsSkuCode; //规格 private String goodsSkuOwnSpec; - //车型 - private String carModel; + //厂家sid + private String manufacturerSid; + //厂家名称 + private String manufacturerName; //商品单位 private String unit; //仓库sid private String warehouseSid; //仓库名称 private String warehouseName; + //库区sid + private String warehouseAreasid; + //库区名称 + private String warehouseArea; //库位sid private String warehouseRackSid; //库位编码 private String warehouseRackCode; - //库位名称 - private String areaName; - //含税价 - private String taxPrice; //库存数量 private String count; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index dd03252783..cf1504dfd1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -238,20 +238,27 @@