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 63775c838a..a1e8a94e7f 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 @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/28 8:59 @@ -32,6 +34,12 @@ public class WmsWarehouseRackRest { return wmsWarehouseRackService.getAllType(); } + @ApiOperation("根据库区sid查询所有库位") + @GetMapping("/getAllTypeByAreaSid") + public ResultBean> getAllTypeByAreaSid(@RequestParam("areaSid") String areaSid) { + return wmsWarehouseRackService.getAllTypeByAreaSid(areaSid); + } + @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index 91e78edefb..4ca25de69a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -68,9 +68,7 @@ public class WmsInventoryCheckbillRest { @ApiOperation("新建盘点单") @PostMapping("/save") public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillService.saveOrUpdateDto(dto); - return rb.success(); + return wmsInventoryCheckbillService.saveOrUpdateDto(dto); } @ApiOperation("生成盘点报告") @@ -118,4 +116,12 @@ public class WmsInventoryCheckbillRest { PagerVo pv = wmsInventoryCheckbillService.detailGoodPageList(pq); return rb.success().setData(pv); } + + @ApiOperation("查看库区商品盘点列表") + @PostMapping("/detailRackGoodPageList") + public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq); + return rb.success().setData(pv); + } } 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 9de677c40a..56f4338ad5 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 @@ -25,4 +25,6 @@ public interface WmsWarehouseRackMapper extends BaseMapper { WmsWarehouseRack checkForUpdate(@Param("rackCode")String rackCode,@Param("locationSid") String locationSid, @Param("sid")String sid); WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode); + + List getAllTypeByAreaSid(String areaSid); } 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 3acefd0267..2792cefa18 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 @@ -47,4 +47,12 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} 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 1ee9ad2122..60c85d940b 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 @@ -209,4 +209,10 @@ public class WmsWarehouseRackService extends MybatisBaseService> getAllTypeByAreaSid(String areaSid) { + ResultBean rb = ResultBean.fireFail(); + List wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid); + return rb.success().setData(wmsWarehouseRackVos); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index cd85bf1f1c..514559e216 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -60,6 +61,8 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper detailRackPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); IPage detailGoodPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + IPage detailRackGoodPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @@ -72,4 +75,8 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper SELECT + billSid, warehouseName, warehouseArea, + warehouseRackSid, warehouseRackName, SUM(bookCount) AS bookCount, SUM(bookCount) * cost AS bookAmount, @@ -116,7 +118,57 @@ wms_inventory_checkbill_detail ${ew.sqlSegment} - + + + @@ -135,4 +187,14 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 373c48f8c6..00102d71c3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -170,7 +170,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailRackPageList(PagerQuery pq) { WmsInventoryCheckbillDetailRackPageListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("billSid",query.getBillSid()); + qw.eq("billSid", query.getBillSid()); if (StringUtils.isNotBlank(query.getWarehouseSid())) { qw.eq("warehouseSid", query.getWarehouseSid()); } @@ -190,7 +190,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailGoodPageList(PagerQuery pq) { WmsInventoryCheckbillDetailGoodPageListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("billSid",query.getBillSid()); + qw.eq("billSid", query.getBillSid()); if (StringUtils.isNotBlank(query.getWarehouseSid())) { qw.eq("warehouseSid", query.getWarehouseSid()); } @@ -201,13 +201,13 @@ public class WmsInventoryCheckbillService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.detailGoodPageList(page, qw); @@ -215,7 +215,32 @@ public class WmsInventoryCheckbillService extends MybatisBaseService detailRackGoodPageList(PagerQuery pq) { + WmsInventoryCheckbillDetailRackGoodPageListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("billSid", query.getBillSid()); + qw.eq("warehouseRackSid", query.getWarehouseRackSid()); + if (StringUtils.isNotBlank(query.getGoodsID())) { + qw.like("goodsID", query.getGoodsID()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) { + qw.like("goodsSkuTitle", query.getGoodsSkuTitle()); + } + if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { + qw.like("goodsSkuCode", query.getGoodsSkuCode()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.detailRackGoodPageList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(WmsInventoryCheckbillDto dto) { + ResultBean rb = ResultBean.fireFail(); + String nodeState = baseMapper.checkState(dto.getDeptSid()); + if (!"已办结".equals(nodeState)) { + return rb.setMsg("存在盘点中数据，无法生成新的盘点单"); + } SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(dto.getDeptSid()).getData(); String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData(); @@ -255,7 +280,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService ware = wmsInventoryCheckbillReportDetailsVo.getWare(); - map.put("ware",ware); + map.put("ware", ware); List area = wmsInventoryCheckbillReportDetailsVo.getArea(); - map.put("area",area); + map.put("area", area); InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "pdbg" + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java index 8fe3676758..1dc2fce8fc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillVo.java @@ -73,7 +73,7 @@ public class WmsInventoryCheckbillVo implements Vo { @ApiModelProperty("监盘人姓名") private String superviseName; @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") - private Integer checkState; + private String checkState; @ApiModelProperty("应盘数量") private BigDecimal bookCount; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java index 5491c360e1..891109aea8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java @@ -48,8 +48,6 @@ import lombok.Data; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailGoodPageListQuery implements Query { - private String sid; // sid - @ApiModelProperty("盘点sid") private String billSid; @ApiModelProperty("仓库sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java new file mode 100644 index 0000000000..c4f23d6908 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query { + + @ApiModelProperty("盘点sid") + private String billSid; + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java new file mode 100644 index 0000000000..177d469761 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("库位名称") + private String warehouseRackName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("成本单价") + private BigDecimal cost; + @ApiModelProperty("应盘数量") + private BigDecimal bookCount; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("实盘金额") + private BigDecimal realAmount; + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("盈亏数量") + private BigDecimal profitAndLoseCount; + @ApiModelProperty("盈亏金额") + private BigDecimal profitAndLoseAmount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; + @ApiModelProperty("盘损金额") + private BigDecimal lossAmount; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("附件") + private List fileList; +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java index 1676012049..30ae8008d8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java @@ -50,8 +50,6 @@ import java.math.BigDecimal; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailRackPageListQuery implements Query { - private String sid; // sid - @ApiModelProperty("盘点sid") private String billSid; @ApiModelProperty("仓库sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java index 05d801b831..01ab8e7fe3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListVo.java @@ -50,12 +50,14 @@ import java.math.BigDecimal; @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") public class WmsInventoryCheckbillDetailRackPageListVo implements Vo { - private String sid; // sid + private String billSid; @ApiModelProperty("仓库名称") private String warehouseName; @ApiModelProperty("库区名称") private String warehouseArea; + @ApiModelProperty("库位sid") + private String warehouseRackSid; @ApiModelProperty("库位名称") private String warehouseRackName; @ApiModelProperty("应盘数量")