From 8b46eeff95fdd1ad3570972ef81ef982cba2b710 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 26 Jun 2024 15:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=95=86=E5=93=81=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=A0=87=E7=AD=BE=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 7 +++ .../yxt/wms/apiadmin/inventroy/WmsH5Rest.java | 49 +++++++++++++++ .../wmsgoodstag/WmsGoodsTagService.java | 1 + .../wmsinventory/WmsInventoryMapper.java | 10 ++++ .../wmsinventory/WmsInventoryMapper.xml | 49 +++++++++++++++ .../wmsinventory/WmsInventoryService.java | 60 ++++++++++++++++++- .../wmsinventory/appH5/GoodsListTagH5Vo.java | 26 ++++++++ .../wmsinventory/appH5/GoodsTagH5Vo.java | 42 +++++++++++++ .../wmsinventory/appH5/HouseRackH5Vo.java | 33 ++++++++++ .../wmsinventory/appH5/HouseRackListVo.java | 38 ++++++++++++ 10 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsListTagH5Vo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTagH5Vo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java diff --git a/anrui-gateway/src/main/resources/application.yml b/anrui-gateway/src/main/resources/application.yml index ede2858327..705bc32451 100644 --- a/anrui-gateway/src/main/resources/application.yml +++ b/anrui-gateway/src/main/resources/application.yml @@ -135,6 +135,11 @@ spring: - StripPrefix=1 ignore: whites: + + - /wms/apiadmin/WmsH5/house #扫描库位标签详情页 + - /wms/apiadmin/WmsH5/goods #扫描商品标签详情页 + + - /portal/v1/regions/treeList - /portal/v1/sysuser/reGetPwd #忘记密码 - /portal/v1/sysuser/login #pc端登录 @@ -190,6 +195,8 @@ ignore: - /portal/v1/appuser/updateAppId #解绑用户的appId + + whitesTwo: #包含所有 ###swagger相关开始 - /doc.html diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java new file mode 100644 index 0000000000..abdadbf036 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java @@ -0,0 +1,49 @@ +package com.yxt.wms.apiadmin.inventroy; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.inventory.wmsgoodstag.app.AppTagInit; +import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author Fan + * @description + * @date 2024/6/26 8:52 + */ +@Api(tags = "扫描标签") +@RestController +@RequestMapping("/apiadmin/WmsH5") +public class WmsH5Rest { + + @Autowired + private WmsInventoryService wmsInventoryService; + + @GetMapping("house") + @ApiOperation("扫描库位标签看详情") + ResultBean scanHouseTag(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + HouseRackH5Vo vo = wmsInventoryService.scanHouseTag(sid); + if (null == vo) { + return rb.fail(); + } + return rb.success().setData(vo); + } + + @GetMapping("goods") + @ApiOperation("扫描商品标签看详情") + ResultBean scanGoodsTag(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + GoodsTagH5Vo vo = wmsInventoryService.scanGoodsTag(sid); + if (null == vo) { + return rb.fail(); + } + return rb.success().setData(vo); + } + + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java index c313c762b2..1dfb8a15f5 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java @@ -73,6 +73,7 @@ public class WmsGoodsTagService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.goodsList(page, qw); MyPagerVo p = MyPagerUtil.pageToVo(pagging, null); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index aa1bddd299..55fec252d1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -4,6 +4,10 @@ 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.inventory.wmsinventory.appH5.GoodsListTagH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,4 +56,10 @@ public interface WmsInventoryMapper extends BaseMapper { IPage handleGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getListByGoodsID(@Param("goodsID") String goodsID); + + List selGoodsListForScanRackTag(@Param("houseRackSid") String houseRackSid); + + GoodsTagH5Vo selGoodsH5Vo(@Param("goodsID") String goodsID); + + List selGoodsListForScanGoodsTag(@Param("goodsID") String goodsID); } 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 2f9dd2cf8c..bba0fc1151 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 @@ -293,4 +293,53 @@ + + + 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 0619534f4e..b617f94242 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 @@ -10,6 +10,12 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.base.wmswarehouserack.WmsHouseInfoVo; +import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsListTagH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; @@ -39,6 +45,9 @@ public class WmsInventoryService extends MybatisBaseService listPage(PagerQuery pq) { WmsInventoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -330,7 +339,7 @@ public class WmsInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getPackageGoodsVo(page, qw); @@ -502,4 +511,53 @@ public class WmsInventoryService extends MybatisBaseService list = baseMapper.getListByGoodsID(goodsID); return rb.setData(list); } + + //---------------------app扫描标签二维码------------------------- + + /** + * 扫描库位标签查看详情 + * + * @param sid + * @return + */ + public HouseRackH5Vo scanHouseTag(String sid) { + HouseRackH5Vo vo = new HouseRackH5Vo(); + String[] split = sid.split("#"); + String houseRackSid = split[0]; + WmsHouseInfoVo infoVo = wmsWarehouseRackService.selHouseInfoByFullCode(houseRackSid).getData(); + String houseName = ""; + String areaName = ""; + String rackName = ""; + if (null != infoVo) { + if (StringUtils.isNotBlank(infoVo.getWarehouseName())) { + houseName = infoVo.getWarehouseName(); + } + if (StringUtils.isNotBlank(infoVo.getWareAreaName())) { + areaName = infoVo.getWareAreaName(); + } + if (StringUtils.isNotBlank(infoVo.getWarehouseRackName())) { + rackName = infoVo.getWarehouseRackName(); + } + vo.setHouseName(houseName + "-" + areaName + "-" + rackName); + if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) { + vo.setHouseAddress(infoVo.getWarehouseRackCode()); + } + } else { + return null; + } + List list = baseMapper.selGoodsListForScanRackTag(houseRackSid); + if (!list.isEmpty()) { + vo.setList(list); + } + return vo; + } + + public GoodsTagH5Vo scanGoodsTag(String sid) { + GoodsTagH5Vo vo = baseMapper.selGoodsH5Vo(sid); + List list = baseMapper.selGoodsListForScanGoodsTag(sid); + if (!list.isEmpty()) { + vo.setList(list); + } + return vo; + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsListTagH5Vo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsListTagH5Vo.java new file mode 100644 index 0000000000..d6d08a12c7 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsListTagH5Vo.java @@ -0,0 +1,26 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/6/26 10:40 + */ +@Data +public class GoodsListTagH5Vo { + + /** + * 库位编码 + */ + private String houseAddress; + /** + * 仓库+库区 + */ + private String houseName; + /** + * 商品数量 + */ + private String num; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTagH5Vo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTagH5Vo.java new file mode 100644 index 0000000000..cc5d1c0d90 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTagH5Vo.java @@ -0,0 +1,42 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/26 10:40 + */ +@Data +public class GoodsTagH5Vo { + + /** + * 商品名称 + */ + private String goodsName; + /** + * 规格 + */ + private String goodsSkuOwnSpec; + /** + * 首次入库日期 + */ + private String inboundTime; + /** + * 图号 + */ + private String numId; + /** + * 供应商 + */ + private String provider; + /** + * 计量单位 + */ + private String unit; + + private List list; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java new file mode 100644 index 0000000000..9363c68c08 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackH5Vo.java @@ -0,0 +1,33 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import com.yxt.wms.biz.inventory.wmsgoodstag.app.ListElement; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/26 8:54 + */ +@Data +public class HouseRackH5Vo { + + /** + * 1-2-50 + */ + private String houseAddress; + /** + * 库区名+库位名 + */ + private String houseName; + @ApiModelProperty("列表") + public List list; + + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java new file mode 100644 index 0000000000..8a0f70adf1 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/HouseRackListVo.java @@ -0,0 +1,38 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/6/26 10:12 + */ +@Data +public class HouseRackListVo { + + /** + * 商品id + */ + private String goodsID; + /** + * 商品名称 + */ + private String goodsName; + /** + * 首次入库日期 + */ + private String inboundTime; + /** + * 商品数量 + */ + private String num; + /** + * 图号 + */ + private String numId; + /** + * 供应商 + */ + private String provider; + +}