26

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

@@ -0,0 +1,40 @@
+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.basegoodssku.BaseGoodsSkuService;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuService;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.utils.OrgPathQuery;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/4/12 11:20
+ */
+@RestController()
+@RequestMapping("/apiadmin/basegoodssku")
+public class BaseGoodsSkuRest {
+
+
+    @Autowired
+    BaseGoodsSkuService baseGoodsSkuService;
+
+    @ApiOperation("查询组织下所有商品")
+    @PostMapping("/listAllByOrg")
+    public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query) {
+        return baseGoodsSkuService.listAllByOrg(query);
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.yxt.wms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.operationrecord.OperationRecordDto;
+import com.yxt.wms.biz.func.operationrecord.OperationRecordService;
+import com.yxt.wms.biz.func.operationrecord.OperationRecordVo;
+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/7/24 9:34
+ */
+@Api(tags = "操作记录")
+@RestController
+@RequestMapping("/apiadmin/operationrecord")
+public class OperationRecordRest {
+    @Autowired
+    OperationRecordService operationRecordService;
+    
+    
+    @PostMapping("/save")
+    @ApiOperation("新增")
+    ResultBean<String> save(@RequestBody OperationRecordDto dto) {
+        return operationRecordService.save(dto);
+    }
+
+    @GetMapping("/details")
+    @ApiOperation("详情")
+    ResultBean<List<OperationRecordVo>> details(@RequestParam("sid") String sid) {
+        return operationRecordService.details(sid);
+    }
+
+}

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

@@ -0,0 +1,30 @@
+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.warehouseansbilldetail.WarehouseAnsBillDetailService;
+import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailVo;
+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/6 15:04
+ */
+@Api(tags = "预期到货通知单明细")
+@RestController
+@RequestMapping("/apiadmin/wmsansbilldetails")
+public class WarehouseAnsBillDetailsRest {
+
+    @Autowired
+    private WarehouseAnsBillDetailService warehouseAnsBillDetailService;
+
+    @ApiOperation("根据sid查询详情")
+    @GetMapping("/selectByBillSid/{sid}")
+    public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid){
+        return warehouseAnsBillDetailService.selectByBillSid(sid);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.yxt.wms.apiadmin.aggregation;
 
+import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -9,6 +10,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -48,10 +53,10 @@ public class WarehouseAnsBillRest {
     ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid) {
         return warehouseAnsBillService.details(sid);
     }
-    @GetMapping("getSupplier")
-    @ApiOperation("详情")
-    ResultBean<WarehouseAnsSupplierVo> getSupplier(@RequestParam("sid") String sid) {
-        return warehouseAnsBillService.getSupplier(sid);
-    }
 
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "导出")
+    public void exportExcel(@RequestBody WarehouseAnsBillQuery query) {
+        warehouseAnsBillService.listExcel(query);
+    }
 }

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

@@ -7,11 +7,14 @@ import com.yxt.wms.biz.func.warehouserack.WarehouseRackDto;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackQuery;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackService;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackVo;
+import com.yxt.wms.utils.OrgPathQuery;
 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/2/28 8:59
@@ -30,9 +33,9 @@ public class WarehouseRackRest {
         return wmsWarehouseRackService.listPage(pq);
     }
     @ApiOperation("查询所有的库区")
