From 188bb54e8bd886989da42cd59b1e330d70484f94 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 29 Apr 2024 10:18:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=85=8D=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/StorageDistributeBillRest.java | 56 ------------------- .../StorageDistributeBill.java | 37 ------------ .../StorageDistributeBillDto.java | 37 ------------ .../StorageDistributeBillInitVo.java | 42 -------------- .../StorageDistributeBillMapper.java | 13 ----- .../StorageDistributeBillMapper.xml | 4 -- .../StorageDistributeBillQuery.java | 37 ------------ .../StorageDistributeBillService.java | 35 ------------ .../StorageDistributeBillVo.java | 33 ----------- .../StorageDistributeBillDetail.java | 50 ----------------- .../StorageDistributeBillDetailDto.java | 42 -------------- .../StorageDistributeBillDetailVo.java | 42 -------------- .../StorageDistributeBillMapper.xml | 4 -- 13 files changed, 432 deletions(-) delete mode 100644 src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java delete mode 100644 src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java delete mode 100644 target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml diff --git a/src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java b/src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java deleted file mode 100644 index a728896..0000000 --- a/src/main/java/com/yxt/storage/apiadmin/StorageDistributeBillRest.java +++ /dev/null @@ -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> listPage(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsDistributeBillService.listPage(pagerQuery); - return rb.success().setData(pv); - } - - @ApiOperation("从出库新增配货单") - @GetMapping("/getInit") - ResultBean getInit(@RequestParam("sid") String sid) { - return wmsDistributeBillService.getInit(sid); - } - - @ApiOperation("详情/编辑初始化") - @GetMapping("/details") - ResultBean details(@RequestParam("sid") String sid) { - return wmsDistributeBillService.details(sid); - } - - @ApiOperation("新增修改保存") - @PostMapping("/saveOrUpdateBill") - ResultBean saveOrUpdateBill(@RequestBody StorageDistributeBillDto dto) { - return wmsDistributeBillService.saveOrUpdateBill(dto); - } - - @ApiOperation("确认") - @PostMapping("/confirm") - ResultBean confirm(@RequestBody StorageDistributeBillDto dto) { - return wmsDistributeBillService.confirm(dto); - } -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java deleted file mode 100644 index 8684ff1..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBill.java +++ /dev/null @@ -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; -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java deleted file mode 100644 index a5001f0..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillDto.java +++ /dev/null @@ -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 detailList = new ArrayList<>(); -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java deleted file mode 100644 index dde82ed..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillInitVo.java +++ /dev/null @@ -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 detailsList = new ArrayList<>(); - -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java deleted file mode 100644 index d4dcc5c..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.java +++ /dev/null @@ -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 { -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml deleted file mode 100644 index 28afae0..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java deleted file mode 100644 index d341af1..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillQuery.java +++ /dev/null @@ -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; -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java deleted file mode 100644 index c002f37..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillService.java +++ /dev/null @@ -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 { - public PagerVo listPage(PagerQuery pagerQuery) { - return null; - } - - public ResultBean getInit(String sid) { - return null; - } - - public ResultBean details(String sid) { - return null; - } - - public ResultBean saveOrUpdateBill(StorageDistributeBillDto dto) { - return null; - } - - public ResultBean confirm(StorageDistributeBillDto dto) { - return null; - } -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java b/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java deleted file mode 100644 index 2ae32f4..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillVo.java +++ /dev/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; -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java deleted file mode 100644 index 7d2c1cf..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetail.java +++ /dev/null @@ -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; -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java deleted file mode 100644 index 659fa09..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailDto.java +++ /dev/null @@ -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; -} diff --git a/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java b/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java deleted file mode 100644 index b125888..0000000 --- a/src/main/java/com/yxt/storage/biz/storagedistributebilldetail/StorageDistributeBillDetailVo.java +++ /dev/null @@ -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; -} diff --git a/target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml b/target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml deleted file mode 100644 index 28afae0..0000000 --- a/target/classes/com/yxt/storage/biz/storagedistributebill/StorageDistributeBillMapper.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file