6/7

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<PagerVo<WarehouseDistributeBillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseDistributeBillDetailQuery> 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<WarehouseDistributeBillVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseDistributeBillDetailVo vo = warehouseDistributeBillDetailService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

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<PagerVo<WarehouseDistributeBillVo>> listPage(@RequestBody PagerQuery<WarehouseDistributeBillQuery> 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<WarehouseDistributeBillVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseDistributeBillVo vo = warehouseDistributeBillService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

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;

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<PagerVo<WarehouseLogisticsVo>> listPage(@RequestBody PagerQuery<WarehouseLogisticsQuery> 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<WarehouseLogisticsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseLogisticsVo vo = warehouseLogisticsService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

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<PagerVo<WarehouseOutBillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseReceiptBillDetailQuery> 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<WarehouseOutBillDetailVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseOutBillDetailVo vo = warehouseOutBillDetailService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

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<PagerVo<WarehouseOutBillLockVo>> listPage(@RequestBody PagerQuery<WarehouseOutBillLockQuery> 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<WarehouseOutBillLockVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseOutBillLockVo vo = warehouseOutBillLockService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+}

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;

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<PagerVo<WarehouseSmsBuyerVo>> listPage(@RequestBody PagerQuery<WarehouseSmsBuyerQuery> 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<WarehouseSmsBuyerVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseSmsBuyerVo vo = warehouseSmsBuyerService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

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;
+}

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<WarehouseDistributeBillDetailDto> detailList = new ArrayList<>();
+}

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<WarehouseDistributeBillDetailVo> detailsList = new ArrayList<>();
+
+}

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<WarehouseDistributeBill> {
+
+    IPage<WarehouseDistributeBillVo> listPage(IPage<WarehouseDistributeBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseDistributeBill> qw);
+    WarehouseDistributeBillVo initialization (@Param("sid") String sid);
+
+    @Delete("delete from warehouse_sms_buyer where sid = #{sid}")
+    void delByMainSid(String billSid);
+}

src/main/java/com/yxt/warehouse/biz/warehousedistributebill/WarehouseDistributeBillMapper.xml

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

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;
+}

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<WarehouseDistributeBillMapper, WarehouseDistributeBill> {
+
+
+
+    public ResultBean<PagerVo<WarehouseDistributeBillVo>> listPage(PagerQuery<WarehouseDistributeBillQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseDistributeBillQuery query = pq.getParams();
+        QueryWrapper<WarehouseDistributeBill> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("rackName", query.getName());
+        }
+
+        IPage<WarehouseDistributeBill> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseDistributeBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseDistributeBillVo> p = PagerUtil.pageToVo(pagging, null);
+        List<WarehouseDistributeBillVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+
+
+    public ResultBean<WarehouseDistributeBillVo> 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;
+    }
+}

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;
+}

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;
+}

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;
+}

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<WarehouseDistributeBillDetail> {
+
+    IPage<WarehouseDistributeBillDetailVo> listPage(IPage<WarehouseDistributeBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseDistributeBillDetail> qw);
+    WarehouseDistributeBillDetailVo initialization (@Param("sid") String sid);
+
+    @Delete("delete from wms_distribute_bill_detail where sid = #{sid}")
+    void delByMainSid(String billSid);
+}

src/main/java/com/yxt/warehouse/biz/warehousedistributebilldetail/WarehouseDistributeBillDetailMapper.xml

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

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;
+}

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<WarehouseDistributeBillDetailMapper, WarehouseDistributeBillDetail> {
+
+
+
+    public ResultBean<PagerVo<WarehouseDistributeBillDetailVo>> listPage(PagerQuery<WarehouseDistributeBillDetailQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseDistributeBillDetailQuery query = pq.getParams();
+        QueryWrapper<WarehouseDistributeBillDetail> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("rackName", query.getName());
+        }
+
+        IPage<WarehouseDistributeBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseDistributeBillDetailVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseDistributeBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
+        List<WarehouseDistributeBillDetailVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+
+
+    public ResultBean<WarehouseDistributeBillDetailVo> 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;
+    }
+}

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;
+}

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;//打印次数
 
 }

src/main/java/com/yxt/warehouse/biz/warehousegoodstag/WarehouseGoodsTagMapper.xml

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

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfo.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoAllVo.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoDto.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.warehouse.biz.warehousewarehouseinfo.WarehouseInfoMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.warehouse.biz.warehousewarehouseinfo.WarehouseInfoVo">
+    <select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
         select
         *
-        from warehouse_warehouse_info
+        from warehouse_info
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
     <update id="updateBySidIsDelete">