-    @GetMapping("/getAllType")
-    public ResultBean<WarehouseRackVo> getAllType() {
-        return wmsWarehouseRackService.getAllType();
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseRackVo>> listAll(@RequestBody OrgPathQuery query) {
+        return wmsWarehouseRackService.listAll(query);
     }
 
     @ApiOperation("保存修改")

wms/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java

@@ -11,6 +11,8 @@ 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.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,14 +28,8 @@ import java.util.List;
 public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper, BaseGoodsSku> {
     @Autowired
     private FileUploadComponent fileUploadComponent;
-//    @Autowired
-//    BaseGoodsSpuDetailService baseGoodsSpuDetailService;
-//    @Autowired
-//    BaseGoodsSkuExtendService baseGoodsSkuExtendService;
-//    @Autowired
-//    private BaseGoodsSpuService baseGoodsSpuService;
-//    @Autowired
-//    BaseGoodsTypeService baseGoodsTypeService;
+    @Autowired
+    BaseGoodsSkuFeign baseGoodsSkuFeign;
 
     public ResultBean<PagerVo<BaseGoodsSkuVo>> listPage(PagerQuery<BaseGoodsSkuQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
@@ -47,6 +43,10 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         PagerVo<BaseGoodsSkuVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
+    public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
+        return baseGoodsSkuFeign.listAllByOrg(query);
+    }
+
     @Transactional
     public ResultBean<String> saveOrUpdate(BaseGoodsSkuDto dto) {
         ResultBean rb = ResultBean.fireFail();

wms/src/main/java/com/yxt/wms/biz/func/operationrecord/OperationRecord.java

@@ -0,0 +1,22 @@
+package com.yxt.wms.biz.func.operationrecord;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 9:34
+ */
+@Data
+public class OperationRecord extends BaseEntity {
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("修改用户sid")
+    private String userSid;
+    @ApiModelProperty("修改用户")
+    private String userName;
+    @ApiModelProperty("内容")
+    private String content;
+
+}

wms/src/main/java/com/yxt/wms/biz/func/operationrecord/OperationRecordDto.java

@@ -0,0 +1,29 @@
+package com.yxt.wms.biz.func.operationrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 9:34
+ */
+@Data                       
+public class OperationRecordDto {
+
+    private String sid;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("修改用户sid")
+    private String userSid;
+    @ApiModelProperty("修改用户")
+    private String userName;
+    @ApiModelProperty("内容")
+    private String content;
+}

wms/src/main/java/com/yxt/wms/biz/func/operationrecord/OperationRecordMapper.java

@@ -0,0 +1,16 @@
+package com.yxt.wms.biz.func.operationrecord;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 9:34
+ */
+@Mapper
+public interface OperationRecordMapper extends BaseMapper<OperationRecord> {
+
+    List<OperationRecordVo> details(String sid);
+}

wms/src/main/java/com/yxt/wms/biz/func/operationrecord/OperationRecordMapper.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.operationrecord.OperationRecordMapper">
+
+</mapper>

wms/src/main/java/com/yxt/wms/biz/func/operationrecord/OperationRecordQuery.java

@@ -0,0 +1,42 @@
+package com.yxt.wms.biz.func.operationrecord;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 9:34
+ */
+@Data
+public class OperationRecordQuery implements Query {
+    @ApiModelProperty("业务类型")
+    private String busTypeKey;
+    @ApiModelProperty("外部单号（业务单据编号）")
+    private String sourceBillNo;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("商品sid")
+    private String goodsSkuSid;
+    @ApiModelProperty("申请开始时间")
+    private String applicationTimeStart;
+    @ApiModelProperty("申请结束时间")
+    private String applicationTimeEnd;
+    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
+    private String billState;
+    @ApiModelProperty("供应商")
+    private String supplierName;
+    @ApiModelProperty("运单号")
+    private String waybillNumber;
+    @ApiModelProperty("库区sid")
+    private String warehouseRackSid;
+
+    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/operationrecord/OperationRecordService.java

@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.func.operationrecord;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+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.feign.warehouse.operationrecord.OperationRecordFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 9:34
+ */
+@Service
+public class OperationRecordService extends MybatisBaseService<OperationRecordMapper, OperationRecord> {
+    @Autowired
+    OperationRecordFeign operationRecordFeign;
+
+
+    public ResultBean<String> save(OperationRecordDto dto) {
+        return operationRecordFeign.save(dto);
+    }
+
+
+
+    public ResultBean<List<OperationRecordVo>> details(String sid) {
+        return operationRecordFeign.details(sid);
+    }
+
+}

wms/src/main/java/com/yxt/wms/biz/func/operationrecord/OperationRecordVo.java

@@ -0,0 +1,29 @@
+package com.yxt.wms.biz.func.operationrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 9:34
+ */
+@Data
+public class OperationRecordVo {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("修改用户sid")
+    private String userSid;
+    @ApiModelProperty("修改用户")
+    private String userName;
+    @ApiModelProperty("内容")
+    private String content;
+
+
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillExcelVo.java

@@ -0,0 +1,8 @@
+package com.yxt.wms.biz.func.warehouseansbill;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/24 15:24
+ */
+public class WarehouseAnsBillExcelVo {
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java

@@ -41,4 +41,8 @@ public class WarehouseAnsBillQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
     private int index;
+
+    private String queryType;//1条件  2勾选的
+    private String contentType;//1包含明细  2不包含明细
+    private String sids;//勾选的sid /拼接
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java

@@ -1,7 +1,9 @@
 package com.yxt.wms.biz.func.warehouseansbill;
 
 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.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -14,6 +16,9 @@ import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -46,14 +51,7 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
         return wmsAnsBillFeign.details(sid);
     }
 
-
-    public ResultBean<WarehouseAnsSupplierVo> getSupplier(String sid) {
-        ResultBean rb=new ResultBean().fail();
-        WarehouseAnsDetailsVo warehouseAnsDetailsVo=wmsAnsBillFeign.getWarehouseAns(sid).getData();
-        WarehouseAnsSupplierVo supplierVo=new WarehouseAnsSupplierVo();
-        BeanUtil.copyProperties(warehouseAnsDetailsVo,supplierVo);
-        SupplierInfoDetailsVo supplierInfoDetailsVo=supplierInfoFeign.fetchDetailsBySid(warehouseAnsDetailsVo.getSupplierSid()).getData();
-        supplierVo.setSupplierInfoDetailsVo(supplierInfoDetailsVo);
-        return rb.success().setData(supplierVo);
+    public void listExcel(WarehouseAnsBillQuery query) {
+        wmsAnsBillFeign.exportExcel(query);
     }
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java

@@ -59,6 +59,7 @@ public class WarehouseAnsBillVo {
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    private String remarks;
 
 
 

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetail.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.func.warehouseansbilldetail;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/9
+ **/
+@Data
+public class WarehouseAnsBillDetail extends BaseEntity {
+
+    @ApiModelProperty("来源单sid")
+    private String billSid;
+    @ApiModelProperty("图示")
+    private String illustration;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("计量单位")
+    private String unit;
+    @ApiModelProperty("预约数量（采购订单数量）")
+    private double orderCount;
+    @ApiModelProperty("待入库数量-根据收货单计算")
+    private Integer waitInCount;
+    @ApiModelProperty("实际入库数量-根据收货单计算")
+    private Integer actualInCount;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailDto.java

@@ -10,21 +10,26 @@ import lombok.Data;
  **/
 @Data
 public class WarehouseAnsBillDetailDto {
+    private String sid;
 
-    @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
+    @ApiModelProperty("来源单sid")
+    private String sourceBillSid;
+    @ApiModelProperty("图示")
+    private String illustration;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品名称")
     private String goodsSkuTitle;
-    @ApiModelProperty("商品编码（图号）")
+    @ApiModelProperty("商品编码")
     private String goodsSkuCode;
     @ApiModelProperty("规格型号")
     private String goodsSkuOwnSpec;
     @ApiModelProperty("计量单位")
     private String unit;
     @ApiModelProperty("预约数量（采购订单数量）")
-    private String orderCount;
+    private double orderCount;
+    @ApiModelProperty("待入库数量-根据收货单计算")
+    private Integer waitInCount;
+    @ApiModelProperty("实际入库数量-根据收货单计算")
+    private Integer actualInCount;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java

@@ -0,0 +1,26 @@
+package com.yxt.wms.biz.func.warehouseansbilldetail;
+
+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;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/9
+ **/
+@Mapper
+public interface WarehouseAnsBillDetailMapper extends BaseMapper<WarehouseAnsBillDetail> {
+    IPage<WarehouseAnsBillDetailVo> listPage(IPage<WarehouseAnsBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBillDetail> qw);
+    WarehouseAnsBillDetailVo initialization (@Param("sid") String sid);
+    int deleteDetails(String sid);
+    @Delete("delete from wms_ans_bill_details where sid = #{sid}")
+    void delByMainSid(String billSid);
+    List<WarehouseAnsListDetailsVo> selectByBillSid(String sid);
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailMapper.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.warehouseansbilldetail.WarehouseAnsBillDetailMapper">
+
+</mapper>

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.func.warehouseansbilldetail;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/6/6 15:10
+ */
+@Data
+public class WarehouseAnsBillDetailQuery implements Query {
+    private String name;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailService.java

@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.func.warehouseansbilldetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+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.wms.feign.warehouse.warehouseansbilldetail.WarehouseAnsBillDetailFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/9
+ **/
+@Service
+public class WarehouseAnsBillDetailService extends MybatisBaseService<WarehouseAnsBillDetailMapper, WarehouseAnsBillDetail> {
+    @Autowired
+    WarehouseAnsBillDetailFeign warehouseAnsBillDetailFeign;
+
+
+
+    public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(String sid) {
+        return warehouseAnsBillDetailFeign.selectByBillSid(sid);
+    }
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetailVo.java

@@ -0,0 +1,36 @@
+package com.yxt.wms.biz.func.warehouseansbilldetail;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/10
+ **/
+@Data
+public class WarehouseAnsBillDetailVo {
+
+    @ApiModelProperty("来源单sid")
+    private String sourceBillSid;
+    @ApiModelProperty("图示")
+    private String illustration;
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid;
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle;
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("计量单位")
+    private String unit;
+    @ApiModelProperty("预约数量（采购订单数量）")
+    private double orderCount;
+    @ApiModelProperty("待入库数量-根据收货单计算")
+    private Integer waitInCount;
+    @ApiModelProperty("实际入库数量-根据收货单计算")
+    private Integer actualInCount;
+    private String barCode;
+    private String specificationCode;
+}

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsListDetailsVo.java

@@ -30,4 +30,6 @@ public class WarehouseAnsListDetailsVo {
     private Integer waitInCount;
     @ApiModelProperty("实际入库数量-根据收货单计算")
     private Integer actualInCount;
+
+
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -16,8 +16,10 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import com.yxt.wms.feign.warehouse.wmswarehouserack.WarehouseRackFeign;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Arrays;
 import java.util.List;
@@ -50,8 +52,8 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
         PagerVo<WarehouseRackVo> p = warehouseRackFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
-    public ResultBean<WarehouseRackVo> getAllType() {
-        return warehouseRackFeign.getAllType();
+    public ResultBean<List<WarehouseRackVo>> listAll(OrgPathQuery query) {
+        return warehouseRackFeign.listAll(query);
     }
 
     public ResultBean<String> saveOrUpdate(WarehouseRackDto dto) {

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeign.java

@@ -1,11 +1,17 @@
 package com.yxt.wms.feign.base.basegoodssku;
 
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -21,4 +27,8 @@ public interface BaseGoodsSkuFeign {
     @ApiOperation("获取商品信息")
     @GetMapping("/getDetails")
     ResultBean<BaseGoodsSkuDetailsVo> getDetails(@RequestParam("sid") String sid);
+    @ApiOperation("查询组织下所有商品")
+    @PostMapping("/listAllByOrg")
+    public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(@RequestBody OrgPathQuery query);
+
 }

wms/src/main/java/com/yxt/wms/feign/base/basegoodssku/BaseGoodsSkuFeignFallback.java

@@ -1,8 +1,12 @@
 package com.yxt.wms.feign.base.basegoodssku;
 
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -14,4 +18,9 @@ public class BaseGoodsSkuFeignFallback implements BaseGoodsSkuFeign{
     public ResultBean<BaseGoodsSkuDetailsVo> getDetails(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<BaseGoodsSkuVo>> listAllByOrg(OrgPathQuery query) {
+        return null;
+    }
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/operationrecord/OperationRecordFeign.java

@@ -0,0 +1,30 @@
+package com.yxt.wms.feign.warehouse.operationrecord;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.operationrecord.OperationRecordDto;
+import com.yxt.wms.biz.func.operationrecord.OperationRecordVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Api(tags = "预期到货通知单")
+@FeignClient(
+        contextId = "ss-common-warehouse-OperationRecord",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/operationrecord",
+        fallback = OperationRecordFeignFallback.class)
+public interface OperationRecordFeign {
+    @PostMapping("/save")
+    @ApiOperation("新增")
+    ResultBean<String> save(@RequestBody OperationRecordDto dto);
+
+    @GetMapping("/details")
+    @ApiOperation("详情")
+    ResultBean<List<OperationRecordVo>> details(@RequestParam("sid") String sid);
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/operationrecord/OperationRecordFeignFallback.java

@@ -0,0 +1,42 @@
+package com.yxt.wms.feign.warehouse.operationrecord;
+
+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.operationrecord.OperationRecordDto;
+import com.yxt.wms.biz.func.operationrecord.OperationRecordVo;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillDto;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillVo;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+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 OperationRecordFeignFallback implements OperationRecordFeign {
+
+
+	@Override
+	public ResultBean<String> save(OperationRecordDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<OperationRecordVo>> details(String sid) {
+		return null;
+	}
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java

@@ -45,4 +45,7 @@ public interface WarehouseAnsBillFeign {
     @GetMapping("getWarehouseAns")
     @ApiOperation("获取入库单")
     ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(@RequestParam("sid") String sid);
+    @PostMapping("/exportExcel")
+    @ApiOperation(value = "导出")
+    public void exportExcel(@RequestBody WarehouseAnsBillQuery query);
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java

@@ -49,4 +49,9 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign {
 	public ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(String sid) {
 		return null;
 	}
+
+	@Override
+	public void exportExcel(WarehouseAnsBillQuery query) {
+
+	}
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbilldetail/WarehouseAnsBillDetailFeign.java

@@ -0,0 +1,31 @@
+package com.yxt.wms.feign.warehouse.warehouseansbilldetail;
+
+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.warehouseansbill.WarehouseAnsBillDto;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillVo;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "预期到货通知单")
+@FeignClient(
+        contextId = "ss-common-warehouse-WmsAnsBillDetail",
+        name = "ss-common-warehouse",
+        path = "/apiadmin/warehouseansbillDetail",
+        fallback = WarehouseAnsBillDetailFeignFallback.class)
+public interface WarehouseAnsBillDetailFeign {
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<WarehouseAnsBillDetailVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据sid查询详情")
+    @PostMapping("/selectByBillSid/{sid}")
+    public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid);
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbilldetail/WarehouseAnsBillDetailFeignFallback.java

@@ -0,0 +1,39 @@
+package com.yxt.wms.feign.warehouse.warehouseansbilldetail;
+
+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.warehouseansbill.WarehouseAnsBillDto;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillQuery;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillVo;
+import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo;
+import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * 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 WarehouseAnsBillDetailFeignFallback implements WarehouseAnsBillDetailFeign {
+
+
+	@Override
+	public ResultBean<WarehouseAnsBillDetailVo> fetchDetailsBySid(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(String sid) {
+		return null;
+	}
+}

wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java

@@ -9,11 +9,14 @@ import com.yxt.wms.biz.func.warehouserack.WarehouseRack;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackDto;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackQuery;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackVo;
+import com.yxt.wms.utils.OrgPathQuery;
 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/>
@@ -40,8 +43,8 @@ public interface WarehouseRackFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq);
     @ApiOperation("查询所有的库区")
-    @GetMapping("/getAllType")
-    public ResultBean<WarehouseRackVo> getAllType();
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseRackVo>> listAll(@RequestBody OrgPathQuery query);
 
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")

wms/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeignFallback.java

@@ -9,8 +9,11 @@ import com.yxt.wms.biz.func.warehouserack.WarehouseRack;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackDto;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackQuery;
 import com.yxt.wms.biz.func.warehouserack.WarehouseRackVo;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysRoleFeignFallback.java <br/>
@@ -34,10 +37,11 @@ public class WarehouseRackFeignFallback implements WarehouseRackFeign {
 	}
 
 	@Override
-	public ResultBean<WarehouseRackVo> getAllType() {
+	public ResultBean<List<WarehouseRackVo>> listAll(OrgPathQuery query) {
 		return null;
 	}
 
+
 	@Override
 	public ResultBean<String> saveOrUpdate(WarehouseRackDto dto) {
 		return null;