
13 changed files with 0 additions and 432 deletions
@ -1,56 +0,0 @@ |
|||
package com.yxt.storage.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.storage.biz.storagedistributebill.*; |
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Api(tags = "配货单据") |
|||
@RestController |
|||
@RequestMapping("/apiadmin/WmsDistributeBill") |
|||
public class StorageDistributeBillRest { |
|||
|
|||
@Autowired |
|||
private StorageDistributeBillService wmsDistributeBillService; |
|||
|
|||
@ApiOperation("分页列表") |
|||
@PostMapping("/listPage") |
|||
ResultBean<PagerVo<StorageDistributeBillVo>> listPage(@RequestBody PagerQuery<StorageDistributeBillQuery> pagerQuery) { |
|||
ResultBean<PagerVo<StorageDistributeBillVo>> rb = ResultBean.fireFail(); |
|||
PagerVo<StorageDistributeBillVo> pv = wmsDistributeBillService.listPage(pagerQuery); |
|||
return rb.success().setData(pv); |
|||
} |
|||
|
|||
@ApiOperation("从出库新增配货单") |
|||
@GetMapping("/getInit") |
|||
ResultBean<StorageDistributeBillInitVo> getInit(@RequestParam("sid") String sid) { |
|||
return wmsDistributeBillService.getInit(sid); |
|||
} |
|||
|
|||
@ApiOperation("详情/编辑初始化") |
|||
@GetMapping("/details") |
|||
ResultBean<StorageDistributeBillInitVo> details(@RequestParam("sid") String sid) { |
|||
return wmsDistributeBillService.details(sid); |
|||
} |
|||
|
|||
@ApiOperation("新增修改保存") |
|||
@PostMapping("/saveOrUpdateBill") |
|||
ResultBean<String> saveOrUpdateBill(@RequestBody StorageDistributeBillDto dto) { |
|||
return wmsDistributeBillService.saveOrUpdateBill(dto); |
|||
} |
|||
|
|||
@ApiOperation("确认") |
|||
@PostMapping("/confirm") |
|||
ResultBean<String> confirm(@RequestBody StorageDistributeBillDto dto) { |
|||
return wmsDistributeBillService.confirm(dto); |
|||
} |
|||
} |
@ -1,37 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import com.yxt.common.core.domain.BaseEntity; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBill extends BaseEntity { |
|||
|
|||
@ApiModelProperty("出库单sid") |
|||
private String sourceBillSid; |
|||
@ApiModelProperty("来源单号(出库单)") |
|||
private String sourceBillNo; |
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; |
|||
@ApiModelProperty("制单人姓名") |
|||
private String createByName; |
|||
@ApiModelProperty("单据状态") |
|||
private Integer billState; |
|||
@ApiModelProperty("挂起状态(1挂起,0不挂起,2解锁)") |
|||
private Integer isHandUp; |
|||
@ApiModelProperty("优先级") |
|||
private Integer priority; |
|||
@ApiModelProperty("实际发货时间") |
|||
private Date actualDeliveTime; |
|||
@ApiModelProperty("创建组织sid") |
|||
private String createOrgSid; |
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; |
|||
} |
@ -1,37 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import com.yxt.storage.biz.storagedistributebilldetail.StorageDistributeBillDetailDto; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillDto { |
|||
|
|||
@ApiModelProperty("出库单sid") |
|||
private String sourceBillSid; |
|||
@ApiModelProperty("来源单号(出库单)") |
|||
private String sourceBillNo; |
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; |
|||
@ApiModelProperty("制单人姓名") |
|||
private String createByName; |
|||
@ApiModelProperty("制单人sid") |
|||
private String createBySid; |
|||
private String createTime; |
|||
@ApiModelProperty("单据状态") |
|||
private String billState; |
|||
@ApiModelProperty("创建组织sid") |
|||
private String createOrgSid; |
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; |
|||
|
|||
private List<StorageDistributeBillDetailDto> detailList = new ArrayList<>(); |
|||
} |
@ -1,42 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import com.yxt.storage.biz.storagedistributebilldetail.StorageDistributeBillDetailVo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillInitVo { |
|||
|
|||
//单据编号
|
|||
private String billNo; |
|||
|
|||
//制单人
|
|||
@ApiModelProperty("制单人姓名") |
|||
private String createByName; |
|||
|
|||
//单据日期
|
|||
@ApiModelProperty("单据日期") |
|||
private String createTime; |
|||
|
|||
//来源单号
|
|||
@ApiModelProperty("来源单号(出库单)") |
|||
private String sourceBillNo; |
|||
|
|||
//单据状态
|
|||
@ApiModelProperty("单据状态") |
|||
private String billState; |
|||
|
|||
//备注
|
|||
private String remarks; |
|||
|
|||
private List<StorageDistributeBillDetailVo> detailsList = new ArrayList<>(); |
|||
|
|||
} |
@ -1,13 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Mapper |
|||
public interface StorageDistributeBillMapper extends BaseMapper<StorageDistributeBill> { |
|||
} |
@ -1,4 +0,0 @@ |
|||
<?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.storage.biz.storagedistributebill.StorageDistributeBillMapper"> |
|||
</mapper> |
@ -1,37 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import com.yxt.common.core.query.Query; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillQuery implements Query { |
|||
|
|||
//单据编号
|
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; |
|||
|
|||
//单据日期开始时间
|
|||
private String createTimeStart; |
|||
|
|||
//单据日期结束时间
|
|||
private String createTimeEnd; |
|||
|
|||
//业务类型
|
|||
@ApiModelProperty("业务类型value((销售出库、采购退货出库等))") |
|||
private String busTypeValue; |
|||
|
|||
//单据状态
|
|||
@ApiModelProperty("单据状态") |
|||
private String billState; |
|||
|
|||
@ApiModelProperty("挂起状态(1挂起,0不挂起,2解锁)") |
|||
private String isHandUp; |
|||
@ApiModelProperty("优先级") |
|||
private String priority; |
|||
} |
@ -1,35 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import com.yxt.common.base.service.MybatisBaseService; |
|||
import com.yxt.common.core.query.PagerQuery; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import com.yxt.common.core.vo.PagerVo; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Service |
|||
public class StorageDistributeBillService extends MybatisBaseService<StorageDistributeBillMapper, StorageDistributeBill> { |
|||
public PagerVo<StorageDistributeBillVo> listPage(PagerQuery<StorageDistributeBillQuery> pagerQuery) { |
|||
return null; |
|||
} |
|||
|
|||
public ResultBean<StorageDistributeBillInitVo> getInit(String sid) { |
|||
return null; |
|||
} |
|||
|
|||
public ResultBean<StorageDistributeBillInitVo> details(String sid) { |
|||
return null; |
|||
} |
|||
|
|||
public ResultBean<String> saveOrUpdateBill(StorageDistributeBillDto dto) { |
|||
return null; |
|||
} |
|||
|
|||
public ResultBean<String> confirm(StorageDistributeBillDto dto) { |
|||
return null; |
|||
} |
|||
} |
@ -1,33 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebill; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillVo { |
|||
|
|||
private String sid; |
|||
@ApiModelProperty("单据日期") |
|||
private String createTime; |
|||
@ApiModelProperty("制单人姓名") |
|||
private String createByName; |
|||
@ApiModelProperty("来源单号(出库单)") |
|||
private String sourceBillNo; |
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; |
|||
|
|||
@ApiModelProperty("单据状态") |
|||
private String billState; |
|||
@ApiModelProperty("优先级") |
|||
private String priority; |
|||
@ApiModelProperty("挂起状态(1挂起,0不挂起,2解锁)") |
|||
private String isHandUp; |
|||
|
|||
@ApiModelProperty("实际发货时间") |
|||
private String actualDeliveTime; |
|||
} |
@ -1,50 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebilldetail; |
|||
|
|||
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/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillDetail extends BaseEntity { |
|||
@ApiModelProperty("出库单明细sid") |
|||
private String outBillDetailSid; |
|||
@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("库存sid") |
|||
private String inventorySid; |
|||
@ApiModelProperty("仓库sid") |
|||
private String warehouseSid; |
|||
@ApiModelProperty("仓库名称") |
|||
private String warehouseName; |
|||
@ApiModelProperty("库位sid") |
|||
private String warehouseRackSid; |
|||
@ApiModelProperty("库位编号") |
|||
private String warehouseRackCode; |
|||
@ApiModelProperty("配货数量") |
|||
private BigDecimal distributeCount; |
|||
@ApiModelProperty("发货数量") |
|||
private BigDecimal deliveryCount; |
|||
@ApiModelProperty("状态(配货中/已完成)") |
|||
private Integer billState; |
|||
} |
@ -1,42 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebilldetail; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillDetailDto { |
|||
|
|||
@ApiModelProperty("出库单明细sid") |
|||
private String outBillDetailSid; |
|||
@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("库存sid") |
|||
private String inventorySid; |
|||
@ApiModelProperty("仓库sid") |
|||
private String warehouseSid; |
|||
@ApiModelProperty("仓库名称") |
|||
private String warehouseName; |
|||
@ApiModelProperty("库位sid") |
|||
private String warehouseRackSid; |
|||
@ApiModelProperty("库位编号") |
|||
private String warehouseRackCode; |
|||
@ApiModelProperty("配货数量") |
|||
private String distributeCount; |
|||
} |
@ -1,42 +0,0 @@ |
|||
package com.yxt.storage.biz.storagedistributebilldetail; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/4/24 |
|||
**/ |
|||
@Data |
|||
public class StorageDistributeBillDetailVo { |
|||
|
|||
@ApiModelProperty("出库单明细sid") |
|||
private String outBillDetailSid; |
|||
@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("库存sid") |
|||
private String inventorySid; |
|||
@ApiModelProperty("仓库sid") |
|||
private String warehouseSid; |
|||
@ApiModelProperty("仓库名称") |
|||
private String warehouseName; |
|||
@ApiModelProperty("库位sid") |
|||
private String warehouseRackSid; |
|||
@ApiModelProperty("库位编号") |
|||
private String warehouseRackCode; |
|||
@ApiModelProperty("配货数量") |
|||
private String distributeCount; |
|||
} |
@ -1,4 +0,0 @@ |
|||
<?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.storage.biz.storagedistributebill.StorageDistributeBillMapper"> |
|||
</mapper> |
Loading…
Reference in new issue