-        UPDATE warehouse_warehouse_info
+        UPDATE warehouse_info
         SET isDelete=1
         where sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoQuery.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoService.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouseinfo/WarehouseInfoVo.java → 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;

src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java

@@ -40,27 +40,27 @@ public class WarehouseInventoryAllocatebillDetailService extends MybatisBaseServ
 
 
 
-    /**
-     * 出库
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean<WarehouseInventoryAllocatebillDetail> outWarehousing(WarehouseInventoryAllocatebillDetailDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        WarehouseInventoryAllocatebillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper<WarehouseInventoryAllocatebillDetail>().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<WarehouseInventoryAllocatebillDetail> outWarehousing(WarehouseInventoryAllocatebillDetailDto dto) {
+//        ResultBean rb = ResultBean.fireFail();
+//        WarehouseInventoryAllocatebillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper<WarehouseInventoryAllocatebillDetail>().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<String> saveOrUpdate(WarehouseInventoryAllocatebillDetailDto dto) {
         ResultBean rb = ResultBean.fireFail();

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;
+
+}

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;
+
+}

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<WarehouseLogistics> {
+
+    IPage<WarehouseLogisticsVo> listPage(IPage<WarehouseLogistics> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseLogistics> qw);
+    WarehouseLogisticsVo initialization (@Param("sid") String sid);
+
+    @Delete("delete from warehouse_logistics where sid = #{sid}")
+    void delByMainSid(String billSid);
+
+}

src/main/java/com/yxt/warehouse/biz/warehouselogistics/WarehouseLogisticsMapper.xml

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

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;
+}

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<WarehouseLogisticsMapper, WarehouseLogistics> {
+
+
+    public ResultBean<PagerVo<WarehouseLogisticsVo>> listPage(PagerQuery<WarehouseLogisticsQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseLogisticsQuery query = pq.getParams();
+        QueryWrapper<WarehouseLogistics> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("rackName", query.getName());
+        }
+
+        IPage<WarehouseLogistics> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseLogisticsVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseLogisticsVo> p = PagerUtil.pageToVo(pagging, null);
+        List<WarehouseLogisticsVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+
+
+    public ResultBean<WarehouseLogisticsVo> 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;
+    }
+}

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;
+
+}

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("商品名称")

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<WarehouseOutBillDetail> {
+
+    IPage<WarehouseOutBillDetailVo> listPage(IPage<WarehouseOutBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseOutBillDetail> qw);
+    WarehouseOutBillDetailVo initialization (@Param("sid") String sid);
+
+    @Delete("delete from warehouse_out_bill_detail where sid = #{sid}")
+    void delByMainSid(String billSid);
+
+}

src/main/java/com/yxt/warehouse/biz/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml

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

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;
+}

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<WarehouseOutBillDetailMapper, WarehouseOutBillDetail> {
+
+
+    public ResultBean<PagerVo<WarehouseOutBillDetailVo>> listPage(PagerQuery<WarehouseReceiptBillDetailQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseReceiptBillDetailQuery query = pq.getParams();
+        QueryWrapper<WarehouseOutBillDetail> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("rackName", query.getName());
+        }
+
+        IPage<WarehouseOutBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseOutBillDetailVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseOutBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
+        List<WarehouseOutBillDetailVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+
+
+    public ResultBean<WarehouseOutBillDetailVo> 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;
+    }
+}

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;
+
+}

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;
+}

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;
+
+}

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<WarehouseOutBillLock> {
+
+    IPage<WarehouseOutBillLockVo> listPage(IPage<WarehouseOutBillLock> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseOutBillLock> qw);
+    WarehouseOutBillLockVo initialization (@Param("sid") String sid);
+
+    @Delete("delete from warehouse_out_bill_lock where sid = #{sid}")
+    void delByMainSid(String billSid);
+
+}

src/main/java/com/yxt/warehouse/biz/warehouseoutbilllock/WarehouseOutBillLockMapper.xml

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

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;
+}

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<WarehouseOutBillLockMapper, WarehouseOutBillLock> {
+
+
+    public ResultBean<PagerVo<WarehouseOutBillLockVo>> listPage(PagerQuery<WarehouseOutBillLockQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseOutBillLockQuery query = pq.getParams();
+        QueryWrapper<WarehouseOutBillLock> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("rackName", query.getName());
+        }
+
+        IPage<WarehouseOutBillLock> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseOutBillLockVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseOutBillLockVo> p = PagerUtil.pageToVo(pagging, null);
+        List<WarehouseOutBillLockVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+
+
+    public ResultBean<WarehouseOutBillLockVo> 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;
+    }
+}

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;
+
+}

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRack.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackDto.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackMapper">
+<mapper namespace="com.yxt.warehouse.biz.warehouserack.WarehouseRackMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackVo">
+    <select id="listPage" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">
         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>
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="initialization" resultType="com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackVo">
+    <select id="initialization" resultType="com.yxt.warehouse.biz.warehouserack.WarehouseRackVo">
         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}
     </select>
     <update id="updateBySidIsDelete">
-        UPDATE warehouse_warehouse_rack
+        UPDATE warehouse_rack
         SET isDelete=1
         where sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackQuery.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackService.java → 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;

src/main/java/com/yxt/warehouse/biz/warehousewarehouserack/WarehouseRackVo.java → 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;

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;
 }

src/main/java/com/yxt/warehouse/biz/warehouseshelfbill/WarehouseShelfBillService.java

@@ -135,12 +135,12 @@ public class WarehouseShelfBillService extends MybatisBaseService<WarehouseShelf
                 dto.setWarehouseRackSid(s.getWarehouseRackSid());
                 dto.setWarehouseRackCode(s.getWarehouseRackCode());
                 dto.setFirstInDate(DateUtil.today());
-                dto.setCreateOrgSid(wmsShelfBill.getCreateOrgSid());
-                dto.setUseOrgSid(wmsShelfBill.getUseOrgSid());
+//                dto.setCreateOrgSid(wmsShelfBill.getCreateOrgSid());
+//                dto.setUseOrgSid(wmsShelfBill.getUseOrgSid());
                 dto.setSid(s.getInventorySid());
                 String inventorySid = wmsInventoryService.saveWmsInventory(dto).getData();
                 WarehouseShelfBillDetail wmsShelfBillDetail = wmsShelfBillDetailService.fetchBySid(s.getDetailsSid());
-                wmsShelfBillDetail.setInventorySid(inventorySid);
+//                wmsShelfBillDetail.setInventorySid(inventorySid);
                 wmsShelfBillDetailService.updateById(wmsShelfBillDetail);
                 WarehouseInventoryRecordDto wmsInventoryRecordDto = new WarehouseInventoryRecordDto();
                 wmsInventoryRecordDto.setInventorySid(inventorySid);

src/main/java/com/yxt/warehouse/biz/warehouseshelfbillrecord/WarehouseShelfBillRecord.java

@@ -27,8 +27,4 @@ public class WarehouseShelfBillRecord extends BaseEntity {
     private String warehouseRackCode;
     @ApiModelProperty("上架数量")
     private String shelfCount;
-    @ApiModelProperty("上架时间")
-    private BigDecimal createTime;
-    @ApiModelProperty("上架人")
-    private BigDecimal createBySid;
 }

src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyer.java

@@ -0,0 +1,38 @@
+package com.yxt.warehouse.biz.warehousesmsbuyer;
+
+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 WarehouseSmsBuyer extends BaseEntity {
+    @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;
+}

src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerDto.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/24
+ **/
+@Data
+public class WarehouseSmsBuyerDto {
+    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;
+
+}

