diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseDistributeBillDetailRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseDistributeBillDetailRest.java new file mode 100644 index 0000000..86e2cf9 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseDistributeBillDetailRest.java @@ -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.warehousedistributebill.WarehouseDistributeBillVo; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailDto; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailQuery; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailService; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailVo; +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/7 14:46 + */ +@Api(tags = "配货单据") +@RestController +@RequestMapping("/apiadmin/warehousedistributebilldetail") +public class WarehouseDistributeBillDetailRest { + + @Autowired + private WarehouseDistributeBillDetailService warehouseDistributeBillDetailService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseDistributeBillDetailService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseDistributeBillDetailDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseDistributeBillDetailService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseDistributeBillDetailService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillDetailVo vo = warehouseDistributeBillDetailService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseDistributeBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseDistributeBillRest.java new file mode 100644 index 0000000..744e9ad --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseDistributeBillRest.java @@ -0,0 +1,53 @@ +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.warehousedistributebill.*; +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/warehousedistributebill") +public class WarehouseDistributeBillRest { + + @Autowired + private WarehouseDistributeBillService warehouseDistributeBillService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseDistributeBillService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseDistributeBillDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseDistributeBillService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseDistributeBillService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillVo vo = warehouseDistributeBillService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index 29a36a0..e56a811 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -4,7 +4,7 @@ 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.warehousearea.WarehouseAreaAllVo; -import com.yxt.warehouse.biz.warehousewarehouseinfo.*; +import com.yxt.warehouse.biz.warehouseinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseLogisticsRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseLogisticsRest.java new file mode 100644 index 0000000..af82cd3 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseLogisticsRest.java @@ -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.warehouselogistics.WarehouseLogisticsDto; +import com.yxt.warehouse.biz.warehouselogistics.WarehouseLogisticsQuery; +import com.yxt.warehouse.biz.warehouselogistics.WarehouseLogisticsService; +import com.yxt.warehouse.biz.warehouselogistics.WarehouseLogisticsVo; +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/7 14:11 + */ + +@Api(tags = "物流信息") +@RestController +@RequestMapping("/apiadmin/warehouselogistics") +public class WarehouseLogisticsRest { + + @Autowired + WarehouseLogisticsService warehouseLogisticsService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseLogisticsService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseLogisticsDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseLogisticsService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseLogisticsService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseLogisticsVo vo = warehouseLogisticsService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillDetailRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillDetailRest.java new file mode 100644 index 0000000..0fe5fae --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillDetailRest.java @@ -0,0 +1,54 @@ +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.warehouseoutbilldetail.WarehouseOutBillDetailDto; +import com.yxt.warehouse.biz.warehouseoutbilldetail.WarehouseOutBillDetailService; +import com.yxt.warehouse.biz.warehouseoutbilldetail.WarehouseOutBillDetailVo; +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/7 13:51 + */ +@Api(tags = "出库单据明细") +@RestController +@RequestMapping("/apiadmin/wmsoutbilldetail") +public class WarehouseOutBillDetailRest { + @Autowired + WarehouseOutBillDetailService warehouseOutBillDetailService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseOutBillDetailService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseOutBillDetailDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseOutBillDetailService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseOutBillDetailService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillDetailVo vo = warehouseOutBillDetailService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillLockRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillLockRest.java new file mode 100644 index 0000000..e9f0f3f --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseOutBillLockRest.java @@ -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.warehouseoutbilllock.WarehouseOutBillLockDto; +import com.yxt.warehouse.biz.warehouseoutbilllock.WarehouseOutBillLockQuery; +import com.yxt.warehouse.biz.warehouseoutbilllock.WarehouseOutBillLockService; +import com.yxt.warehouse.biz.warehouseoutbilllock.WarehouseOutBillLockVo; +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/7 14:00 + */ +@Api(tags = "出库单锁定库位库存明细") +@RestController +@RequestMapping("/apiadmin/wmsoutbilllock") +public class WarehouseOutBillLockRest { + @Autowired + WarehouseOutBillLockService warehouseOutBillLockService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseOutBillLockService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseOutBillLockDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseOutBillLockService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseOutBillLockService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillLockVo vo = warehouseOutBillLockService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java index 203e86b..a75f6dc 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java @@ -3,10 +3,10 @@ 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.warehousewarehouserack.WarehouseRackDto; -import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackQuery; -import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackService; -import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackVo; +import com.yxt.warehouse.biz.warehouserack.WarehouseRackDto; +import com.yxt.warehouse.biz.warehouserack.WarehouseRackQuery; +import com.yxt.warehouse.biz.warehouserack.WarehouseRackService; +import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseSmsBuyerRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseSmsBuyerRest.java new file mode 100644 index 0000000..e51021a --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseSmsBuyerRest.java @@ -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.warehousesmsbuyer.WarehouseSmsBuyerDto; +import com.yxt.warehouse.biz.warehousesmsbuyer.WarehouseSmsBuyerQuery; +import com.yxt.warehouse.biz.warehousesmsbuyer.WarehouseSmsBuyerService; +import com.yxt.warehouse.biz.warehousesmsbuyer.WarehouseSmsBuyerVo; +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/7 14:19 + */ +@Api(tags = "收货人信息") +@RestController +@RequestMapping("/apiadmin/warehousesmsbuyer") +public class WarehouseSmsBuyerRest { + + + @Autowired + WarehouseSmsBuyerService warehouseSmsBuyerService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return warehouseSmsBuyerService.listPage(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseSmsBuyerDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseSmsBuyerService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseSmsBuyerService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WarehouseSmsBuyerVo vo = warehouseSmsBuyerService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBill.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBill.java new file mode 100644 index 0000000..32a635d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBill.java @@ -0,0 +1,37 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +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 WarehouseDistributeBill 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/warehouse/biz/warehousedistributebill/WarehouseDistributeBillDto.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillDto.java new file mode 100644 index 0000000..6d266a5 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillDto.java @@ -0,0 +1,37 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailDto; +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 WarehouseDistributeBillDto { + private String sid; + @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/warehouse/biz/warehousedistributebill/WarehouseDistributeBillInitVo.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillInitVo.java new file mode 100644 index 0000000..8ec8ecb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillInitVo.java @@ -0,0 +1,42 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailVo; +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 WarehouseDistributeBillInitVo { + + //单据编号 + 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/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.java new file mode 100644 index 0000000..6fd90f6 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.java @@ -0,0 +1,24 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +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; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseDistributeBillMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseDistributeBillVo initialization (@Param("sid") String sid); + + @Delete("delete from warehouse_sms_buyer where sid = #{sid}") + void delByMainSid(String billSid); +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.xml new file mode 100644 index 0000000..cbcb83b --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillQuery.java new file mode 100644 index 0000000..e63420d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillQuery.java @@ -0,0 +1,38 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +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 WarehouseDistributeBillQuery 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; + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillService.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillService.java new file mode 100644 index 0000000..63bbf23 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillService.java @@ -0,0 +1,102 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class WarehouseDistributeBillService extends MybatisBaseService { + + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillVo 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(); + WarehouseDistributeBill wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBill 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(WarehouseDistributeBillDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseDistributeBillDto dto) { + WarehouseDistributeBill entity = new WarehouseDistributeBill(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseDistributeBillDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseDistributeBillVo fetchDetailsVoBySid(String sid) { + WarehouseDistributeBill entity = fetchBySid(sid); + WarehouseDistributeBillVo vo = new WarehouseDistributeBillVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillVo.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillVo.java new file mode 100644 index 0000000..61df849 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillVo.java @@ -0,0 +1,33 @@ +package com.yxt.warehouse.biz.warehousedistributebill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseDistributeBillVo { + + 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/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetail.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetail.java new file mode 100644 index 0000000..c21d9b5 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetail.java @@ -0,0 +1,50 @@ +package com.yxt.warehouse.biz.warehousedistributebilldetail; + +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 WarehouseDistributeBillDetail 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/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailDto.java new file mode 100644 index 0000000..2312d09 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailDto.java @@ -0,0 +1,42 @@ +package com.yxt.warehouse.biz.warehousedistributebilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseDistributeBillDetailDto { + private String sid; + @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/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.java new file mode 100644 index 0000000..0c2f96c --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.java @@ -0,0 +1,26 @@ +package com.yxt.warehouse.biz.warehousedistributebilldetail; + +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.warehousedistributebilldetail.WarehouseDistributeBillDetail; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseDistributeBillDetailMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseDistributeBillDetailVo initialization (@Param("sid") String sid); + + @Delete("delete from wms_distribute_bill_detail where sid = #{sid}") + void delByMainSid(String billSid); +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.xml new file mode 100644 index 0000000..8627c39 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailQuery.java new file mode 100644 index 0000000..97bd57a --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailQuery.java @@ -0,0 +1,38 @@ +package com.yxt.warehouse.biz.warehousedistributebilldetail; + +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 WarehouseDistributeBillDetailQuery 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; + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailService.java new file mode 100644 index 0000000..7b3cd77 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailService.java @@ -0,0 +1,106 @@ +package com.yxt.warehouse.biz.warehousedistributebilldetail; + +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.warehousedistributebilldetail.WarehouseDistributeBillDetail; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailDto; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailQuery; +import com.yxt.warehouse.biz.warehousedistributebilldetail.WarehouseDistributeBillDetailVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class WarehouseDistributeBillDetailService extends MybatisBaseService { + + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillDetailVo 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(); + WarehouseDistributeBillDetail wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseDistributeBillDetail 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(WarehouseDistributeBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseDistributeBillDetailDto dto) { + WarehouseDistributeBillDetail entity = new WarehouseDistributeBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseDistributeBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseDistributeBillDetailVo fetchDetailsVoBySid(String sid) { + WarehouseDistributeBillDetail entity = fetchBySid(sid); + WarehouseDistributeBillDetailVo vo = new WarehouseDistributeBillDetailVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailVo.java new file mode 100644 index 0000000..baab9cb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailVo.java @@ -0,0 +1,42 @@ +package com.yxt.warehouse.biz.warehousedistributebilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseDistributeBillDetailVo { + + @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/warehouse/biz/warehousegoodstag/WarehouseGoodsTag.java b/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTag.java index 1e49cda..9d9cf7a 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTag.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTag.java @@ -28,7 +28,6 @@ public class WarehouseGoodsTag extends BaseEntity { private String unit;//计量单位 private String goodsCount;//数量 private String tagPicUrl;//标签图片地址 - private String state;//上架完成状态（1已完成 0未完成，默认为0） private String printCount;//打印次数 } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.xml index 9085bb8..c229b3a 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.xml @@ -1,19 +1,19 @@ - + - select a.* - from warehouse_receipt_bill_detail_batch a + from warehouse_goods_tag a ${ew.sqlSegment} - select a.* - from warehouse_receipt_bill_detail_batch a + from warehouse_goods_tag a where a.sid =#{sid} \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java similarity index 94% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java index e00ffb3..c17c46e 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoAllVo.java similarity index 97% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoAllVo.java index 4fb32fc..534887f 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoAllVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java index b96ba55..0ef0409 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java similarity index 94% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java index ebda3b7..a557620 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml similarity index 75% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml index 84102a9..0fe3d23 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml @@ -1,19 +1,19 @@ - + - select * - from warehouse_warehouse_info + from warehouse_info ${ew.sqlSegment} - UPDATE warehouse_warehouse_info + UPDATE warehouse_info SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java similarity index 82% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java index 845b877..91906e4 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java similarity index 99% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java index 27d89ef..58a2119 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java similarity index 96% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java index bc089e3..1b1a579 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoVo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouseinfo; +package com.yxt.warehouse.biz.warehouseinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java index f533537..9c1fb25 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java @@ -40,27 +40,27 @@ public class WarehouseInventoryAllocatebillDetailService extends MybatisBaseServ - /** - * 出库 - * - * @param dto - * @return - */ - public ResultBean outWarehousing(WarehouseInventoryAllocatebillDetailDto dto) { - ResultBean rb = ResultBean.fireFail(); - WarehouseInventoryAllocatebillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); - double exisInventory = Double.valueOf(wmsInventory.getCount()); - double out = Double.valueOf(dto.getCount()); - if (null == wmsInventory) { - return rb.setMsg("此仓库没有相应的商品库存"); - } - if (exisInventory < -out) { - return rb.setMsg("库存不足"); - } - wmsInventory.setCount(String.valueOf(exisInventory + out)); - baseMapper.updateById(wmsInventory); - return rb.success().setData(wmsInventory); - } +// /** +// * 出库 +// * +// * @param dto +// * @return +// */ +// public ResultBean outWarehousing(WarehouseInventoryAllocatebillDetailDto dto) { +// ResultBean rb = ResultBean.fireFail(); +// WarehouseInventoryAllocatebillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); +// double exisInventory = Double.valueOf(wmsInventory.getCount()); +// double out = Double.valueOf(dto.getCount()); +// if (null == wmsInventory) { +// return rb.setMsg("此仓库没有相应的商品库存"); +// } +// if (exisInventory < -out) { +// return rb.setMsg("库存不足"); +// } +// wmsInventory.setCount(String.valueOf(exisInventory + out)); +// baseMapper.updateById(wmsInventory); +// return rb.success().setData(wmsInventory); +// } public ResultBean saveOrUpdate(WarehouseInventoryAllocatebillDetailDto dto) { ResultBean rb = ResultBean.fireFail(); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogistics.java b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogistics.java new file mode 100644 index 0000000..1e3582c --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogistics.java @@ -0,0 +1,27 @@ +package com.yxt.warehouse.biz.warehouselogistics; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseLogistics extends BaseEntity { + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("物流公司") + private String logisticsCompany; + @ApiModelProperty("物流单号") + private String logisticsBillNo; + @ApiModelProperty("当前物流状态") + private String LogisticsState; + @ApiModelProperty("当前状态时间") + private String stateTime; + @ApiModelProperty("实际发货时间") + private String actualDeliveTime; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsDto.java b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsDto.java new file mode 100644 index 0000000..d3aef7b --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsDto.java @@ -0,0 +1,27 @@ +package com.yxt.warehouse.biz.warehouselogistics; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseLogisticsDto { + private String sid; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("物流公司") + private String logisticsCompany; + @ApiModelProperty("物流单号") + private String logisticsBillNo; + @ApiModelProperty("当前物流状态") + private String LogisticsState; + @ApiModelProperty("当前状态时间") + private String stateTime; + @ApiModelProperty("实际发货时间") + private String actualDeliveTime; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.java new file mode 100644 index 0000000..a4a9ac5 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.warehouselogistics; + +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; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Mapper +public interface WarehouseLogisticsMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseLogisticsVo initialization (@Param("sid") String sid); + + @Delete("delete from warehouse_logistics where sid = #{sid}") + void delByMainSid(String billSid); + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.xml new file mode 100644 index 0000000..0339b34 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsQuery.java new file mode 100644 index 0000000..ff79178 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.warehouselogistics; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 16:42 + */ +@Data +public class WarehouseLogisticsQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsService.java b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsService.java new file mode 100644 index 0000000..cf0bd33 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsService.java @@ -0,0 +1,101 @@ +package com.yxt.warehouse.biz.warehouselogistics; + +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Service +public class WarehouseLogisticsService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseLogisticsQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseLogisticsVo 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(); + WarehouseLogistics wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseLogistics 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(WarehouseLogisticsDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseLogisticsDto dto) { + WarehouseLogistics entity = new WarehouseLogistics(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseLogisticsDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseLogisticsVo fetchDetailsVoBySid(String sid) { + WarehouseLogistics entity = fetchBySid(sid); + WarehouseLogisticsVo vo = new WarehouseLogisticsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsVo.java b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsVo.java new file mode 100644 index 0000000..b32fa99 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsVo.java @@ -0,0 +1,27 @@ +package com.yxt.warehouse.biz.warehouselogistics; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class WarehouseLogisticsVo { + private String sid; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("物流公司") + private String logisticsCompany; + @ApiModelProperty("物流单号") + private String logisticsBillNo; + @ApiModelProperty("当前物流状态") + private String LogisticsState; + @ApiModelProperty("当前状态时间") + private String stateTime; + @ApiModelProperty("实际发货时间") + private String actualDeliveTime; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java index 68408d7..402ae54 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailDto.java @@ -10,7 +10,7 @@ import lombok.Data; **/ @Data public class WarehouseOutBillDetailDto { - + private String sid; @ApiModelProperty("商品基础信息Sid") private String goodSpuSid; @ApiModelProperty("商品名称") diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java new file mode 100644 index 0000000..c4e016e --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.warehouseoutbilldetail; + +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; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Mapper +public interface WarehouseOutBillDetailMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseOutBillDetailVo initialization (@Param("sid") String sid); + + @Delete("delete from warehouse_out_bill_detail where sid = #{sid}") + void delByMainSid(String billSid); + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml new file mode 100644 index 0000000..765aead --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java new file mode 100644 index 0000000..790ffac --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.warehouseoutbilldetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 16:42 + */ +@Data +public class WarehouseOutBillDetailQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailService.java new file mode 100644 index 0000000..8ee822d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailService.java @@ -0,0 +1,102 @@ +package com.yxt.warehouse.biz.warehouseoutbilldetail; + +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; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Service +public class WarehouseOutBillDetailService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseReceiptBillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillDetailVo 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(); + WarehouseOutBillDetail wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillDetail 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(WarehouseOutBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseOutBillDetailDto dto) { + WarehouseOutBillDetail entity = new WarehouseOutBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseOutBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseOutBillDetailVo fetchDetailsVoBySid(String sid) { + WarehouseOutBillDetail entity = fetchBySid(sid); + WarehouseOutBillDetailVo vo = new WarehouseOutBillDetailVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailVo.java new file mode 100644 index 0000000..592ac1d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailVo.java @@ -0,0 +1,47 @@ +package com.yxt.warehouse.biz.warehouseoutbilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class WarehouseOutBillDetailVo { + @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 orderCount; + @ApiModelProperty("未结数量") + private BigDecimal remainingCount; + @ApiModelProperty("调整数量") + private BigDecimal adjustCount; + @ApiModelProperty("分配数量") + private BigDecimal distributeCount; + @ApiModelProperty("发货数量") + private BigDecimal deliveryCount; + @ApiModelProperty("状态（新建/已发货完成、部分分配、全部分配等）") + private Integer billState; + @ApiModelProperty("发货时间") + private Date deliveTime; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLock.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLock.java new file mode 100644 index 0000000..cb44d90 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLock.java @@ -0,0 +1,33 @@ +package com.yxt.warehouse.biz.warehouseoutbilllock; + +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/24 + **/ +@Data +public class WarehouseOutBillLock extends BaseEntity { + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("出库单明细sid") + private String billDetailSid; + @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 count; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockDto.java new file mode 100644 index 0000000..b6a2f55 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockDto.java @@ -0,0 +1,31 @@ +package com.yxt.warehouse.biz.warehouseoutbilllock; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillLockDto { + private String sid; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("出库单明细sid") + private String billDetailSid; + @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 count; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.java new file mode 100644 index 0000000..4d05a15 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.warehouseoutbilllock; + +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; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Mapper +public interface WarehouseOutBillLockMapper extends BaseMapper { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseOutBillLockVo initialization (@Param("sid") String sid); + + @Delete("delete from warehouse_out_bill_lock where sid = #{sid}") + void delByMainSid(String billSid); + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.xml new file mode 100644 index 0000000..be689eb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockQuery.java new file mode 100644 index 0000000..6c53e01 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.warehouseoutbilllock; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 16:42 + */ +@Data +public class WarehouseOutBillLockQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockService.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockService.java new file mode 100644 index 0000000..41e4509 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockService.java @@ -0,0 +1,101 @@ +package com.yxt.warehouse.biz.warehouseoutbilllock; + +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Service +public class WarehouseOutBillLockService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillLockQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillLockVo 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(); + WarehouseOutBillLock wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseOutBillLock 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(WarehouseOutBillLockDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseOutBillLockDto dto) { + WarehouseOutBillLock entity = new WarehouseOutBillLock(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseOutBillLockDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseOutBillLockVo fetchDetailsVoBySid(String sid) { + WarehouseOutBillLock entity = fetchBySid(sid); + WarehouseOutBillLockVo vo = new WarehouseOutBillLockVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockVo.java new file mode 100644 index 0000000..6cdc914 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockVo.java @@ -0,0 +1,33 @@ +package com.yxt.warehouse.biz.warehouseoutbilllock; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class WarehouseOutBillLockVo { + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("出库单明细sid") + private String billDetailSid; + @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 count; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java similarity index 91% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java index d02fce4..ac979e5 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRack.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouserack; +package com.yxt.warehouse.biz.warehouserack; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java similarity index 91% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java index dea2711..5bde869 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackDto.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouserack; +package com.yxt.warehouse.biz.warehouserack; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java similarity index 93% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java index 19a5dcf..3de02e2 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouserack; +package com.yxt.warehouse.biz.warehouserack; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml similarity index 60% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml index b96898e..76db5f7 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml @@ -1,29 +1,29 @@ - + - select a.*,b.areaName as locationName ,c.warehouseName as warehouseName - from warehouse_warehouse_rack a - left join warehouse_warehouse_area b on b.sid =a.locationSid - left join warehouse_warehouse_info c on c.sid = a.warehouseSid + from warehouse_rack a + left join warehouse_area b on b.sid =a.locationSid + left join warehouse_info c on c.sid = a.warehouseSid ${ew.sqlSegment} - select a.*,b.areaName as locationName ,c.warehouseName as warehouseName - from warehouse_warehouse_rack a - left join warehouse_warehouse_area b on b.sid =a.locationSid - left join warehouse_warehouse_info c on c.sid = a.warehouseSid + from warehouse_rack a + left join warehouse_area b on b.sid =a.locationSid + left join warehouse_info c on c.sid = a.warehouseSid where a.sid =#{sid} - UPDATE warehouse_warehouse_rack + UPDATE warehouse_rack SET isDelete=1 where sid in diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java similarity index 85% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java index aec4d83..12930a2 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouserack; +package com.yxt.warehouse.biz.warehouserack; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java similarity index 98% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java index 8020c38..91bf70c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouserack; +package com.yxt.warehouse.biz.warehouserack; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; diff --git a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackVo.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackVo.java similarity index 94% rename from src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackVo.java rename to src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackVo.java index 82e3bb8..03ae36f 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackVo.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackVo.java @@ -1,4 +1,4 @@ -package com.yxt.warehouse.biz.warehousewarehouserack; +package com.yxt.warehouse.biz.warehouserack; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBill.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBill.java index 23a1926..2a33595 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBill.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBill.java @@ -21,10 +21,7 @@ public class WarehouseShelfBill extends BaseEntity { private String createByName; @ApiModelProperty("0新建，1已完成") private Integer billState; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("制单人") - private String createBySid; + @ApiModelProperty("备注") private String remark; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java index dcc346b..a236428 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java @@ -135,12 +135,12 @@ public class WarehouseShelfBillService extends MybatisBaseService { + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + WarehouseSmsBuyerVo initialization (@Param("sid") String sid); + + @Delete("delete from warehouse_sms_buyer where sid = #{sid}") + void delByMainSid(String billSid); + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerMapper.xml new file mode 100644 index 0000000..754798d --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerMapper.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerQuery.java new file mode 100644 index 0000000..9791087 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerQuery.java @@ -0,0 +1,13 @@ +package com.yxt.warehouse.biz.warehousesmsbuyer; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 16:42 + */ +@Data +public class WarehouseSmsBuyerQuery implements Query { + private String name; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerService.java b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerService.java new file mode 100644 index 0000000..6f265bb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerService.java @@ -0,0 +1,101 @@ +package com.yxt.warehouse.biz.warehousesmsbuyer; + +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Service +public class WarehouseSmsBuyerService extends MybatisBaseService { + + + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseSmsBuyerQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseSmsBuyerVo 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(); + WarehouseSmsBuyer wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseSmsBuyer 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(WarehouseSmsBuyerDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(WarehouseSmsBuyerDto dto) { + WarehouseSmsBuyer entity = new WarehouseSmsBuyer(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(WarehouseSmsBuyerDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public WarehouseSmsBuyerVo fetchDetailsVoBySid(String sid) { + WarehouseSmsBuyer entity = fetchBySid(sid); + WarehouseSmsBuyerVo vo = new WarehouseSmsBuyerVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerVo.java b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerVo.java new file mode 100644 index 0000000..0b29cf9 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerVo.java @@ -0,0 +1,40 @@ +package com.yxt.warehouse.biz.warehousesmsbuyer; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class WarehouseSmsBuyerVo { + private String sid; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("收货人姓名") + private String buyerName; + @ApiModelProperty("收货人手机") + private String buyerMob; + @ApiModelProperty("收货省sid") + private String provinceSid; + @ApiModelProperty("") + private String province; + @ApiModelProperty("收货市sid") + private String citySid; + @ApiModelProperty("") + private String city; + @ApiModelProperty("收货县区sid") + private String countySid; + @ApiModelProperty("") + private String county; + + @ApiModelProperty("收货详细地址") + private String address; + + @ApiModelProperty("买家留言") + private String buyerMessage; + private String remark; + +}