open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

6/7

Browse Source
This commit is contained in:
wangpengfei
2024-06-07 10:47:54 +08:00
parent ed5e0da99b
commit 7e4d411b0a
48 changed files with 1527 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/com/yxt/warehouse/apiadmin/WarehouseGoodsTagRest.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousegoodstag.WarehouseGoodsTagDto;
import com.yxt.warehouse.biz.warehousegoodstag.WarehouseGoodsTagService;
import com.yxt.warehouse.biz.warehousegoodstag.WarehouseGoodsTagVo;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 17:00
*/
@Api(tags = "商品标签")
@RestController
@RequestMapping("/apiadmin/inventory/warehousegoodstag")
public class WarehouseGoodsTagRest {
@Autowired
private WarehouseGoodsTagService warehouseGoodsTagService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseGoodsTagVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillDetailQuery> pq){
return warehouseGoodsTagService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseGoodsTagDto dto){
ResultBean rb = ResultBean.fireFail();
warehouseGoodsTagService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
warehouseGoodsTagService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseGoodsTagVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseGoodsTagVo vo = warehouseGoodsTagService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

59
src/main/java/com/yxt/warehouse/apiadmin/WarehouseReceiptBillDetailBatchRest.java Normal file
View File

@@ -0,0 +1,59 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto;
import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService;
import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchVo;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseDto;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseQuery;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseService;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 16:44
*/
@Api(tags = "收货单据明细-批次属性")
@RestController
@RequestMapping("/apiadmin/inventory/wmsreceiptbilldetailbatch")
public class WarehouseReceiptBillDetailBatchRest {
@Autowired
private WarehouseReceiptBillDetailBatchService warehouseReceiptBillDetailBatchService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseReceiptBillDetailBatchVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillDetailQuery> pq){
return warehouseReceiptBillDetailBatchService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseReceiptBillDetailBatchDto dto){
ResultBean rb = ResultBean.fireFail();
warehouseReceiptBillDetailBatchService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
warehouseReceiptBillDetailBatchService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseReceiptBillDetailBatchVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailBatchVo vo = warehouseReceiptBillDetailBatchService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

56
src/main/java/com/yxt/warehouse/apiadmin/WarehouseReceiptBillDetailRest.java Normal file
View File

@@ -0,0 +1,56 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailService;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 16:35
*/
@Api(tags = "收货单据明细")
@RestController
@RequestMapping("/apiadmin/inventory/wmsreceiptbilldetail")
public class WarehouseReceiptBillDetailRest {
@Autowired
private WarehouseReceiptBillDetailService warehouseReceiptBillDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseReceiptBillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillDetailQuery> pq){
return warehouseReceiptBillDetailService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseReceiptBillDetailDto dto){
ResultBean rb = ResultBean.fireFail();
warehouseReceiptBillDetailService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
warehouseReceiptBillDetailService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseReceiptBillDetailVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailVo vo = warehouseReceiptBillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

55
src/main/java/com/yxt/warehouse/apiadmin/WarehouseShelfBillDetailRest.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailDto;
import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailService;
import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 17:11
*/
@Api(tags = "上货架明细")
@RestController
@RequestMapping("/apiadmin/warehouseshelfbilldetail")
public class WarehouseShelfBillDetailRest {
@Autowired
private WarehouseShelfBillDetailService warehouseShelfBillDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseShelfBillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillDetailQuery> pq){
return warehouseShelfBillDetailService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseShelfBillDetailDto dto){
ResultBean rb = ResultBean.fireFail();
warehouseShelfBillDetailService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
warehouseShelfBillDetailService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseShelfBillDetailVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillDetailVo vo = warehouseShelfBillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

55
src/main/java/com/yxt/warehouse/apiadmin/WarehouseShelfBillRecordRest.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehouseshelfbillrecord.WarehouseShelfBillRecordDto;
import com.yxt.warehouse.biz.warehouseshelfbillrecord.WarehouseShelfBillRecordService;
import com.yxt.warehouse.biz.warehouseshelfbillrecord.WarehouseShelfBillRecordVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 17:19
*/
@Api(tags = "上货架明细")
@RestController
@RequestMapping("/apiadmin/warehouseshelfbillrecord")
public class WarehouseShelfBillRecordRest {
@Autowired
private WarehouseShelfBillRecordService warehouseShelfBillRecordService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseShelfBillRecordVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillDetailQuery> pq){
return warehouseShelfBillRecordService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseShelfBillRecordDto dto){
ResultBean rb = ResultBean.fireFail();
warehouseShelfBillRecordService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
warehouseShelfBillRecordService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseShelfBillRecordVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillRecordVo vo = warehouseShelfBillRecordService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

8
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java
View File

@@ -20,10 +20,16 @@ public class WarehouseAnsBillDto {
@ApiModelProperty("外部单号（业务单据编号）")
private String sourceBillNo;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
private String busTypeKey;
@ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
private String busTypeValue;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("制单人")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
@@ -32,6 +38,8 @@ public class WarehouseAnsBillDto {
private String reviewStatus;
@ApiModelProperty("拒绝原因")
private String refuseReason;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("联系人")
private String contact;
@ApiModelProperty("联系人手机")

52
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java
View File

@@ -3,6 +3,8 @@ package com.yxt.warehouse.biz.warehouseansbill;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @description:
* @author: dimengzhe
@@ -13,32 +15,46 @@ public class WarehouseAnsBillVo {
private String sid;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("外部单号（业务单据编号）")
private String sourceBillNo;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
private String busTypeKey;
@ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
private String busTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("联系人")
private String contact;
@ApiModelProperty("联系人手机")
private String mobile;
@ApiModelProperty("预计到货日期")
private String deliveryDate;
//单据状态
private String billState;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("制单人")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
private Integer billState;
@ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
private String reviewStatus;
@ApiModelProperty("拒绝原因")
private String refuseReason;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("联系人")
private String contact;
@ApiModelProperty("联系人手机")
private String mobile;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("货主sid")
private String goodsOwnerSid;
@ApiModelProperty("货主")
private String goodsOwner;
@ApiModelProperty("预计到货日期")
private Date deliveryDate;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
}

34
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTag.java Normal file
View File

@@ -0,0 +1,34 @@
package com.yxt.warehouse.biz.warehousegoodstag;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/10
**/
@Data
public class WarehouseGoodsTag extends BaseEntity {
private String billSid;//单据sid
private String billDetailSid;//单据明细sid
private String batchNumber;//批次号
private String goodsID;//商品ID
private String goodSpuSid;//商品基础信息Sid
private String goodsSpuName;//商品名称
private String goodsSkuSid;//商品Skusid
private String goodsSkuTitle;//商品Sku名称
private String goodsSkuCode;//商品sku编码
private String goodsSkuOwnSpec;//规格型号
private String unit;//计量单位
private String goodsCount;//数量
private String tagPicUrl;//标签图片地址
private String state;//上架完成状态（1已完成 0未完成，默认为0）
private String printCount;//打印次数
}

31
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagDto.java Normal file
View File

@@ -0,0 +1,31 @@
package com.yxt.warehouse.biz.warehousegoodstag;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author wangpengfei
* @date 2024/6/6 16:39
*/
@Data
public class WarehouseGoodsTagDto {
private String sid;
private String billSid;//单据sid
private String billDetailSid;//单据明细sid
private String batchNumber;//批次号
private String goodsID;//商品ID
private String goodSpuSid;//商品基础信息Sid
private String goodsSpuName;//商品名称
private String goodsSkuSid;//商品Skusid
private String goodsSkuTitle;//商品Sku名称
private String goodsSkuCode;//商品sku编码
private String goodsSkuOwnSpec;//规格型号
private String unit;//计量单位
private String goodsCount;//数量
private String tagPicUrl;//标签图片地址
private String state;//上架完成状态（1已完成 0未完成，默认为0）
private String printCount;//打印次数
}

28
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.java Normal file
View File

@@ -0,0 +1,28 @@
package com.yxt.warehouse.biz.warehousegoodstag;
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.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/12
**/
@Mapper
public interface WarehouseGoodsTagMapper extends BaseMapper<WarehouseGoodsTag> {
IPage<WarehouseGoodsTagVo> listPage(IPage<WarehouseGoodsTag> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseGoodsTag> qw);
WarehouseGoodsTagVo initialization (@Param("sid") String sid);
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

19
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchMapper">
<select id="listPage" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_receipt_bill_detail_batch a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_receipt_bill_detail_batch a
where a.sid =#{sid}
</select>
</mapper>

13
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagQuery.java Normal file
View File

@@ -0,0 +1,13 @@
package com.yxt.warehouse.biz.warehousegoodstag;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/6/6 16:42
*/
@Data
public class WarehouseGoodsTagQuery implements Query {
private String name;
}

103
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagService.java Normal file
View File

@@ -0,0 +1,103 @@
package com.yxt.warehouse.biz.warehousegoodstag;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/12
**/
@Service
public class WarehouseGoodsTagService extends MybatisBaseService<WarehouseGoodsTagMapper, WarehouseGoodsTag> {
public ResultBean<PagerVo<WarehouseGoodsTagVo>> listPage(PagerQuery<WarehouseReceiptBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseGoodsTag> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WarehouseGoodsTag> page = PagerUtil.queryToPage(pq);
IPage<WarehouseGoodsTagVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseGoodsTagVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseGoodsTagVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WarehouseGoodsTagVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseGoodsTagVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
delBySids(sids);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseGoodsTag wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
return rb.success();
}
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WarehouseGoodsTag wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
public void saveOrUpdateDto(WarehouseGoodsTagDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WarehouseGoodsTagDto dto) {
WarehouseGoodsTag entity = new WarehouseGoodsTag();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WarehouseGoodsTagDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WarehouseGoodsTagVo fetchDetailsVoBySid(String sid) {
WarehouseGoodsTag entity = fetchBySid(sid);
WarehouseGoodsTagVo vo = new WarehouseGoodsTagVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

30
src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagVo.java Normal file
View File

@@ -0,0 +1,30 @@
package com.yxt.warehouse.biz.warehousegoodstag;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/12
**/
@Data
public class WarehouseGoodsTagVo {
private String sid;
private String billSid;//单据sid
private String billDetailSid;//单据明细sid
private String batchNumber;//批次号
private String goodsID;//商品ID
private String goodSpuSid;//商品基础信息Sid
private String goodsSpuName;//商品名称
private String goodsSkuSid;//商品Skusid
private String goodsSkuTitle;//商品Sku名称
private String goodsSkuCode;//商品sku编码
private String goodsSkuOwnSpec;//规格型号
private String unit;//计量单位
private String goodsCount;//数量
private String tagPicUrl;//标签图片地址
private String state;//上架完成状态（1已完成 0未完成，默认为0）
private String printCount;//打印次数
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebill.java
View File

@@ -14,8 +14,6 @@ import java.util.Date;
public class WarehouseInventoryAllocatebill extends BaseEntity {
private String billNo;//单据编号
private String createDate;//制单日期
private String createUserSid;//制单人sid
private String createByName;//制单人姓名
private String outOrgSid;//调出分公司sid
private String inOrgSid;//调入分公司sid

39
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetail.java
View File

@@ -9,30 +9,21 @@ import lombok.Data;
*/
@Data
public class WarehouseInventoryAllocatebillDetail extends BaseEntity {
// private String id;
// private String sid= UUID.randomUUID().toString();
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
// private Date createTime;
// private String remarks;
// private String isEnable;
private String billSid;//商品ID（唯一编码，入库时生成）
private String inventorySid;//商品sid
private String goodsSid;//入库单sid
private String goodsName;//入库单明细sid
private String goodsCode;//销售价格1
private String specification;//销售价格2
private String goodsModel;//销售价格3
private String unit;//销售价格4
private String outWarehouseSid;//销售价格5
private String outWarehouseName;//计量单位
private String warehouseAreasid;//库存数量
private String warehouseArea;//销售底价
private String taxPrice;//三包价格
private String stockCount;//首保价格
private String inWarehouseSid;//仓库sid
private String inWarehouseName;//仓库名称
private String count;//货位
private String amount;//是否显示折扣标志
private String billSid;//盘点单sid
private String inventorySid;//商品库存sid
private String warehouseSid;//仓库sid
private String warehouseName;//仓库名称
private String warehouseRackSid;//库位sid
private String warehouseRackCode;//库位编码
private String taxPrice;//含税价
private String stockCount;//库存数量
private String inWarehouseSid;//调入仓库sid
private String inWarehouseName;//调入货位
private String inWarehouseRackSid;//调入库位sid
private String inWarehouseRackCode;//调入库位编码
private String count;//调拨数量
private String amount;//调拨金额（调拨数量*含税价）
}

34
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDto.java
View File

@@ -18,28 +18,18 @@ public class WarehouseInventoryAllocatebillDetailDto implements Dto {
private Date createTime;
private String remarks;
private String isEnable;
private String goodsID;//商品ID（唯一编码，入库时生成）
private String goodsSid;//商品sid
private String billSid;//入库单sid
private String billDetailSid;//入库单明细sid
private String price1;//销售价格1
private String price2;//销售价格2
private String price3;//销售价格3
private String price4;//销售价格4
private String price5;//销售价格5
private String unit;//计量单位
private String count;//库存数量
private String minimumPrice;//销售底价
private String freePrice;//三包价格
private String firstMaintainPrice;//首保价格
private String billSid;//盘点单sid
private String inventorySid;//商品库存sid
private String warehouseSid;//仓库sid
private String warehouseName;//仓库名称
private String warehouseArea;//货位
private String isShowDiscount;//是否显示折扣标志
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date firstInDate;//首次入库日期-计算库龄的依据
private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String warehouseRackSid;//库位sid
private String warehouseRackCode;//库位编码
private String taxPrice;//含税价
private String stockCount;//库存数量
private String inWarehouseSid;//调入仓库sid
private String inWarehouseName;//调入货位
private String inWarehouseRackSid;//调入库位sid
private String inWarehouseRackCode;//调入库位编码
private String count;//调拨数量
private String amount;//调拨金额（调拨数量*含税价）
}

35
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailVo.java
View File

@@ -23,30 +23,19 @@ public class WarehouseInventoryAllocatebillDetailVo implements Vo {
private String isEnable;
private String state;
private String isDelete;
private String goodsID;//商品ID（唯一编码，入库时生成）
private String goodsSid;//商品sid
private String billSid;//入库单sid
private String billDetailSid;//入库单明细sid
private String price1;//销售价格1
private String price2;//销售价格2
private String price3;//销售价格3
private String price4;//销售价格4
private String price5;//销售价格5
private String unit;//计量单位
private String count;//库存数量
private String minimumPrice;//销售底价
private String freePrice;//三包价格
private String firstMaintainPrice;//首保价格
private String billSid;//盘点单sid
private String inventorySid;//商品库存sid
private String warehouseSid;//仓库sid
private String warehouseName;//仓库名称
private String warehouseArea;//货位
private String isShowDiscount;//是否显示折扣标志
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date firstInDate;//首次入库日期-计算库龄的依据
private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库
private String sortNo;//排序
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
private String goodsName;
private String warehouseRackSid;//库位sid
private String warehouseRackCode;//库位编码
private String taxPrice;//含税价
private String stockCount;//库存数量
private String inWarehouseSid;//调入仓库sid
private String inWarehouseName;//调入货位
private String inWarehouseRackSid;//调入库位sid
private String inWarehouseRackCode;//调入库位编码
private String count;//调拨数量
private String amount;//调拨金额（调拨数量*含税价）
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecord.java
View File

@@ -60,4 +60,6 @@ public class WarehouseInventoryRecord extends BaseEntity {
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
private String handlerSid;//经办人sid
private String handlerName;//经办人
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordDto.java
View File

@@ -59,5 +59,7 @@ public class WarehouseInventoryRecordDto implements Dto {
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
private String handlerSid;//经办人sid
private String handlerName;//经办人
}

1
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordsVo.java
View File

@@ -41,4 +41,5 @@ public class WarehouseInventoryRecordsVo {
@ApiModelProperty("计量单位")
private String unit;
}

55
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailDto.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author wangpengfei
* @date 2024/6/6 16:39
*/
@Data
public class WarehouseReceiptBillDetailDto {
private String sid;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("商品基础信息Sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品sku编码")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("实收数量")
private BigDecimal actualInCount;
@ApiModelProperty("拒收数量")
private BigDecimal rejectCount;
@ApiModelProperty("拒收原因")
private String rejectReason;
@ApiModelProperty("收货时间")
private Date receivingGoodsTime;
@ApiModelProperty("是否需要质检（不需要0，需要1）")
private Integer isQuality;
@ApiModelProperty("质检状态（合格0，不合格1）")
private Integer qualityState;
@ApiModelProperty("载具说明")
private String packageRemark;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("库位sid")
private String warehouseRackSid;
@ApiModelProperty("库位名称")
private String warehouseRackName;
}

9
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.java
View File

@@ -1,6 +1,10 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetail;
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 org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -18,4 +22,9 @@ public interface WarehouseReceiptBillDetailMapper extends BaseMapper<WarehouseRe
List<WarehouseReceiptBillDetailDto2> getDetailsInit(String sid);
List<WarehouseReceiptBillDetail> selectByBillSid(@Param("sid") String sid, @Param("sidList") List<String> sidList);
IPage<WarehouseReceiptBillDetailVo> listPage(IPage<WarehouseReceiptBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseReceiptBillDetail> qw);
WarehouseReceiptBillDetailVo initialization (@Param("sid") String sid);
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

14
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailMapper.xml
View File

@@ -39,4 +39,18 @@
</foreach>
</if>
</select>
<select id="listPage" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_receipt_bill_detail a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_receipt_bill_detail a
where a.sid =#{sid}
</select>
</mapper>

13
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailQuery.java Normal file
View File

@@ -0,0 +1,13 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetail;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/6/6 16:42
*/
@Data
public class WarehouseReceiptBillDetailQuery implements Query {
private String name;
}

106
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetail/WarehouseReceiptBillDetailService.java
View File

@@ -1,7 +1,15 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetail;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2;
import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,4 +58,102 @@ public class WarehouseReceiptBillDetailService extends MybatisBaseService<Wareho
public List<WarehouseReceiptBillDetail> selectByBillSid(String sid, List<String> sidList) {
return baseMapper.selectByBillSid(sid, sidList);
}
public ResultBean<PagerVo<WarehouseReceiptBillDetailVo>> listPage(PagerQuery<WarehouseReceiptBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseReceiptBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WarehouseReceiptBillDetail> page = PagerUtil.queryToPage(pq);
IPage<WarehouseReceiptBillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseReceiptBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseReceiptBillDetailVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<String> saveOrUpdate(WarehouseReceiptBillDetailDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WarehouseReceiptBillDetail wmsWarehouseRack = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
baseMapper.updateById(wmsWarehouseRack);
} else {
WarehouseReceiptBillDetail wmsWarehouseRack = new WarehouseReceiptBillDetail();
sid = wmsWarehouseRack.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
baseMapper.insert(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public ResultBean<WarehouseReceiptBillDetailVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
delBySids(sids);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
return rb.success();
}
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
public void saveOrUpdateDto(WarehouseReceiptBillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WarehouseReceiptBillDetailDto dto) {
WarehouseReceiptBillDetail entity = new WarehouseReceiptBillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WarehouseReceiptBillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WarehouseReceiptBillDetailVo fetchDetailsVoBySid(String sid) {
WarehouseReceiptBillDetail entity = fetchBySid(sid);
WarehouseReceiptBillDetailVo vo = new WarehouseReceiptBillDetailVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

55
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchDto.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @author wangpengfei
* @date 2024/6/6 16:39
*/
@Data
public class WarehouseReceiptBillDetailBatchDto {
private String sid;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("商品基础信息Sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品sku编码")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("实收数量")
private BigDecimal actualInCount;
@ApiModelProperty("拒收数量")
private BigDecimal rejectCount;
@ApiModelProperty("拒收原因")
private String rejectReason;
@ApiModelProperty("收货时间")
private Date receivingGoodsTime;
@ApiModelProperty("是否需要质检（不需要0，需要1）")
private Integer isQuality;
@ApiModelProperty("质检状态（合格0，不合格1）")
private Integer qualityState;
@ApiModelProperty("载具说明")
private String packageRemark;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("库位sid")
private String warehouseRackSid;
@ApiModelProperty("库位名称")
private String warehouseRackName;
}

12
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.java
View File

@@ -1,6 +1,12 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
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.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetail;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -18,4 +24,10 @@ public interface WarehouseReceiptBillDetailBatchMapper extends BaseMapper<Wareho
List<WarehouseReceiptBillDetailBatchDto2> getDetailsInit(@Param("sid") String sid, @Param("detailsSid") String detailsSid);
WarehouseReceiptBillDetailBatch selectByDetails(String sid);
IPage<WarehouseReceiptBillDetailBatchVo> listPage(IPage<WarehouseReceiptBillDetailBatch> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseReceiptBillDetailBatch> qw);
WarehouseReceiptBillDetailBatchVo initialization (@Param("sid") String sid);
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

14
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchMapper.xml
View File

@@ -24,4 +24,18 @@
from warehouse_receipt_bill_detail_batch
where detailSid = #{sid}
</select>
<select id="listPage" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_receipt_bill_detail_batch a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_receipt_bill_detail_batch a
where a.sid =#{sid}
</select>
</mapper>

13
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchQuery.java Normal file
View File

@@ -0,0 +1,13 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/6/6 16:42
*/
@Data
public class WarehouseReceiptBillDetailBatchQuery implements Query {
private String name;
}

90
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchService.java
View File

@@ -1,7 +1,19 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetail;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -34,4 +46,82 @@ public class WarehouseReceiptBillDetailBatchService extends MybatisBaseService<W
public WarehouseReceiptBillDetailBatch selectByDetails(String sid) {
return baseMapper.selectByDetails(sid);
}
public ResultBean<PagerVo<WarehouseReceiptBillDetailBatchVo>> listPage(PagerQuery<WarehouseReceiptBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseReceiptBillDetailBatch> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WarehouseReceiptBillDetailBatch> page = PagerUtil.queryToPage(pq);
IPage<WarehouseReceiptBillDetailBatchVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseReceiptBillDetailBatchVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseReceiptBillDetailBatchVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WarehouseReceiptBillDetailBatchVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailBatchVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
delBySids(sids);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailBatch wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
return rb.success();
}
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailBatch wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
public void saveOrUpdateDto(WarehouseReceiptBillDetailBatchDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WarehouseReceiptBillDetailBatchDto dto) {
WarehouseReceiptBillDetailBatch entity = new WarehouseReceiptBillDetailBatch();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WarehouseReceiptBillDetailBatchDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WarehouseReceiptBillDetailBatchVo fetchDetailsVoBySid(String sid) {
WarehouseReceiptBillDetailBatch entity = fetchBySid(sid);
WarehouseReceiptBillDetailBatchVo vo = new WarehouseReceiptBillDetailBatchVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

61
src/main/java/com/yxt/warehouse/biz/warehousereceiptbilldetailbatch/WarehouseReceiptBillDetailBatchVo.java Normal file
View File

@@ -0,0 +1,61 @@
package com.yxt.warehouse.biz.warehousereceiptbilldetailbatch;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/12
**/
@Data
public class WarehouseReceiptBillDetailBatchVo {
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品sku编码")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("库位sid")
private String warehouseRackSid;
@ApiModelProperty("库位名称")
private String warehouseRackName;
@ApiModelProperty("实收数量")
private String actualInCount;
@ApiModelProperty("拒收数量")
private String rejectCount;
@ApiModelProperty("拒收原因")
private String rejectReason;
@ApiModelProperty("是否需要质检（不需要0，需要1）")
private Integer isQuality;
@ApiModelProperty("质检状态（合格0，不合格1）")
private Integer qualityState;
@ApiModelProperty("载具说明")
private String packageRemark;
//入库价
@ApiModelProperty("单位成本（采购价）")
private String cost;
@ApiModelProperty("税额")
private String taxAmount;
@ApiModelProperty("含税价")
private String taxPrice;
//采购金额
@ApiModelProperty("金额")
private String amount;
@ApiModelProperty("有效期天数")
private Integer shelfLife;
@ApiModelProperty("预约数量（采购订单数量）")
private String orderCount;
}

2
src/main/java/com/yxt/warehouse/biz/warehousereportlose/WarehouseReportLoseMapper.java
View File

@@ -19,6 +19,6 @@ public interface WarehouseReportLoseMapper extends BaseMapper<WarehouseReportLos
IPage<WarehouseReportLoseVo> listPage(IPage<WarehouseReportLose> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseReportLose> qw);
WarehouseReportLoseVo initialization (@Param("sid") String sid);
@Delete("delete from wms_reportlose where sid = #{sid}")
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

13
src/main/java/com/yxt/warehouse/biz/warehousereportloseoper/WarehouseReportLoseOper.java
View File

@@ -25,13 +25,12 @@ public class WarehouseReportLoseOper extends BaseEntity {
private String warehouseName;//仓库名称
private String warehouseRackSid;//、库位sid
private String warehouseRackCode;//库位编码
private String loseCount;//损费量
private String reportTime;//上报时间
private String reportUserSid;//上报人
private String picUrl;//现场拍照，多个照片用逗号分隔
private String isSyncInventory;//是否同步到系统库存
private String confirmUserSid;//损废确认人
private String confirmTime;//损废确认时间
private String operTime;//处理时间
private String operUserSid;//处理人
private String operTypeKey;//处理方式（另存、出库（丢弃、回收卖出））
private String operTypeValue;//
private String confirmUserSid;//处理确认人
private String confirmTime;//处理确认时间
}

10
src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBill.java
View File

@@ -21,8 +21,10 @@ public class WarehouseShelfBill extends BaseEntity {
private String createByName;
@ApiModelProperty("0新建，1已完成")
private Integer billState;
private String createOrgSid;
private String useOrgSid;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("制单人")
private String createBySid;
@ApiModelProperty("备注")
private String remark;
}

22
src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillDto.java
View File

@@ -15,22 +15,22 @@ import java.util.List;
@Data
public class WarehouseShelfBillDto {
private String sid;
@ApiModelProperty("来源单sid（收货单sid）")
private String sourceBillSid;
@ApiModelProperty("来源单号（收货单号）")
private String sourceBillNo;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人名称")
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("0新建，1已完成")
private Integer billState;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("来源单号")
private String sourceBillNo;
@ApiModelProperty("来源单sid")
private String sourceBillSid;
@ApiModelProperty("单据状态：0新建，1已完成")
private Integer billState;
private String remarks;
@ApiModelProperty("制单人")
private String createBySid;
@ApiModelProperty("备注")
private String remark;
private List<WarehouseShelfBillDetailDto> list = new ArrayList<>();
}

22
src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillVo.java
View File

@@ -12,16 +12,22 @@ import lombok.Data;
public class WarehouseShelfBillVo {
private String sid;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("来源单sid（收货单sid）")
private String sourceBillSid;
@ApiModelProperty("来源单号（收货单号）")
private String sourceBillNo;
@ApiModelProperty("单据状态：0新建，1已完成")
private String billState;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("0新建，1已完成")
private Integer billState;
@ApiModelProperty("单据日期")
private String createTime;
@ApiModelProperty("制单人")
private String createBySid;
@ApiModelProperty("备注")
private String remark;
}

24
src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetail.java
View File

@@ -19,14 +19,22 @@ public class WarehouseShelfBillDetail extends BaseEntity {
private String receiptDetailSid;
@ApiModelProperty("批次号")
private String batchNumber;
@ApiModelProperty("库存sid")
private String inventorySid;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("库位sid")
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
@ApiModelProperty("商品基础信息Sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品sku编码")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("上架数量")
private BigDecimal count;
@ApiModelProperty("已上架数量(根据上架记录计算)")
private BigDecimal actualCount;
}

42
src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailDto.java
View File

@@ -3,6 +3,8 @@ package com.yxt.warehouse.biz.warehouseshelfbilldetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
@@ -10,44 +12,30 @@ import lombok.Data;
**/
@Data
public class WarehouseShelfBillDetailDto {
private String sid;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("收货单明细sid")
private String receiptDetailSid;
@ApiModelProperty("批次号")
private String batchNumber;
@ApiModelProperty("库存sid")
private String inventorySid;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("库位sid")
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
@ApiModelProperty("需上架数量")
private String count;
//商品名称
@ApiModelProperty("商品基础信息Sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
//商品编码
@ApiModelProperty("商品sku编码")
private String goodsSkuCode;
//规格
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
//单位
@ApiModelProperty("计量单位")
private String unit;
//仓库
@ApiModelProperty("仓库名称")
private String warehouseName;
//库位
@ApiModelProperty("库位名称")
private String warehouseRackName;
//已上架数量
private String actualCount;
//载具编号
private String packageNo;
@ApiModelProperty("上架数量")
private BigDecimal count;
@ApiModelProperty("已上架数量(根据上架记录计算)")
private BigDecimal actualCount;
}

11
src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailMapper.java
View File

@@ -1,7 +1,13 @@
package com.yxt.warehouse.biz.warehouseshelfbilldetail;
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 org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -19,4 +25,9 @@ public interface WarehouseShelfBillDetailMapper extends BaseMapper<WarehouseShel
List<WarehouseShelfBillDetailVos> selectByBillSid(String sid);
List<String> selectReceiptSidList();
IPage<WarehouseShelfBillDetailVo> listPage(IPage<WarehouseShelfBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseShelfBillDetail> qw);
WarehouseShelfBillDetailVo initialization (@Param("sid") String sid);
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

86
src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailService.java
View File

@@ -1,7 +1,15 @@
package com.yxt.warehouse.biz.warehouseshelfbilldetail;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -34,4 +42,82 @@ public class WarehouseShelfBillDetailService extends MybatisBaseService<Warehous
public List<String> selectReceiptSidList() {
return baseMapper.selectReceiptSidList();
}
public ResultBean<PagerVo<WarehouseShelfBillDetailVo>> listPage(PagerQuery<WarehouseReceiptBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseShelfBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WarehouseShelfBillDetail> page = PagerUtil.queryToPage(pq);
IPage<WarehouseShelfBillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseShelfBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseShelfBillDetailVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WarehouseShelfBillDetailVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillDetailVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
delBySids(sids);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
return rb.success();
}
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
public void saveOrUpdateDto(WarehouseShelfBillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WarehouseShelfBillDetailDto dto) {
WarehouseShelfBillDetail entity = new WarehouseShelfBillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WarehouseShelfBillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WarehouseShelfBillDetailVo fetchDetailsVoBySid(String sid) {
WarehouseShelfBillDetail entity = fetchBySid(sid);
WarehouseShelfBillDetailVo vo = new WarehouseShelfBillDetailVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

41
src/main/java/com/yxt/warehouse/biz/warehouseshelfbilldetail/WarehouseShelfBillDetailVo.java Normal file
View File

@@ -0,0 +1,41 @@
package com.yxt.warehouse.biz.warehouseshelfbilldetail;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/12
**/
@Data
public class WarehouseShelfBillDetailVo {
private String sid;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("收货单明细sid")
private String receiptDetailSid;
@ApiModelProperty("批次号")
private String batchNumber;
@ApiModelProperty("商品基础信息Sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品sku编码")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("上架数量")
private BigDecimal count;
@ApiModelProperty("已上架数量(根据上架记录计算)")
private BigDecimal actualCount;
}

34
src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecord.java Normal file
View File

@@ -0,0 +1,34 @@
package com.yxt.warehouse.biz.warehouseshelfbillrecord;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/10
**/
@Data
public class WarehouseShelfBillRecord extends BaseEntity {
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("上架单明细sid")
private String shelfDetailSid;
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("库位Sid")
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
@ApiModelProperty("上架数量")
private String shelfCount;
@ApiModelProperty("上架时间")
private BigDecimal createTime;
@ApiModelProperty("上架人")
private BigDecimal createBySid;
}

35
src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecordDto.java Normal file
View File

@@ -0,0 +1,35 @@
package com.yxt.warehouse.biz.warehouseshelfbillrecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/15
**/
@Data
public class WarehouseShelfBillRecordDto {
private String sid;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("上架单明细sid")
private String shelfDetailSid;
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("库位Sid")
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
@ApiModelProperty("上架数量")
private String shelfCount;
@ApiModelProperty("上架时间")
private BigDecimal createTime;
@ApiModelProperty("上架人")
private BigDecimal createBySid;
}

29
src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecordMapper.java Normal file
View File

@@ -0,0 +1,29 @@
package com.yxt.warehouse.biz.warehouseshelfbillrecord;
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.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailVos;
import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfDetailsListVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/17
**/
@Mapper
public interface WarehouseShelfBillRecordMapper extends BaseMapper<WarehouseShelfBillRecord> {
IPage<WarehouseShelfBillRecordVo> listPage(IPage<WarehouseShelfBillRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseShelfBillRecord> qw);
WarehouseShelfBillRecordVo initialization (@Param("sid") String sid);
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

18
src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecordMapper.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.warehouse.biz.warehouseshelfbillrecord.WarehouseShelfBillRecordMapper">
<select id="listPage" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_shelf_bill_record a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo">
select
a.*
from warehouse_shelf_bill_record a
where a.sid =#{sid}
</select>
</mapper>

103
src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecordService.java Normal file
View File

@@ -0,0 +1,103 @@
package com.yxt.warehouse.biz.warehouseshelfbillrecord;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
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.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailQuery;
import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfBillDetailVos;
import com.yxt.warehouse.biz.warehouseshelfbilldetail.WarehouseShelfDetailsListVo;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/17
**/
@Service
public class WarehouseShelfBillRecordService extends MybatisBaseService<WarehouseShelfBillRecordMapper, WarehouseShelfBillRecord> {
public ResultBean<PagerVo<WarehouseShelfBillRecordVo>> listPage(PagerQuery<WarehouseReceiptBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseReceiptBillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseShelfBillRecord> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WarehouseShelfBillRecord> page = PagerUtil.queryToPage(pq);
IPage<WarehouseShelfBillRecordVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseShelfBillRecordVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseShelfBillRecordVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WarehouseShelfBillRecordVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillRecordVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
delBySids(sids);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillRecord wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
return rb.success();
}
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WarehouseShelfBillRecord wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
public void saveOrUpdateDto(WarehouseShelfBillRecordDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WarehouseShelfBillRecordDto dto) {
WarehouseShelfBillRecord entity = new WarehouseShelfBillRecord();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WarehouseShelfBillRecordDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WarehouseShelfBillRecordVo fetchDetailsVoBySid(String sid) {
WarehouseShelfBillRecord entity = fetchBySid(sid);
WarehouseShelfBillRecordVo vo = new WarehouseShelfBillRecordVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

35
src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecordVo.java Normal file
View File

@@ -0,0 +1,35 @@
package com.yxt.warehouse.biz.warehouseshelfbillrecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/12
**/
@Data
public class WarehouseShelfBillRecordVo {
private String sid;
@ApiModelProperty("单据sid")
private String billSid;
@ApiModelProperty("上架单明细sid")
private String shelfDetailSid;
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("库位Sid")
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
@ApiModelProperty("上架数量")
private String shelfCount;
@ApiModelProperty("上架时间")
private BigDecimal createTime;
@ApiModelProperty("上架人")
private BigDecimal createBySid;
}