From 32c5df7f3ed35f51f00a4aa52ac71757ff26df5b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 22 Aug 2024 16:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=BC=80=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/smssalesbill/SmsSalesBillMapper.xml | 2 +- .../smssalesbill/SmsWmsInventorySalesVo.java | 2 +- .../apiadmin/inventroy/WmsInventoryRest.java | 8 +++ .../wmsinventory/FittingsInventoryQuery.java | 2 + .../wmsinventory/WmsInventoryService.java | 63 +++++++++++-------- .../WmsOldInventoryPageListQuery.java | 3 + .../WmsOldInventoryPageListVo.java | 2 + 7 files changed, 55 insertions(+), 27 deletions(-) diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index 672c163d6e..b228510ba5 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -103,7 +103,7 @@ SELECT i.sid inventorySid, s.price, - i.goodSpuSid, + i.goodsSpuSid, i.goodsSkuSid, i.goodsSpuName, i.goodsSkuCode, diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java index a17c081261..400288b512 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsWmsInventorySalesVo.java @@ -14,7 +14,7 @@ public class SmsWmsInventorySalesVo implements Vo { //商品sid - private String goodSpuSid; + private String goodsSpuSid; private String goodsSkuSid; //商品名称 private String goodsSpuName; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index 1f8cd0412d..b2624c0359 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -50,6 +50,14 @@ public class WmsInventoryRest { return rb.success().setData(pv); } + @ApiOperation("配件库存查询") + @PostMapping("/fittingsInventory2") + public ResultBean> fittingsInventory2(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryService.fittingsInventory(pq); + return rb.success().setData(pv); + } + @ApiOperation("分页列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java index f8e40bee14..e8b675f783 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/FittingsInventoryQuery.java @@ -11,6 +11,8 @@ import lombok.Data; @Data public class FittingsInventoryQuery implements Query { + private String name; + private String menuSid; /** * 供应商 */ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 4452c4062f..aa63659876 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -626,37 +626,40 @@ public class WmsInventoryService extends MybatisBaseService 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)) { + if (StringUtils.isNotBlank(query.getMenuUrl())) { + 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("wsb.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } } else { PagerVo p = new PagerVo<>(); return p; } - } else { - PagerVo p = new PagerVo<>(); - return p; } //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillObjName())) { @@ -680,6 +683,16 @@ public class WmsInventoryService extends MybatisBaseService wrapper.like("a.billObjName", query.getName()) + .or().like("a.deptName", query.getName()) + .or().like("a.goodsSkuCode", query.getName()) + .or().like("a.goodsSpuName", query.getName()) + .or().like("a.manufacturerName", query.getName()) + .or().like("a.useOrgName", query.getName()) + .or().like("a.warehouseName", query.getName()) + ); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.fittingsInventory(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); 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 d0d91b1197..03d0fea0f9 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 @@ -35,4 +35,7 @@ public class WmsOldInventoryPageListQuery implements Query { private String createBySid; private String orgPath; + private String menuUrl; + private String userSid; + private String sourceBillNo; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListVo.java index 390917b32c..3450851bbc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPageListVo.java @@ -42,4 +42,6 @@ public class WmsOldInventoryPageListVo { //库存数量 private String inventoryCount; + private String sourceBillNo; //维修单号 + private String warehouseInfo; //仓库-库区 }