src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerMapper.java

@@ -0,0 +1,25 @@
+package com.yxt.warehouse.biz.warehousesmsbuyer;
+
+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 WarehouseSmsBuyerMapper extends BaseMapper<WarehouseSmsBuyer> {
+
+    IPage<WarehouseSmsBuyerVo> listPage(IPage<WarehouseSmsBuyer> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseSmsBuyer> qw);
+    WarehouseSmsBuyerVo initialization (@Param("sid") String sid);
+
+    @Delete("delete from warehouse_sms_buyer where sid = #{sid}")
+    void delByMainSid(String billSid);
+
+}

src/main/java/com/yxt/warehouse/biz/warehousesmsbuyer/WarehouseSmsBuyerMapper.xml

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

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;
+}

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<WarehouseSmsBuyerMapper, WarehouseSmsBuyer> {
+
+
+    public ResultBean<PagerVo<WarehouseSmsBuyerVo>> listPage(PagerQuery<WarehouseSmsBuyerQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WarehouseSmsBuyerQuery query = pq.getParams();
+        QueryWrapper<WarehouseSmsBuyer> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("rackName", query.getName());
+        }
+
+        IPage<WarehouseSmsBuyer> page = PagerUtil.queryToPage(pq);
+        IPage<WarehouseSmsBuyerVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseSmsBuyerVo> p = PagerUtil.pageToVo(pagging, null);
+        List<WarehouseSmsBuyerVo> records = pagging.getRecords();
+        return rb.success().setData(p);
+    }
+
+
+    public ResultBean<WarehouseSmsBuyerVo> 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;
+    }
+}

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;
+
+}