出库

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @author wangpengfei
@@ -111,5 +112,11 @@ public class WarehouseInventoryRest {
     ResultBean<WarehouseInventory> fetchEntityBySid(@RequestParam("sid") String sid) {
         return warehouseInventoryService.fetchEntityBySid(sid);
     }
-
+    @ApiOperation("根据skuSid查询商品可用库存")
+    @GetMapping("/selAvailableBySkuSid")
+    public ResultBean<List<AvailableCountVo>> selAvailableBySkuSid(@RequestParam("skuSid") String skuSid,
+                                                                   @RequestParam("sourceBillSid") String sourceBillSid,
+                                                                   @RequestParam("orgSid") String orgSid) {
+        return warehouseInventoryService.selAvailableBySkuSid(skuSid,sourceBillSid,orgSid);
+    }
 }

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceOutRest.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutDto;
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutService;
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/8/14 14:56
+ */
+
+@Api(tags = "发票和出库单关联表")
+@RestController
+@RequestMapping("/apiadmin/warehouseinvoiceout")
+public class WarehouseInvoiceOutRest {
+
+}

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceRest.java

@@ -0,0 +1,37 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceDto;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceService;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceVo;
+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/8/14 14:55
+ */
+@Api(tags = "发票信息")
+@RestController
+@RequestMapping("/apiadmin/warehouseinvoice")
+public class WarehouseInvoiceRest {
+    @Autowired
+    private WarehouseInvoiceService warehouseInvoiceService;
+
+
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean saveOrUpdate(@RequestBody WarehouseInvoiceDto dto) {
+        return warehouseInvoiceService.saveOrUpdate(dto);
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<WarehouseInvoiceVo> details(@RequestParam("sid") String sid) {
+        return warehouseInvoiceService.details(sid);
+    }
+
+}

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillDetailRest.java

@@ -0,0 +1,33 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailService;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/6/7 13:51
+ */
+@Api(tags = "出库单据明细")
+@RestController
+@RequestMapping("/apiadmin/warehouseoutbilldetail")
+public class WarehouseOutBillDetailRest {
+    @Autowired
+    WarehouseOutBillDetailService warehouseOutBillDetailService;
+
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/selectDetailsByBillSid")
+    public ResultBean<List<WarehouseOutBillDetailVo>> selectDetailsByBillSid(@RequestParam("sid") String sid){
+        return  warehouseOutBillDetailService.selectDetailsByBillSid(sid);
+    }
+
+}

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java

@@ -1,9 +1,10 @@
-package com.yxt.Warehouse.apiadmin.aggregation;
+package com.yxt.wms.apiadmin.aggregation;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.warehouseoutbill.*;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +12,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * @description:
- * @author: dimengzhe
- * @date: 2024/4/24
+ * @author: wangpengfei
+ * @date: 2024/8/12
  **/
 @Api(tags = "出库单据")
 @RestController
@@ -39,16 +40,46 @@ public class WarehouseOutBillRest {
     ResultBean<WarehouseOutBillDetailsVo> details(@RequestParam("sid") String sid) {
         return warehouseOutBillService.details(sid);
     }
-
+    @ApiOperation("收件地址")
+    @GetMapping("/getAddresseeBySid")
+    ResultBean<WarehouseOutBillDetailsVo> getAddresseeBySid(@RequestParam("sid") String sid) {
+        return warehouseOutBillService.getAddresseeBySid(sid);
+    }
     @ApiOperation("选择商品分页列表")
     @PostMapping("/getInventoryList")
-    ResultBean<PagerVo<WarehouseOutBillInventoryVo>> getInventoryList(@RequestBody PagerQuery<WarehouseOutBillInventoryQuery> pagerQuery) {
+    ResultBean<PagerVo<WarehouseOutBillDetailVo>> getInventoryList(@RequestBody PagerQuery<WarehouseOutBillGoodsQuery> pagerQuery) {
         return warehouseOutBillService.getInventoryList(pagerQuery);
     }
+    @ApiOperation("修改承运商")
+    @PostMapping("/updateCarrier")
+    public ResultBean updateCarrier(WarehouseOutBillDto dto) {
+        return warehouseOutBillService.updateCarrier(dto);
+    }
+    @ApiOperation("修改运单号")
+    @PostMapping("/updateWaybillNumber")
+    public ResultBean updateWaybillNumber(WarehouseOutBillDto dto) {
+        return warehouseOutBillService.updateWaybillNumber(dto);
+    }
+    @ApiOperation("待分配-->打到零拣")
+    @PostMapping("/toBePickOut")
+    ResultBean toBePickOut(@RequestBody WarehouseOutStateQuery query) {
+        return warehouseOutBillService.toBePickOut(query);
+    }
+    @ApiOperation("零拣打单 --> 待出库")
+    @PostMapping("/toBeOutbound")
+    ResultBean toBeOutbound(@RequestBody WarehouseOutStateQuery query) {
+        return warehouseOutBillService.toBeOutbound(query);
+    }
+    @ApiOperation("零拣打单--->待分配")
+    @PostMapping("/toBeAllocated")
+    ResultBean toBeAllocated(@RequestBody WarehouseOutStateQuery query) {
+        return warehouseOutBillService.toBeAllocated(query);
+    }
 
     @ApiOperation("确认")
     @PostMapping("/confirm")
     ResultBean confirm(@RequestBody WarehouseOutBillDto dto) {
         return warehouseOutBillService.confirm(dto);
     }
+
 }

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutLocationRest.java

@@ -0,0 +1,37 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationDto;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationService;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/8/15 10:09
+ */
+@Api(tags = "出库库位分配")
+@RestController
+@RequestMapping("/apiadmin/warehouseoutlocation")
+public class WarehouseOutLocationRest {
+
+    @Autowired
+    WarehouseOutLocationService warehouseOutLocationService;
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean save(@RequestBody List<WarehouseOutLocationDto> dtos) {
+        return warehouseOutLocationService.save(dtos);
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<List<WarehouseOutLocationVo>> details(@RequestParam("sid") String sid) {
+        return warehouseOutLocationService.details(sid);
+    }
+}

wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java

@@ -33,7 +33,6 @@ import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery;
 import com.yxt.wms.biz.func.commonmethod.CommonMethod;
 import com.yxt.wms.biz.func.commonmethod.DataRule;
 import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
-import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign;
 import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign;
 import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;

wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java

@@ -23,7 +23,7 @@ import lombok.Data;
 @Data
 public class SysUserRoleDto implements Dto {
 
-    
+    private String sid;
 	@ApiModelProperty("用户sid")
     private String userSid;
     

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/AvailableCountVo.java

@@ -0,0 +1,25 @@
+package com.yxt.wms.biz.func.warehouseinventory;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangpengfei
+ * @date 2024/8/15 11:23
+ */
+@Data
+public class AvailableCountVo {
+    private String sid;
+    private String locationSid;//分配明细sid
+    private String goodsSkuSid;
+    private String goodsSpuName;
+    private String warehouseName;
+    private String areaName;
+    private String rackSid;
+    private String rackName;
+    private String rackCode;
+    private BigDecimal useCount;
+    private BigDecimal initialCount=new BigDecimal(0);//原分配数
+    private BigDecimal count=new BigDecimal(0);//分配数
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java

@@ -323,4 +323,7 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
     public ResultBean<PagerVo<WarehouseInventoryHandleSelectList>> handleGoodsListPage(PagerQuery<WarehouseInventoryHandleSelectQuery> pq) {
         return warehouseInventoryFeign.handleGoodsListPage(pq);
     }
+    public ResultBean<List<AvailableCountVo>> selAvailableBySkuSid(String skuSid,String sourceBillSid,String orgSid) {
+        return warehouseInventoryFeign.selAvailableBySkuSid(skuSid,sourceBillSid,orgSid);
+    }
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoice.java

@@ -0,0 +1,33 @@
+package com.yxt.wms.biz.func.warehouseinvoice;
+
+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 WarehouseInvoice extends BaseEntity {
+
+
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("发票类型 1 普通发票")
+    private String invoiceType;
+
+    @ApiModelProperty("开票方")
+    private String invoicingParty;
+    @ApiModelProperty("抬头")
+    private String rise;
+    @ApiModelProperty("总金额")
+    private String totalAmount;
+    @ApiModelProperty("税号")
+    private String dutyParagraph;
+    @ApiModelProperty("内容类型 1 发票商品 2自定义明细")
+    private String contentType;
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceDto.java

@@ -0,0 +1,39 @@
+package com.yxt.wms.biz.func.warehouseinvoice;
+
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutDto;
+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 WarehouseInvoiceDto {
+    private  String sid;
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("发票类型 1 普通发票")
+    private String invoiceType;
+
+    @ApiModelProperty("开票方")
+    private String invoicingParty;
+    @ApiModelProperty("抬头")
+    private String rise;
+    @ApiModelProperty("总金额")
+    private String totalAmount;
+    @ApiModelProperty("税号")
+    private String dutyParagraph;
+    @ApiModelProperty("内容类型 1 发票商品 2自定义明细")
+    private String contentType;
+    private String remarks;
+
+
+    private List<WarehouseInvoiceOutDto> detailsList = new ArrayList<>();
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.java

@@ -0,0 +1,22 @@
+package com.yxt.wms.biz.func.warehouseinvoice;
+
+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.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Mapper
+public interface WarehouseInvoiceMapper extends BaseMapper<WarehouseInvoice> {
+    IPage<WarehouseInvoiceVo> listPage(IPage<WarehouseInvoice> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInvoice> qw);
+
+    WarehouseInvoiceVo details(@Param("sid") String sid);
+
+}
+

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.xml

@@ -0,0 +1,5 @@
+<?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.wms.biz.func.warehouseinvoice.WarehouseInvoiceMapper">
+
+</mapper>

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceQuery.java

@@ -0,0 +1,49 @@
+package com.yxt.wms.biz.func.warehouseinvoice;
+
+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 WarehouseInvoiceQuery implements Query {
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    private String billState;
+    @ApiModelProperty("外部单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("下单日期开始时间")
+    private String orderTimeStart;
+    @ApiModelProperty("下单日期结束时间")
+    private String orderTimeEnd;
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceService.java

@@ -0,0 +1,36 @@
+package com.yxt.wms.biz.func.warehouseinvoice;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutDto;
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutService;
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutVo;
+import com.yxt.wms.feign.warehouse.warehouseinvoice.WarehouseInvoiceFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Service
+public class WarehouseInvoiceService extends MybatisBaseService<WarehouseInvoiceMapper, WarehouseInvoice> {
+
+    @Autowired
+    WarehouseInvoiceFeign warehouseInvoiceFeign;
+
+    public ResultBean<String> saveOrUpdate(WarehouseInvoiceDto dto) {
+       return warehouseInvoiceFeign.saveOrUpdate(dto);
+    }
+
+    public ResultBean<WarehouseInvoiceVo> details(String sid) {
+        return warehouseInvoiceFeign.details(sid);
+    }
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceVo.java

@@ -0,0 +1,42 @@
+package com.yxt.wms.biz.func.warehouseinvoice;
+
+
+import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutVo;
+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 WarehouseInvoiceVo {
+    private String sid;
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("发票类型 1 普通发票")
+    private String invoiceType;
+    private String invoiceTypeValue;
+
+    @ApiModelProperty("开票方")
+    private String invoicingParty;
+    @ApiModelProperty("抬头")
+    private String rise;
+    @ApiModelProperty("总金额")
+    private String totalAmount;
+    @ApiModelProperty("税号")
+    private String dutyParagraph;
+    @ApiModelProperty("内容类型 1 发票商品 2自定义明细")
+    private String contentType;
+    private String contentTypeValue;
+    private String remarks;
+
+
+    private List<WarehouseInvoiceOutVo> detailsList = new ArrayList<>();
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOut.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.warehouseinvoiceout;
+
+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 WarehouseInvoiceOut extends BaseEntity {
+
+
+    @ApiModelProperty("发票sid")
+    private String invoiceSid;
+    @ApiModelProperty("商品skusid")
+    private String goodsSkuSid;
+
+    @ApiModelProperty("商品名")
+    private String goodsSpuName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
+    @ApiModelProperty("数量")
+    private BigDecimal orderCount;
+    @ApiModelProperty("总金额")
+    private BigDecimal salesAmount;
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutDto.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.warehouseinvoiceout;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Data
+public class WarehouseInvoiceOutDto {
+
+    private String sid;
+    @ApiModelProperty("发票sid")
+    private String invoiceSid;
+    @ApiModelProperty("商品skusid")
+    private String goodsSkuSid;
+
+    @ApiModelProperty("商品名")
+    private String goodsSpuName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
+    @ApiModelProperty("数量")
+    private BigDecimal orderCount;
+    @ApiModelProperty("总金额")
+    private BigDecimal salesAmount;
+
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.func.warehouseinvoiceout;
+
+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.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Mapper
+public interface WarehouseInvoiceOutMapper extends BaseMapper<WarehouseInvoiceOut> {
+    IPage<WarehouseInvoiceOutVo> listPage(IPage<WarehouseInvoiceOut> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInvoiceOut> qw);
+
+    List<WarehouseInvoiceOutVo> detailsByInvoiceSid(@Param("sid") String sid);
+
+}
+

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.xml

@@ -0,0 +1,6 @@
+<?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.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutMapper">
+
+
+</mapper>

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutQuery.java

@@ -0,0 +1,49 @@
+package com.yxt.wms.biz.func.warehouseinvoiceout;
+
+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 WarehouseInvoiceOutQuery implements Query {
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    private String billState;
+    @ApiModelProperty("外部单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("下单日期开始时间")
+    private String orderTimeStart;
+    @ApiModelProperty("下单日期结束时间")
+    private String orderTimeEnd;
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutService.java

@@ -0,0 +1,21 @@
+package com.yxt.wms.biz.func.warehouseinvoiceout;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Service
+public class WarehouseInvoiceOutService extends MybatisBaseService<WarehouseInvoiceOutMapper, WarehouseInvoiceOut> {
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutVo.java

@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.func.warehouseinvoiceout;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Data
+public class WarehouseInvoiceOutVo {
+
+    private String sid;
+    @ApiModelProperty("发票sid")
+    private String invoiceSid;
+    @ApiModelProperty("商品skusid")
+    private String goodsSkuSid;
+
+    @ApiModelProperty("商品名")
+    private String goodsSpuName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
+    @ApiModelProperty("数量")
+    private BigDecimal orderCount;
+    @ApiModelProperty("总金额")
+    private BigDecimal salesAmount;
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java

@@ -14,32 +14,93 @@ import java.util.Date;
 @Data
 public class WarehouseOutBill extends BaseEntity {
 
+
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("来源单号")
     private String sourceBillNo;
-    @ApiModelProperty("制单人")
-    private String createByName;
-    @ApiModelProperty("业务类型key")
-    private String busTypeKey;
-    @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））")
-    private String busTypeValue;
-    @ApiModelProperty("货主sid")
-    private String goodsOwnerSid;
+    @ApiModelProperty("外部状态")
+    private String externalState;
+    @ApiModelProperty("买家留言")
+    private String buyerMessage;
+    @ApiModelProperty("库存状态")
+    private String inventoryStatus;
     @ApiModelProperty("货主")
-    private String goodsOwner;
-    @ApiModelProperty("已完成/已发货")
-    private Integer billState;
-    @ApiModelProperty("是否一起发货（否0，是1）")
-    private Integer isTogether;
-    @ApiModelProperty("挂起状态（1挂起，0不挂起，2解锁）")
-    private Integer isHandUp;
-    @ApiModelProperty("优先级")
-    private Integer priority;
-    @ApiModelProperty("实际发货时间")
-    private Date actualDeliveTime;
+    private String shipper;
+    @ApiModelProperty("承运商")
+    private String carrierKey;
+    private String carrierValue;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("配送方式")
+    private String deliveryMethod;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("收货人")
+    private String consignee;
+    @ApiModelProperty("固话")
+    private String fixedLine;
+    @ApiModelProperty("邮编")
+    private String postalCode;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("街道")
+    private String street;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("实付")
+    private double actualPayment;
+    @ApiModelProperty("优惠")
+    private double discount;
+    @ApiModelProperty("运费")
+    private double freight;
+    @ApiModelProperty("重量")
+    private double weight;
+    @ApiModelProperty("估重")
+    private double weightEstimation;
+    @ApiModelProperty("商品数量")
+    private double quantity;
+    @ApiModelProperty("下单时间")
+    private Date orderTime;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("外部订单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上订单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("付款时间")
+    private Date paymentTime;
+    @ApiModelProperty("接单时间")
+    private Date orderAcceptanceTime;
+    @ApiModelProperty("拣选区域")
+    private String pickingArea;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("波次")
+    private String waveTimes;
+    @ApiModelProperty("超时时间")
+    private Date timeoutPeriod;
+    @ApiModelProperty("到货时间")
+    private Date deliveryTime;
+    @ApiModelProperty("体积")
+    private double volume;
+    @ApiModelProperty("标记")
+    private String sign;
+    @ApiModelProperty("最晚发货时间")
+    private Date latestDeliveryTime;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
+    private String remarks;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,22 +17,94 @@ import java.util.List;
 public class WarehouseOutBillDetailsVo {
 
     private String sid;
-    @ApiModelProperty("创建人sid")
-    private String createBySid;
-    @ApiModelProperty("制单人")
-    private String createByName;
-    @ApiModelProperty("单据日期")
-    private String createTime;
-    @ApiModelProperty("外部单号")
-    private String sourceBillNo;
-
-    @ApiModelProperty("业务类型key")
-    private String busTypeKey;
-    @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））")
-    private String busTypeValue;
 
-    @ApiModelProperty("单据状态")
-    private String billState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("来源单号")
+    private String sourceBillNo;
+    @ApiModelProperty("外部状态")
+    private String externalState;
+    @ApiModelProperty("买家留言")
+    private String buyerMessage;
+    @ApiModelProperty("库存状态")
+    private String inventoryStatus;
+    @ApiModelProperty("货主")
+    private String shipper;
+    @ApiModelProperty("承运商")
+    private String carrierKey;
+    private String carrierValue;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("配送方式")
+    private String deliveryMethod;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("收货人")
+    private String consignee;
+    @ApiModelProperty("固话")
+    private String fixedLine;
+    @ApiModelProperty("邮编")
+    private String postalCode;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("街道")
+    private String street;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("实付")
+    private double actualPayment;
+    @ApiModelProperty("优惠")
+    private double discount;
+    @ApiModelProperty("运费")
+    private double freight;
+    @ApiModelProperty("重量")
+    private double weight;
+    @ApiModelProperty("估重")
+    private double weightEstimation;
+    @ApiModelProperty("商品数量")
+    private double quantity;
+    @ApiModelProperty("下单时间")
+    private Date orderTime;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("外部订单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上订单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("付款时间")
+    private Date paymentTime;
+    @ApiModelProperty("接单时间")
+    private Date orderAcceptanceTime;
+    @ApiModelProperty("拣选区域")
+    private String pickingArea;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("波次")
+    private String waveTimes;
+    @ApiModelProperty("超时时间")
+    private Date timeoutPeriod;
+    @ApiModelProperty("到货时间")
+    private Date deliveryTime;
+    @ApiModelProperty("体积")
+    private double volume;
+    @ApiModelProperty("标记")
+    private String sign;
+    @ApiModelProperty("最晚发货时间")
+    private Date latestDeliveryTime;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
     @ApiModelProperty("备注")
     private String remarks;
 

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,24 +18,97 @@ import java.util.List;
 public class WarehouseOutBillDto {
 
     private String sid;
-    @ApiModelProperty("创建人sid")
-    private String createBySid;
-    @ApiModelProperty("制单人")
-    private String createByName;
-    @ApiModelProperty("单据日期")
-    private String createTime;
-    @ApiModelProperty("外部单号")
-    private String sourceBillNo;
-
-    @ApiModelProperty("业务类型key")
-    private String busTypeKey;
-    @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））")
-    private String busTypeValue;
 
-    @ApiModelProperty("单据状态")
-    private String billState;
-    @ApiModelProperty("备注")
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("来源单号")
+    private String sourceBillNo;
+    @ApiModelProperty("外部状态")
+    private String externalState;
+    @ApiModelProperty("买家留言")
+    private String buyerMessage;
+    @ApiModelProperty("库存状态")
+    private String inventoryStatus;
+    @ApiModelProperty("货主")
+    private String shipper;
+    @ApiModelProperty("承运商")
+    private String carrierKey;
+    private String carrierValue;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("配送方式")
+    private String deliveryMethod;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("收货人")
+    private String consignee;
+    @ApiModelProperty("固话")
+    private String fixedLine;
+    @ApiModelProperty("邮编")
+    private String postalCode;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("街道")
+    private String street;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("实付")
+    private double actualPayment;
+    @ApiModelProperty("优惠")
+    private double discount;
+    @ApiModelProperty("运费")
+    private double freight;
+    @ApiModelProperty("重量")
+    private double weight;
+    @ApiModelProperty("估重")
+    private double weightEstimation;
+    @ApiModelProperty("商品数量")
+    private double quantity;
+    @ApiModelProperty("下单时间")
+    private Date orderTime;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("外部订单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上订单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("付款时间")
+    private Date paymentTime;
+    @ApiModelProperty("接单时间")
+    private Date orderAcceptanceTime;
+    @ApiModelProperty("拣选区域")
+    private String pickingArea;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("波次")
+    private String waveTimes;
+    @ApiModelProperty("超时时间")
+    private Date timeoutPeriod;
+    @ApiModelProperty("到货时间")
+    private Date deliveryTime;
+    @ApiModelProperty("体积")
+    private double volume;
+    @ApiModelProperty("标记")
+    private String sign;
+    @ApiModelProperty("最晚发货时间")
+    private Date latestDeliveryTime;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
     private String remarks;
+    private String userSid;
+    private String userName;
 
     private List<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();
 

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillGoodsQuery.java

@@ -0,0 +1,31 @@
+package com.yxt.wms.biz.func.warehouseoutbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/26
+ **/
+@Data
+public class WarehouseOutBillGoodsQuery implements Query {
+    private String sourceBillSid;
+    //商品编码
+    private String goodsSkuCode;
+    //商品名称
+    private String goodsSpuName;
+    //规格
+    private String goodsSkuOwnSpec;
+
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java

@@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.warehouseoutbill;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -11,41 +13,94 @@ import lombok.Data;
 @Data
 public class WarehouseOutBillInventoryVo {
     private String sid;
-    private String inventorySid;
-    @ApiModelProperty("商品ID")
-    private String goodsID;
-    @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("图号")
-    private String goodsSkuCode;
-    @ApiModelProperty("商品Skusid")
-    private String goodsSkuSid;
-    @ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle;
-    @ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("计量单位")
-    private String unit;
-    @ApiModelProperty("仓库sid")
-    private String warehouseSid;
-    @ApiModelProperty("仓库名称")
-    private String warehouseName;
-    @ApiModelProperty("库位sid")
-    private String warehouseRackSid;
-    @ApiModelProperty("库位编码")
-    private String warehouseRackCode;
 
-    private String price;//销售单价
-    private String outboundCount;// 已出库数量
-    //入库单价
-    private String money;
-    //库存数量
-    private String count;
-    //供应商
-    private String supplierSid;
-    private String supplierName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("来源单号")
+    private String sourceBillNo;
+    @ApiModelProperty("外部状态")
+    private String externalState;
+    @ApiModelProperty("买家留言")
+    private String buyerMessage;
+    @ApiModelProperty("库存状态")
+    private String inventoryStatus;
+    @ApiModelProperty("货主")
+    private String shipper;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("配送方式")
+    private String deliveryMethod;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("收货人")
+    private String consignee;
+    @ApiModelProperty("固话")
+    private String fixedLine;
+    @ApiModelProperty("邮编")
+    private String postalCode;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("街道")
+    private String street;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("实付")
+    private double actualPayment;
+    @ApiModelProperty("优惠")
+    private double discount;
+    @ApiModelProperty("运费")
+    private double freight;
+    @ApiModelProperty("重量")
+    private double weight;
+    @ApiModelProperty("估重")
+    private double weightEstimation;
+    @ApiModelProperty("商品数量")
+    private double quantity;
+    @ApiModelProperty("下单时间")
+    private Date orderTime;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("外部订单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上订单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("付款时间")
+    private Date paymentTime;
+    @ApiModelProperty("接单时间")
+    private Date orderAcceptanceTime;
+    @ApiModelProperty("拣选区域")
+    private String pickingArea;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("波次")
+    private String waveTimes;
+    @ApiModelProperty("超时时间")
+    private Date timeoutPeriod;
+    @ApiModelProperty("到货时间")
+    private Date deliveryTime;
+    @ApiModelProperty("体积")
+    private double volume;
+    @ApiModelProperty("标记")
+    private String sign;
+    @ApiModelProperty("最晚发货时间")
+    private Date latestDeliveryTime;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    private String remarks;
 
 
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java

@@ -12,20 +12,37 @@ import lombok.Data;
 @Data
 public class WarehouseOutBillQuery implements Query {
 
-    @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("单据日期开始时间")
-    private String createTimeStart;
-    @ApiModelProperty("单据日期结束时间")
-    private String createTimeEnd;
-    @ApiModelProperty("来源单号")
-    private String sourceBillNo;
-    @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））")
-    private String busTypeValue;
-    @ApiModelProperty("单据状态")
     private String billState;
-    @ApiModelProperty("组织sid全路径")
+    @ApiModelProperty("外部单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("下单日期开始时间")
+    private String orderTimeStart;
+    @ApiModelProperty("下单日期结束时间")
+    private String orderTimeEnd;
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
     private String orgPath;
     @ApiModelProperty("用户sid")
-    private String createBySid;
+    private String userSid;
+    private int index;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java

@@ -1,13 +1,22 @@
 package com.yxt.wms.biz.func.warehouseoutbill;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.commonmethod.CommonMethod;
+import com.yxt.wms.biz.func.commonmethod.DataRule;
+import com.yxt.wms.biz.func.sysstaffinfo.SysStaffinfoDetailsVo;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
+import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.wms.feign.warehouse.warehousesoutbill.WarehouseOutBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -18,10 +27,19 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
 
     @Autowired
     private WarehouseOutBillFeign warehouseOutBillFeign;
+    @Autowired
+    SysStaffinfoFeign sysStaffinfoFeign;
 
-
-    public ResultBean<PagerVo<WarehouseOutBillVo>> listPage(PagerQuery<WarehouseOutBillQuery> pagerQuery) {
-        return warehouseOutBillFeign.pageList(pagerQuery);
+    @Autowired
+    CommonMethod commonMethod;
+    public ResultBean<PagerVo<WarehouseOutBillVo>> listPage(PagerQuery<WarehouseOutBillQuery> pq) {
+        WarehouseOutBillQuery query = pq.getParams();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
+        return warehouseOutBillFeign.pageList(pq);
     }
 
     public ResultBean<String> saveOrUpdateOutBill(WarehouseOutBillDto dto) {
@@ -31,29 +49,49 @@ public class WarehouseOutBillService extends MybatisBaseService<WarehouseOutBill
     public ResultBean<WarehouseOutBillDetailsVo> details(String sid) {
         return warehouseOutBillFeign.details(sid);
     }
+    public ResultBean<WarehouseOutBillDetailsVo> getAddresseeBySid(String sid) {
+        return warehouseOutBillFeign.getAddresseeBySid(sid);
+    }
+    public ResultBean<PagerVo<WarehouseOutBillDetailVo>> getInventoryList(PagerQuery<WarehouseOutBillGoodsQuery> pq) {
+        WarehouseOutBillGoodsQuery query = pq.getParams();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数
+        DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
+        pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
+        pq.getParams().setIndex(dataRule.getIndex());
+        PagerVo<WarehouseOutBillDetailVo> pagerVo=warehouseOutBillFeign.getInventoryList(pq).getData();
+        return new ResultBean<PagerVo<WarehouseOutBillDetailVo>>().success().setData(pagerVo);
+    }
+    public ResultBean updateCarrier(WarehouseOutBillDto dto) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
+        return warehouseOutBillFeign.updateCarrier(dto);
+    }
+    public ResultBean updateWaybillNumber(WarehouseOutBillDto dto) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
+        return warehouseOutBillFeign.updateWaybillNumber(dto);
+    }
+    public ResultBean toBePickOut(WarehouseOutStateQuery query) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(query.getUserSid(),"").getData();
+        query.setUserName(sysStaffinfoDetailsVo.getName());
+        return warehouseOutBillFeign.toBePickOut(query);
+    }
+    public ResultBean toBeOutbound(WarehouseOutStateQuery query) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(query.getUserSid(),"").getData();
+        query.setUserName(sysStaffinfoDetailsVo.getName());
+        return warehouseOutBillFeign.toBeOutbound(query);
+    }
 
-    public ResultBean<PagerVo<WarehouseOutBillInventoryVo>> getInventoryList(PagerQuery<WarehouseOutBillInventoryQuery> pagerQuery) {
-        WarehouseOutBillInventoryQuery query = pagerQuery.getParams();
-        PagerVo<WarehouseOutBillInventoryVo> pagerVo=warehouseOutBillFeign.getInventoryList(pagerQuery).getData();
-//        if (StringUtils.isNotBlank(query.getBusrepairBillsid())) {
-//            List<WarehouseOutBillInventoryVo> records = pagerVo.getRecords();
-//            for (WarehouseOutBillInventoryVo record : records) {
-//                //维修出入库查询已出库数量
-//                String billSid = query.getBusrepairBillsid();
-//                String chuKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "0", record.getGoodsID()).getData();
-//                String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData();
-//                BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
-//                if (null != count) {
-//                    record.setOutboundCount(count.toString());
-//                } else {
-//                    record.setOutboundCount("0");
-//                }
-//            }
-//        }
-        return new ResultBean<PagerVo<WarehouseOutBillInventoryVo>>().success().setData(pagerVo);
+    public ResultBean toBeAllocated(WarehouseOutStateQuery query) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(query.getUserSid(),"").getData();
+        query.setUserName(sysStaffinfoDetailsVo.getName());
+        return warehouseOutBillFeign.toBeAllocated(query);
     }
 
     public ResultBean confirm(WarehouseOutBillDto dto) {
+        SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData();
+        dto.setUserName(sysStaffinfoDetailsVo.getName());
         return warehouseOutBillFeign.confirm(dto);
     }
 

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java

@@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.warehouseoutbill;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -15,16 +17,92 @@ public class WarehouseOutBillVo {
 
     @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("单据日期")
-    private String createTime;
-    @ApiModelProperty("制单人")
-    private String createByName;
     @ApiModelProperty("来源单号")
     private String sourceBillNo;
-    @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））")
-    private String busTypeValue;
-    @ApiModelProperty("单据状态：已完成/已发货")
-    private String billState;
+    @ApiModelProperty("外部状态")
+    private String externalState;
+    @ApiModelProperty("买家留言")
+    private String buyerMessage;
+    @ApiModelProperty("库存状态")
+    private String inventoryStatus;
+    @ApiModelProperty("货主")
+    private String shipper;
+    @ApiModelProperty("承运商")
+    private String carrierKey;
+    private String carrierValue;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("配送方式")
+    private String deliveryMethod;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("收货人")
+    private String consignee;
+    @ApiModelProperty("固话")
+    private String fixedLine;
+    @ApiModelProperty("邮编")
+    private String postalCode;
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("区")
+    private String county;
+    @ApiModelProperty("街道")
+    private String street;
+    @ApiModelProperty("详细地址")
+    private String address;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("实付")
+    private double actualPayment;
+    @ApiModelProperty("优惠")
+    private double discount;
+    @ApiModelProperty("运费")
+    private double freight;
+    @ApiModelProperty("重量")
+    private double weight;
+    @ApiModelProperty("估重")
+    private double weightEstimation;
+    @ApiModelProperty("商品数量")
+    private double quantity;
+    @ApiModelProperty("下单时间")
+    private Date orderTime;
+    @ApiModelProperty("订单号")
+    private String orderNumber;
+    @ApiModelProperty("外部订单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上订单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("付款时间")
+    private Date paymentTime;
+    @ApiModelProperty("接单时间")
+    private Date orderAcceptanceTime;
+    @ApiModelProperty("拣选区域")
+    private String pickingArea;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("品牌")
+    private String brand;
+    @ApiModelProperty("波次")
+    private String waveTimes;
+    @ApiModelProperty("超时时间")
+    private Date timeoutPeriod;
+    @ApiModelProperty("到货时间")
+    private Date deliveryTime;
+    @ApiModelProperty("体积")
+    private double volume;
+    @ApiModelProperty("标记")
+    private String sign;
+    @ApiModelProperty("最晚发货时间")
+    private Date latestDeliveryTime;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    private String remarks;
 
 
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutStateQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.wms.biz.func.warehouseoutbill;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/8/15 16:19
+ */
+@Data
+public class WarehouseOutStateQuery {
+    private String billState;//0 待分配  1 零拣 2待出库 3已出库
+    private String sid;
+    private String userSid;
+    private String userName;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java

@@ -14,10 +14,11 @@ import java.util.Date;
  **/
 @Data
 public class WarehouseOutBillDetail extends BaseEntity {
+    private String sid;
     @ApiModelProperty("单据sid")
-    private String billSid;
-    @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    private String sourceBillSid;
+    @ApiModelProperty("图片")
+    private String pic;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
@@ -28,22 +29,31 @@ public class WarehouseOutBillDetail extends BaseEntity {
     private String goodsSkuCode;
     @ApiModelProperty("规格型号")
     private String goodsSkuOwnSpec;
+    @ApiModelProperty("条码")
+    private String barCode;
     @ApiModelProperty("计量单位")
     private String unit;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
     @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;
-
+    @ApiModelProperty("应收价格")
+    private BigDecimal receivable;
+    @ApiModelProperty("实际价格")
+    private BigDecimal actualPrice;
+    @ApiModelProperty("销售金额")
+    private BigDecimal salesAmount;
+    @ApiModelProperty("序列号")
+    private String serialNumber;
+    @ApiModelProperty("库位")
+    private String rackState;
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+    @ApiModelProperty("生产日期")
+    private Date dateOfManufacture;
+    @ApiModelProperty("过期日期")
+    private Date expirationDate;
+    @ApiModelProperty("批次扩展属性")
+    private String batchExpansion;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java

@@ -3,6 +3,9 @@ package com.yxt.wms.biz.func.warehouseoutbilldetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -12,11 +15,10 @@ import lombok.Data;
 public class WarehouseOutBillDetailDto {
 
     private String sid;
-    @ApiModelProperty("库存商品sid")
-    private String inventorySid;
-
-    @ApiModelProperty("商品基础信息Sid")
-    private String goodSpuSid;
+    @ApiModelProperty("单据sid")
+    private String sourceBillSid;
+    @ApiModelProperty("图片")
+    private String pic;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
@@ -27,24 +29,32 @@ public class WarehouseOutBillDetailDto {
     private String goodsSkuCode;
     @ApiModelProperty("规格型号")
     private String goodsSkuOwnSpec;
+    @ApiModelProperty("条码")
+    private String barCode;
     @ApiModelProperty("计量单位")
     private String unit;
-
-
-    @ApiModelProperty("出库数量")
-    private String outCount;
-    @ApiModelProperty("仓库sid")
-    private String warehouseSid;
-    //仓库名称
-    private String warehouseName;
-    //库位sid
-    private String warehouseRackSid;
-    //库位编码
-    private String warehouseRackCode;
-    //销售单价
-    private String money;
-    //金额
-    private String moneyAll;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
+    @ApiModelProperty("订单数量")
+    private BigDecimal orderCount;
+    @ApiModelProperty("应收价格")
+    private BigDecimal receivable;
+    @ApiModelProperty("实际价格")
+    private BigDecimal actualPrice;
+    @ApiModelProperty("销售金额")
+    private BigDecimal salesAmount;
+    @ApiModelProperty("序列号")
+    private String serialNumber;
+    @ApiModelProperty("库位")
+    private String rackState;
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+    @ApiModelProperty("生产日期")
+    private Date dateOfManufacture;
+    @ApiModelProperty("过期日期")
+    private Date expirationDate;
+    @ApiModelProperty("批次扩展属性")
+    private String batchExpansion;
 
 
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java

@@ -12,7 +12,5 @@ import java.util.List;
  **/
 @Mapper
 public interface WarehouseOutBillDetailMapper extends BaseMapper<WarehouseOutBillDetail> {
-    int deleteByMainSid(String sid);
 
-    List<WarehouseOutBillDetailDto> selectDetailsList(String sid);
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml

@@ -1,21 +1,5 @@
 <?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.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailMapper">
-    <delete id="deleteByMainSid">
-        delete
-        from wms_out_bill_detail
-        where billSid = #{sid}
-    </delete>
 
-    <select id="selectDetailsList" resultType="com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailDto">
-        select wbd.goodSpuSid,
-               wbd.goodsSpuName,
-               wbd.goodsSkuSid,
-               wbd.goodsSkuTitle,
-               wbd.goodsSkuCode,
-               wbd.goodsSkuOwnSpec,
-               wbd.unit
-        from warehouse_out_bill_detail wbd
-        where wbd.billSid = #{sid}
-    </select>
 </mapper>

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.func.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;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java

@@ -2,6 +2,9 @@ package com.yxt.wms.biz.func.warehouseoutbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.feign.warehouse.warehousesoutbilldetail.WarehouseOutBillDetailFeign;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,19 +16,9 @@ import java.util.List;
  **/
 @Service
 public class WarehouseOutBillDetailService extends MybatisBaseService<WarehouseOutBillDetailMapper, WarehouseOutBillDetail> {
-    public void saveOrUpdateBillDetails(String sid, List<WarehouseOutBillDetailDto> detailsList) {
-        //删除
-        baseMapper.deleteByMainSid(sid);
-        for (int i = 0; i < detailsList.size(); i++) {
-            WarehouseOutBillDetailDto wmsOutBillDetailDto = detailsList.get(i);
-            WarehouseOutBillDetail wmsOutBillDetail = new WarehouseOutBillDetail();
-            BeanUtil.copyProperties(wmsOutBillDetailDto, wmsOutBillDetail, "sid");
-            wmsOutBillDetail.setBillSid(sid);
-            baseMapper.insert(wmsOutBillDetail);
-        }
-    }
-
-    public List<WarehouseOutBillDetailDto> selectDetailsList(String sid) {
-        return baseMapper.selectDetailsList(sid);
+    @Autowired
+    WarehouseOutBillDetailFeign warehouseOutBillDetailFeign;
+    public ResultBean<List<WarehouseOutBillDetailVo>> selectDetailsByBillSid(String sid) {
+        return warehouseOutBillDetailFeign.selectDetailsByBillSid(sid);
     }
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailVo.java

@@ -0,0 +1,59 @@
+package com.yxt.wms.biz.func.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 {
+    private String sid;
+    @ApiModelProperty("单据sid")
+    private String sourceBillSid;
+    @ApiModelProperty("图片")
+    private String pic;
+    @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 barCode;
+    @ApiModelProperty("计量单位")
+    private String unit;
+    @ApiModelProperty("单价")
+    private BigDecimal price;
+    @ApiModelProperty("订单数量")
+    private BigDecimal orderCount;
+    @ApiModelProperty("应收价格")
+    private BigDecimal receivable;
+    @ApiModelProperty("实际价格")
+    private BigDecimal actualPrice;
+    @ApiModelProperty("销售金额")
+    private BigDecimal salesAmount;
+    @ApiModelProperty("序列号")
+    private String serialNumber;
+    @ApiModelProperty("库位状态")
+    private String rackState;
+    private String rackStateValue;
+    @ApiModelProperty("批次号")
+    private String batchNumber;
+    @ApiModelProperty("生产日期")
+    private Date dateOfManufacture;
+    @ApiModelProperty("过期日期")
+    private Date expirationDate;
+    @ApiModelProperty("批次扩展属性")
+    private String batchExpansion;
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocation.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.warehouseoutlocation;
+
+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 WarehouseOutLocation extends BaseEntity {
+
+
+    @ApiModelProperty("来源单")
+    private String sourceBillSid;
+    @ApiModelProperty("sku")
+    private String goodsSkuSid;
+
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品title")
+    private String goodsSpuTitle;
+    @ApiModelProperty("商品规格编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("数量")
+    private String count;
+    @ApiModelProperty("库位sid")
+    private String rackSid;
+    @ApiModelProperty("库位编码")
+    private String rackCode;
+    private String spec;
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationDto.java

@@ -0,0 +1,39 @@
+package com.yxt.wms.biz.func.warehouseoutlocation;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Data
+public class WarehouseOutLocationDto {
+    private String sid;
+    @ApiModelProperty("来源单")
+    private String sourceBillSid;
+    @ApiModelProperty("sku")
+    private String goodsSkuSid;
+
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品title")
+    private String goodsSpuTitle;
+    @ApiModelProperty("商品规格编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("数量")
+    private BigDecimal count;
+    @ApiModelProperty("库位sid")
+    private String rackSid;
+    @ApiModelProperty("库位编码")
+    private String rackCode;
+    private String inventorySid;
+    private BigDecimal initialCount;
+    private String locationSid;
+    private String spec;
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.java

@@ -0,0 +1,18 @@
+package com.yxt.wms.biz.func.warehouseoutlocation;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Mapper
+public interface WarehouseOutLocationMapper extends BaseMapper<WarehouseOutLocation> {
+
+    WarehouseOutLocationVo details(@Param("sid") String sid);
+
+}
+

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.xml

@@ -0,0 +1,6 @@
+<?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.wms.biz.func.warehouseoutlocation.WarehouseOutLocationMapper">
+
+
+</mapper>

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationQuery.java

@@ -0,0 +1,49 @@
+package com.yxt.wms.biz.func.warehouseoutlocation;
+
+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 WarehouseOutLocationQuery implements Query {
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    private String billState;
+    @ApiModelProperty("外部单号")
+    private String externalOrderNumber;
+    @ApiModelProperty("线上单号")
+    private String onlineOrderNumber;
+    @ApiModelProperty("买家")
+    private String buyer;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("平台")
+    private String platform;
+    @ApiModelProperty("承运商")
+    private String carrier;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("出库类型")
+    private String outboundType;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("下单日期开始时间")
+    private String orderTimeStart;
+    @ApiModelProperty("下单日期结束时间")
+    private String orderTimeEnd;
+
+    private String orgLevelKey;//权限等级
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    private int index;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationService.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.warehouseoutlocation;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventory;
+import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryService;
+import com.yxt.wms.feign.warehouse.warehouseoutlocation.WarehouseOutLocationFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Service
+public class WarehouseOutLocationService extends MybatisBaseService<WarehouseOutLocationMapper, WarehouseOutLocation> {
+    @Autowired
+    WarehouseOutLocationFeign warehouseOutLocationFeign;
+
+
+    public ResultBean<String> save(List<WarehouseOutLocationDto> dtos) {
+        return warehouseOutLocationFeign.save(dtos);
+    }
+
+    public ResultBean<List<WarehouseOutLocationVo>> details(String sid) {
+        return warehouseOutLocationFeign.details(sid);
+    }
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationVo.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.warehouseoutlocation;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Data
+public class WarehouseOutLocationVo {
+
+    private String sid;
+    @ApiModelProperty("来源单")
+    private String sourceBillSid;
+    @ApiModelProperty("sku")
+    private String goodsSkuSid;
+
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("商品title")
+    private String goodsSpuTitle;
+    @ApiModelProperty("商品规格编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("数量")
+    private String count;
+    @ApiModelProperty("库位sid")
+    private String rackSid;
+    @ApiModelProperty("库位编码")
+    private String rackCode;
+
+    private String spec;
+
+}

wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java

@@ -1,46 +0,0 @@
-package com.yxt.wms.feign.base.basesupplierinfo;
-
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.supplierinfo.*;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author wangpengfei
- * @date 2024/3/26 17:12
- */
-@FeignClient(
-        contextId = "ss-common-goods-BaseSupplierInfo",
-        name = "ss-common-goods",
-        path = "/apiadmin/base/basesupplierinfo",
-        fallback = BaseSupplierInfoFeignFallback.class)
-public interface BaseSupplierInfoFeign {
-
-    @ApiOperation("根据SID获取供应商")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    ResultBean<SupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
-
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    public ResultBean<PagerVo<SupplierInfoVo>> listPage(@RequestBody PagerQuery<SupplierInfoQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    public ResultBean save(@RequestBody SupplierInfoDto dto);
-
-    @ApiOperation("根据sid批量删除")
-    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids);
-
-
-
-    @ApiOperation("选择供应商")
-    @PostMapping("/choiceSupplierInfo")
-    public ResultBean<List<SupplierInfoChoice>> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid);
-}

wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java

@@ -1,44 +0,0 @@
-package com.yxt.wms.feign.base.basesupplierinfo;
-
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.supplierinfo.*;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @author wangpengfei
- * @date 2024/3/26 17:12
- */
-@Component
-public class BaseSupplierInfoFeignFallback implements BaseSupplierInfoFeign {
-
-
-    @Override
-    public ResultBean<SupplierInfoDetailsVo> fetchDetailsBySid(String sid) {
-        return null;
-    }
-
-    @Override
-    public ResultBean<PagerVo<SupplierInfoVo>> listPage(PagerQuery<SupplierInfoQuery> pq) {
-        return null;
-    }
-
-    @Override
-    public ResultBean save(SupplierInfoDto dto) {
-        return null;
-    }
-
-
-    @Override
-    public ResultBean delBySids(String[] sids) {
-        return null;
-    }
-
-    @Override
-    public ResultBean<List<SupplierInfoChoice>> choiceSupplierInfo(String createOrgSid) {
-        return null;
-    }
-}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeign.java

@@ -0,0 +1,44 @@
+package com.yxt.wms.feign.warehouse.warehouseinvoice;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.*;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceDto;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收货单据")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseInvoice",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/warehouseinvoice",
+        fallback = WarehouseInvoiceFeignFallback.class)
+public interface WarehouseInvoiceFeign {
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean saveOrUpdate(@RequestBody WarehouseInvoiceDto dto);
+
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<WarehouseInvoiceVo> details(@RequestParam("sid") String sid);
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeignFallback.java

@@ -0,0 +1,40 @@
+package com.yxt.wms.feign.warehouse.warehouseinvoice;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.*;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceDto;
+import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class WarehouseInvoiceFeignFallback implements WarehouseInvoiceFeign {
+
+
+	@Override
+	public ResultBean saveOrUpdate(WarehouseInvoiceDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<WarehouseInvoiceVo> details(String sid) {
+		return null;
+	}
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeign.java

@@ -0,0 +1,37 @@
+package com.yxt.wms.feign.warehouse.warehouseinvoiceout;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.*;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收货单据")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseInvoiceOut",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/warehouseinvoiceout",
+        fallback = WarehouseInvoiceOutFeignFallback.class)
+public interface WarehouseInvoiceOutFeign {
+
+
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeignFallback.java

@@ -0,0 +1,28 @@
+package com.yxt.wms.feign.warehouse.warehouseinvoiceout;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.*;
+import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class WarehouseInvoiceOutFeignFallback implements WarehouseInvoiceOutFeign {
+
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeign.java

@@ -0,0 +1,45 @@
+package com.yxt.wms.feign.warehouse.warehouseoutlocation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseinventory.*;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationDto;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收货单据")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseOutLocation",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/warehouseoutlocation",
+        fallback = WarehouseOutLocationFeignFallback.class)
+public interface WarehouseOutLocationFeign {
+
+    @ApiOperation("保存修改")
+    @PostMapping("/save")
+    ResultBean save(@RequestBody List<WarehouseOutLocationDto> dtos);
+
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<List<WarehouseOutLocationVo>> details(@RequestParam("sid") String sid);
+
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeignFallback.java

@@ -0,0 +1,40 @@
+package com.yxt.wms.feign.warehouse.warehouseoutlocation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseinventory.*;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationDto;
+import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class WarehouseOutLocationFeignFallback implements WarehouseOutLocationFeign {
+
+
+
+	@Override
+	public ResultBean save(List<WarehouseOutLocationDto> dtos) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<WarehouseOutLocationVo>> details(String sid) {
+		return null;
+	}
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysRoleFeign.java <br/>
@@ -26,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @FeignClient(
         contextId = "ss-common-warehouse-WarehouseInventory",
         name = "ss-common-warehouse",
-        path = "/apiadmin/warehouseinventory",
+        path = "/apiadmin/inventory/Warehouseinventory",
         fallback = WarehouseInventoryFeignFallback.class)
 public interface WarehouseInventoryFeign {
 
@@ -86,4 +88,9 @@ public interface WarehouseInventoryFeign {
     @ApiOperation("根据Sid获取库存实体")
     @PostMapping("/fetchEntityBySid")
     ResultBean<WarehouseInventory> fetchEntityBySid(@RequestParam("sid") String sid);
+    @ApiOperation("根据skuSid查询商品可用库存")
+    @GetMapping("/selAvailableBySkuSid")
+    public ResultBean<List<AvailableCountVo>> selAvailableBySkuSid(@RequestParam("skuSid") String skuSid,
+                                                                   @RequestParam("sourceBillSid") String sourceBillSid,
+                                                                   @RequestParam("orgSid") String orgSid) ;
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java

@@ -6,6 +6,8 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.func.warehouseinventory.*;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysRoleFeignFallback.java <br/>
@@ -91,4 +93,10 @@ public class WarehouseInventoryFeignFallback implements WarehouseInventoryFeign
 	public ResultBean<WarehouseInventory> fetchEntityBySid(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<AvailableCountVo>> selAvailableBySkuSid(String skuSid, String sourceBillSid,String orgSid) {
+		return null;
+	}
+
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java

@@ -4,6 +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.wms.biz.func.warehouseoutbill.*;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -41,11 +42,27 @@ public interface WarehouseOutBillFeign {
     @ApiOperation("详情")
     @GetMapping("/details")
     ResultBean<WarehouseOutBillDetailsVo> details(@RequestParam("sid") String sid);
-
+    @ApiOperation("收件地址")
+    @GetMapping("/getAddresseeBySid")
+    ResultBean<WarehouseOutBillDetailsVo> getAddresseeBySid(@RequestParam("sid") String sid);
     @ApiOperation("选择商品分页列表")
     @PostMapping("/getInventoryList")
-    ResultBean<PagerVo<WarehouseOutBillInventoryVo>> getInventoryList(@RequestBody PagerQuery<WarehouseOutBillInventoryQuery> pagerQuery);
-
+    ResultBean<PagerVo<WarehouseOutBillDetailVo>> getInventoryList(@RequestBody PagerQuery<WarehouseOutBillGoodsQuery> pagerQuery);
+    @ApiOperation("修改承运商")
+    @PostMapping("/updateCarrier")
+    public ResultBean updateCarrier(WarehouseOutBillDto dto);
+    @ApiOperation("修改运单号")
+    @PostMapping("/updateWaybillNumber")
+    public ResultBean updateWaybillNumber(WarehouseOutBillDto dto);
+    @ApiOperation("待分配-->打到零拣")
+    @PostMapping("/toBePickOut")
+    ResultBean toBePickOut(@RequestBody WarehouseOutStateQuery query);
+    @ApiOperation("零拣打单 --> 待出库")
+    @PostMapping("/toBeOutbound")
+    ResultBean toBeOutbound(@RequestBody WarehouseOutStateQuery query);
+    @ApiOperation("零拣打单--->待分配")
+    @PostMapping("/toBeAllocated")
+    ResultBean toBeAllocated(@RequestBody WarehouseOutStateQuery query);
     @ApiOperation("确认")
     @PostMapping("/confirm")
     ResultBean confirm(@RequestBody WarehouseOutBillDto dto);

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java

@@ -4,6 +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.wms.biz.func.warehouseoutbill.*;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
 import org.springframework.stereotype.Component;
 
 /**
@@ -39,10 +40,41 @@ public class WarehouseOutBillFeignFallback implements WarehouseOutBillFeign {
 	}
 
 	@Override
-	public ResultBean<PagerVo<WarehouseOutBillInventoryVo>> getInventoryList(PagerQuery<WarehouseOutBillInventoryQuery> pagerQuery) {
+	public ResultBean<WarehouseOutBillDetailsVo> getAddresseeBySid(String sid) {
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<WarehouseOutBillDetailVo>> getInventoryList(PagerQuery<WarehouseOutBillGoodsQuery> pagerQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateCarrier(WarehouseOutBillDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateWaybillNumber(WarehouseOutBillDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean toBePickOut(WarehouseOutStateQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean toBeOutbound(WarehouseOutStateQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean toBeAllocated(WarehouseOutStateQuery query) {
+		return null;
+	}
+
+
 	@Override
 	public ResultBean confirm(WarehouseOutBillDto dto) {
 		return null;

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeign.java

@@ -0,0 +1,39 @@
+package com.yxt.wms.feign.warehouse.warehousesoutbilldetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseoutbill.*;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "收货单据")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseOutBillDetail",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/warehouseoutbilldetail",
+        fallback = WarehouseOutBillDetailFeignFallback.class)
+public interface WarehouseOutBillDetailFeign {
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/selectDetailsByBillSid")
+    public ResultBean<List<WarehouseOutBillDetailVo>> selectDetailsByBillSid(@RequestParam("sid") String sid);
+
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeignFallback.java

@@ -0,0 +1,32 @@
+package com.yxt.wms.feign.warehouse.warehousesoutbilldetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.warehouseoutbill.*;
+import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class WarehouseOutBillDetailFeignFallback implements WarehouseOutBillDetailFeign {
+
+	@Override
+	public ResultBean<List<WarehouseOutBillDetailVo>> selectDetailsByBillSid(String sid) {
+		return null;
+	}
+}