From a151041cc73a7da77bf25a5b1458b95c40dd135b Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 2 Apr 2025 13:51:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/base/WmsWarehouseRackRest.java | 10 +- .../WmsWarehouseInfoMapper.java | 5 +- .../WmsWarehouseInfoMapper.xml | 7 + .../WmsWarehouseInfoService.java | 7 +- .../wms/biz/base/wmswarehouserack/RackVo.java | 11 + .../WmsWarehouseRackMapper.java | 4 +- .../WmsWarehouseRackMapper.xml | 8 + .../WmsWarehouseRackService.java | 9 +- .../WmsOldInventoryExcelVo.java | 6 +- .../wmsoldinventory/WmsOldInventoryMapper.xml | 286 +++++++++++++----- .../WmsOldInventoryPageListQuery.java | 2 + .../WmsOldInventoryRecordList.java | 1 + .../WmsOldInventoryRecordListExcelVo.java | 7 +- .../WmsOldInventoryRecordListQuery.java | 6 +- .../WmsOldInventoryService.java | 249 ++++++++++++--- .../java/com/yxt/wms/utils/OrgPathQuery.java | 1 + 16 files changed, 490 insertions(+), 129 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java index 8d9b3916d2..ff9a4c83da 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java @@ -35,12 +35,20 @@ public class WmsWarehouseRackRest { return wmsWarehouseRackService.listAll(pq); } - @ApiOperation("查询所有的库区") + @ApiOperation("查询所有的库位") @GetMapping("/getAllType") public ResultBean getAllType() { return wmsWarehouseRackService.getAllType(); } + + @ApiOperation("根据库区sid查询所有的库位") + @GetMapping("/getAllRackByKQSid") + public ResultBean> getAllRackByKQSid(@RequestParam("kqSid") String kqSid) { + return wmsWarehouseRackService.getAllRackByKQSid(kqSid); + } + + @ApiOperation("根据库区sid查询所有库位") @GetMapping("/getAllTypeByAreaSid") public ResultBean> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java index 40d5bb544e..bf295fbedc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java @@ -8,7 +8,6 @@ import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; import java.util.List; @@ -29,8 +28,8 @@ public interface WmsWarehouseInfoMapper extends BaseMapper { WmsWarehouseInfo checkCodeForUpdate(@Param("warehouseCode") String warehouseCode, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid); - @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ") - List listAll(@Param("useOrgSid") String useOrgSid); + + List listAll(@Param("useOrgSid") String useOrgSid,@Param("warehouseTypeValue") String warehouseTypeValue); int selectNum(@Param("billCode") String billCode); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml index 9460cceda3..c7d89c98d1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml @@ -29,6 +29,13 @@ from wms_warehouse_info where warehouseCode LIKE concat(#{billCode}, '%') + UPDATE wms_warehouse_info SET isDelete=1 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java index d6cdfa700f..3bc64d7cf3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java @@ -22,7 +22,6 @@ import com.yxt.wms.feign.portal.sysstaffinfo.StaffByRole; import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; -import com.yxt.wms.utils.BillNo; import com.yxt.wms.utils.OrgPathQuery; import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; @@ -128,7 +127,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService list = baseMapper.listAll(useOrgSid); + String warehouseTypeValue = ""; + if (StringUtils.isNotBlank(query.getWarehouseTypeValue())) { + warehouseTypeValue = query.getWarehouseTypeValue(); + } + List list = baseMapper.listAll(useOrgSid,warehouseTypeValue); return rb.success().setData(list); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java new file mode 100644 index 0000000000..4ff6dd4e5e --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java @@ -0,0 +1,11 @@ +package com.yxt.wms.biz.base.wmswarehouserack; + +import lombok.Data; + +@Data +public class RackVo { + + String rackName; + String rackCode; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java index e3eed4976e..140b6bbe75 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -28,4 +26,6 @@ public interface WmsWarehouseRackMapper extends BaseMapper { WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode); List getAllTypeByAreaSid(String areaSid); + + List getAllRackByKQSid(@Param("kqSid") String kqSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml index 954cefc201..41c0900fd7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml @@ -64,4 +64,12 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} and isDelete=0 WHERE locationSid = #{areaSid} AND isDelete = 0 + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java index 36d0290776..45040c4ce2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java @@ -12,7 +12,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea; import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService; -import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone; @@ -22,7 +21,6 @@ import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -290,4 +288,11 @@ public class WmsWarehouseRackService extends MybatisBaseService wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid); return rb.success().setData(wmsWarehouseRackVos); } + + public ResultBean> getAllRackByKQSid(String kqSid) { + ResultBean rb = ResultBean.fireFail(); + List list = baseMapper.getAllRackByKQSid(kqSid); + return rb.success().setData(list); + + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryExcelVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryExcelVo.java index 6ecff78045..d85cea36cb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryExcelVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryExcelVo.java @@ -31,7 +31,7 @@ public class WmsOldInventoryExcelVo { private String goodsSpuName; //商品编码 - @ExportEntityMap(CnName = "商品编码", EnName = "goodsSkuCode") + @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode") private String goodsSkuCode; //厂家 @@ -47,8 +47,8 @@ public class WmsOldInventoryExcelVo { private String unit; //仓库 - @ExportEntityMap(CnName = "仓库", EnName = "warehouseName") - private String warehouseName; + @ExportEntityMap(CnName = "仓库-库区", EnName = "warehouseInfo") + private String warehouseInfo; //库位 @ExportEntityMap(CnName = "库位", EnName = "warehouseRackCode") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml index 5e1651b4e0..ca1337cc7c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml @@ -44,47 +44,134 @@ \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListQuery.java index 03d0fea0f9..c2feb0a55e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListQuery.java @@ -25,6 +25,8 @@ public class WmsOldInventoryPageListQuery implements Query { //库位 private String warehouseRackCode; + //库区 + private String warehouseAreaName; //厂家 private String manufacturerName; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordList.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordList.java index 3070cb7c8f..ce1b93ad9c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordList.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordList.java @@ -33,6 +33,7 @@ public class WmsOldInventoryRecordList { //仓库 private String warehouseName; + private String warehouseAreaName; //库位 private String warehouseRackCode; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListExcelVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListExcelVo.java index a152cbec2c..92c524d18c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListExcelVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListExcelVo.java @@ -27,7 +27,7 @@ public class WmsOldInventoryRecordListExcelVo { private String goodsSpuName; //商品编码 - @ExportEntityMap(CnName = "商品编码", EnName = "goodsSkuCode") + @ExportEntityMap(CnName = "图号", EnName = "goodsSkuCode") private String goodsSkuCode; //厂家 @@ -46,6 +46,11 @@ public class WmsOldInventoryRecordListExcelVo { @ExportEntityMap(CnName = "仓库", EnName = "warehouseName") private String warehouseName; + //仓库 + @ExportEntityMap(CnName = "库区", EnName = "warehouseAreaName") + private String warehouseAreaName; + + //库位 @ExportEntityMap(CnName = "库位", EnName = "warehouseRackCode") private String warehouseRackCode; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListQuery.java index 2aeefff362..e27686be9a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryRecordListQuery.java @@ -22,7 +22,7 @@ public class WmsOldInventoryRecordListQuery implements Query { //仓库 private String warehouseName; - + private String warehouseAreaName; //库位 private String warehouseRackCode; @@ -46,4 +46,8 @@ public class WmsOldInventoryRecordListQuery implements Query { //发生时间结束时间 private String createTimeEnd; + + private String orgPath; + private String userSid; + private String menuUrl; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java index 734fce4f7e..abf8cdf3e4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java @@ -13,19 +13,17 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; -import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventory.WmsUpdateCountQuery; -import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatch; -import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatchService; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecord; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign; import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -194,36 +192,75 @@ public class WmsOldInventoryService extends MybatisBaseService oldPageList(PagerQuery pagerQuery) { WmsOldInventoryPageListQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getGoodsID())) { - qw.like("wi.goodsID", query.getGoodsID()); + qw.like("a.goodsID", query.getGoodsID()); } //商品名称 if (StringUtils.isNotBlank(query.getGoodsSpuName())) { - qw.like("wi.goodsSpuName", query.getGoodsSpuName()); + qw.like("a.goodsSpuName", query.getGoodsSpuName()); } //仓库 if (StringUtils.isNotBlank(query.getWarehouseName())) { - qw.like("wi.warehouseName", query.getWarehouseName()); + qw.like("a.warehouseInfo", query.getWarehouseName()); + } + //库区 + if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { + qw.like("a.warehouseInfo", query.getWarehouseAreaName()); } //库位 if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { - qw.like("wi.warehouseRackCode", query.getWarehouseRackCode()); + qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); } //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("wi.goodsSkuCode", query.getGoodsSkuCode()); + qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); } //ToDo:需测试时添加，待定 //厂家 if (StringUtils.isNotBlank(query.getManufacturerName())) { - qw.like("wib.supplierName", query.getManufacturerName()); + qw.like("a.manufacturerName", query.getManufacturerName()); } //车架号 if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("abbv.vinNo", query.getVinNo()); + qw.like("a.vinNo", query.getVinNo()); } - qw.eq("wi.warehouseName", "旧件仓库"); IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.oldPageList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -243,33 +280,75 @@ public class WmsOldInventoryService extends MybatisBaseService listExcel(WmsOldInventoryPageListQuery query) { + //ToDo:添加查询条件 QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + return new ArrayList<>(); + } + } else { + return new ArrayList<>(); + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getGoodsID())) { - qw.like("wi.goodsID", query.getGoodsID()); + qw.like("a.goodsID", query.getGoodsID()); } //商品名称 if (StringUtils.isNotBlank(query.getGoodsSpuName())) { - qw.like("wi.goodsSpuName", query.getGoodsSpuName()); + qw.like("a.goodsSpuName", query.getGoodsSpuName()); } //仓库 if (StringUtils.isNotBlank(query.getWarehouseName())) { - qw.like("wi.warehouseName", query.getWarehouseName()); + qw.like("a.warehouseInfo", query.getWarehouseName()); + } + //库区 + if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { + qw.like("a.warehouseInfo", query.getWarehouseAreaName()); } //库位 if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { - qw.like("wi.warehouseRackCode", query.getWarehouseRackCode()); + qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); } //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("wi.goodsSkuCode", query.getGoodsSkuCode()); + qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); } //ToDo:需测试时添加，待定 //厂家 + if (StringUtils.isNotBlank(query.getManufacturerName())) { + qw.like("a.manufacturerName", query.getManufacturerName()); + } //车架号 - //车牌号 - - qw.eq("wi.warehouseName", "旧件仓库"); + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("a.vinNo", query.getVinNo()); + } List list = baseMapper.listExcel(qw); list.removeAll(Collections.singleton(null)); return list; @@ -291,48 +370,91 @@ public class WmsOldInventoryService extends MybatisBaseService recordList(PagerQuery pagerQuery) { WmsOldInventoryRecordListQuery query = pagerQuery.getParams(); QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + return new PagerVo(); + } + } else { + return new PagerVo(); + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getGoodsID())) { - qw.like("wir.goodsID", query.getGoodsID()); + qw.like("a.goodsID", query.getGoodsID()); } //商品名称 if (StringUtils.isNotBlank(query.getGoodsSpuName())) { - qw.like("wir.goodsSpuName", query.getGoodsSpuName()); + qw.like("a.goodsSpuName", query.getGoodsSpuName()); } //仓库 if (StringUtils.isNotBlank(query.getWarehouseName())) { - qw.like("wir.warehouseName", query.getWarehouseName()); + qw.like("a.warehouseName", query.getWarehouseName()); } //库位 if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { - qw.like("wir.warehouseRackCode", query.getWarehouseRackCode()); + qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); + } + if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { + qw.like("a.warehouseAreaName", query.getWarehouseAreaName()); } //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("wir.goodsSkuCode", query.getGoodsSkuCode()); + qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); } //ToDo:需测试时添加，待定 //厂家 if (StringUtils.isNotBlank(query.getManufacturerName())) { - qw.like("wir.manufacturerName", query.getManufacturerName()); + qw.like("a.manufacturerName", query.getManufacturerName()); } //车架号 if (StringUtils.isNotBlank(query.getVinNo())) { - qw.like("abbv.vinNo", query.getVinNo()); + qw.like("a.vinNo", query.getVinNo()); } //来源单号 if (StringUtils.isNotBlank(query.getBillNo())) { - qw.like("wir.billNo", query.getBillNo()); + qw.like("a.billNo", query.getBillNo()); } //单据类型 if (StringUtils.isNotBlank(query.getBillType())) { - qw.like("wir.billType", query.getBillType()); + if (query.getBillType().equals("入库")) { + qw.eq("a.billType",1); + } else if (query.getBillType().equals("出库")) { + qw.eq("a.billType",0); + } + } + if (StringUtils.isNotBlank(query.getBusTypeValue())) { + qw.eq("a.busTypeKey", query.getBusTypeValue()); } //单据日期开始时间-单据日期结束时间 - qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" ); - qw.eq("wir.warehouseName", "旧件仓库"); IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.recordList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -341,42 +463,87 @@ public class WmsOldInventoryService extends MybatisBaseService excelRecordList(WmsOldInventoryRecordListQuery query) { QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + return new ArrayList<>(); + } + } else { + return new ArrayList<>(); + } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getGoodsID())) { - qw.like("wir.goodsID", query.getGoodsID()); + qw.like("a.goodsID", query.getGoodsID()); } //商品名称 if (StringUtils.isNotBlank(query.getGoodsSpuName())) { - qw.like("wir.goodsSpuName", query.getGoodsSpuName()); + qw.like("a.goodsSpuName", query.getGoodsSpuName()); } //仓库 if (StringUtils.isNotBlank(query.getWarehouseName())) { - qw.like("wir.warehouseName", query.getWarehouseName()); + qw.like("a.warehouseName", query.getWarehouseName()); + } + if (StringUtils.isNotBlank(query.getWarehouseAreaName())) { + qw.like("a.warehouseAreaName", query.getWarehouseAreaName()); } //库位 if (StringUtils.isNotBlank(query.getWarehouseRackCode())) { - qw.like("wir.warehouseRackCode", query.getWarehouseRackCode()); + qw.like("a.warehouseRackCode", query.getWarehouseRackCode()); } //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { - qw.like("wir.goodsSkuCode", query.getGoodsSkuCode()); + qw.like("a.goodsSkuCode", query.getGoodsSkuCode()); } //ToDo:需测试时添加，待定 //厂家 + if (StringUtils.isNotBlank(query.getManufacturerName())) { + qw.like("a.manufacturerName", query.getManufacturerName()); + } //车架号 + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("a.vinNo", query.getVinNo()); + } //来源单号 if (StringUtils.isNotBlank(query.getBillNo())) { - qw.like("wir.billNo", query.getBillNo()); + qw.like("a.billNo", query.getBillNo()); } //单据类型 if (StringUtils.isNotBlank(query.getBillType())) { - qw.like("wir.billType", query.getBillType()); + qw.eq("a.billType",query.getBillType()); + } + if (StringUtils.isNotBlank(query.getBusTypeValue())) { + qw.eq("a.busTypeKey", query.getBusTypeValue()); } //单据日期开始时间-单据日期结束时间 - qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (wir.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (wir.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" ); - qw.eq("wir.warehouseName", "旧件仓库"); List list = baseMapper.excelRecordList(qw); list.removeAll(Collections.singleton(null)); return list; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java index cafa4fc278..36a6247797 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/OrgPathQuery.java @@ -10,4 +10,5 @@ import lombok.Data; @Data public class OrgPathQuery { private String orgPath; + private String warehouseTypeValue; } From 376180f8cf321b44897c88cad9f3d0ef3f414f1d Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 2 Apr 2025 14:56:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentrecordService.java | 129 ++++++++++-------- .../ScmSpecialRebateWithApplyService.java | 21 ++- .../ScmVehRebateWithApplyService.java | 9 ++ 3 files changed, 94 insertions(+), 65 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 095cb0ab2e..235995669b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -70,8 +70,12 @@ import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedR import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService; import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.flow.FlowableFeign; import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; +import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign; +import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo; +import com.yxt.anrui.portal.api.sysmapping.SysMappingListInfoQuery; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -186,8 +190,8 @@ public class FinPaymentrecordService extends MybatisBaseService voucherResultDetailDtos = new ArrayList<>(); - Voucher.VoucherResultDetailDto voucherResultDetailDto = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoJF = new Voucher.VoucherResultDetailDto(); + Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); + FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(finPaymentrecord.getPayBankAccount(), finPaymentrecord.getUseOrgSid()).getData(); + if (null != manufacturerBank) { + if (manufacturerBank.getDueBankKey().equals("02")) { + voucherResultDetailDtoDf.setSubjectNo("1002.01.00"); + } else if (manufacturerBank.getDueBankKey().equals("01")) { + voucherResultDetailDtoDf.setSubjectNo("1002.02.01"); + } + } if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金 //借方 - voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); - voucherResultDetailDto.setSubjectNo("1009.03"); + voucherResultDetailDtoJF.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDtoJF.setSubjectNo("1009.03"); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData(); - voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode()); + voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode()); String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData(); - voucherResultDetailDto.setBank(key); - voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString()); - voucherResultDetailDtos.add(voucherResultDetailDto); + voucherResultDetailDtoJF.setBank(key); + voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoJF); //贷方 - voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); - voucherResultDetailDto.setSubjectNo("1002.01.00"); - voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount()); - voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString()); - voucherResultDetailDtos.add(voucherResultDetailDto); + voucherResultDetailDtoDf.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount()); + voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf); } else if ("016".equals(finPaymentrecord.getCostTitleKey())) {//银行手续费 //借方 - voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); - voucherResultDetailDto.setSubjectNo("6603.03.00"); - voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString()); - voucherResultDetailDtos.add(voucherResultDetailDto); + voucherResultDetailDtoJF.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDtoJF.setSubjectNo("6603.03.00"); + voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoJF); //贷方 - voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue()); - voucherResultDetailDto.setSubjectNo("1002.01.00"); - voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount()); - voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString()); - voucherResultDetailDtos.add(voucherResultDetailDto); + voucherResultDetailDtoDf.setSummary("付" + finPaymentrecord.getCostTitleValue()); + voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount()); + voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf); } else if ("017".equals(finPaymentrecord.getCostTitleKey())) {//金融服务费 //借方 - voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); - voucherResultDetailDto.setSubjectNo("6603.03.00"); - voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString()); - voucherResultDetailDtos.add(voucherResultDetailDto); + voucherResultDetailDtoJF.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost()); + voucherResultDetailDtoJF.setSubjectNo("6603.03.00"); + voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoJF); //贷方 - voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue()); - voucherResultDetailDto.setSubjectNo("1002.01.00"); - voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount()); - voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString()); - voucherResultDetailDtos.add(voucherResultDetailDto); + voucherResultDetailDtoDf.setSummary("付" + finPaymentrecord.getCostTitleValue()); + voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount()); + voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString()); + voucherResultDetailDtos.add(voucherResultDetailDtoDf); } else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())) {//平仓款 //查询平仓总付款金额 FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid()); @@ -1698,43 +1708,42 @@ public class FinPaymentrecordService extends MybatisBaseService specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(dtoSid); + for (String specialRebateSid : specialRebateSids) { + scmSpecialRebateService.updateState(specialRebateSid, 0); + } + } this.updateByDto(dto); scmSpecialRebateWithService.delByMainSid(dtoSid); for (ScmSpecialRebateWithDto scmSpecialRebateWithDto : scmSpecialRebateWiths) { @@ -265,6 +272,9 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); for (String specialRebateSid : specialRebateSids) { - scmSpecialRebateService.updateState(specialRebateSid,0); + scmSpecialRebateService.updateState(specialRebateSid, 0); } return rb.success().setData(resultBean.getData()); } else { @@ -714,7 +725,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); for (String specialRebateSid : specialRebateSids) { - scmSpecialRebateService.updateState(specialRebateSid,0); + scmSpecialRebateService.updateState(specialRebateSid, 0); } return rb.success().setData(resultBean.getData()); } @@ -793,7 +804,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService scmSpecialRebateWiths = scmSpecialRebateWithApplyDetailsVo.getScmSpecialRebateWiths(); Map dataMap = new HashMap(); //标题 - dataMap.put("title",scmSpecialRebateWithApplyDetailsVo.getWithApply() + "专项返利预提审批"); + dataMap.put("title", scmSpecialRebateWithApplyDetailsVo.getWithApply() + "专项返利预提审批"); //分公司 dataMap.put("useOrgName", scmSpecialRebateWithApplyDetailsVo.getCreateOrgName()); //创建部门 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 3fcf4ddcb0..348a80c048 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -277,6 +277,12 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService scmVehRebateWithDetailsVos = scmVehRebateWithService.selByMainSid(dtoSid); + for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) { + scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(), 0); + } + } scmVehRebateWithService.delByMainSid(dtoSid); for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) { List vehRebateSids = scmVehRebateWith.getVehRebateSids(); @@ -285,6 +291,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService