入库预约单

src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java

@@ -41,6 +41,12 @@ public class WarehouseAnsBillRest {
     ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsAnsBillService.details(sid);
     }
+    @GetMapping("/getWarehouseAns")
+    @ApiOperation("获取入库单")
+    ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(@RequestParam("sid") String sid) {
+        return wmsAnsBillService.getWarehouseAns(sid);
+    }
+
     @PostMapping("/saveBill")
     @ApiOperation("保存预期到通知单")
     ResultBean<String> saveBill(@RequestBody WarehouseAnsBillDto dto) {

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java

@@ -1,5 +1,6 @@
 package com.yxt.warehouse.biz.warehouseansbill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,46 +19,45 @@ public class WarehouseAnsBillDto {
 
     private String sid;
 
-    @ApiModelProperty("申请部门sid")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private String deptSid;
+    @ApiModelProperty("申请时间")
-    @ApiModelProperty("申请部门")
+    private Date applicationTime;
-    private String deptName;
-    @ApiModelProperty("外部单号（业务单据编号）")
-    private String sourceBillNo;
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
     private String busTypeKey;
     @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
     private String busTypeValue;
-    @ApiModelProperty("单据日期")
+    @ApiModelProperty("交接状态")
-    private String createTime;
+    private String handoverStatus;
-    @ApiModelProperty("制单人")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private String createBySid;
+    @ApiModelProperty("交接时间")
-    @ApiModelProperty("制单人姓名")
+    private Date handoverTime;
-    private String createByName;
     @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
     private Integer billState;
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
+    @ApiModelProperty("仓库sid")
-    private String reviewStatus;
+    private Integer warehouseSid;
-    @ApiModelProperty("拒绝原因")
+    @ApiModelProperty("仓库名")
-    private String refuseReason;
+    private String warehouseName;
-    @ApiModelProperty("备注")
+    @ApiModelProperty("库区sid")
-    private String remarks;
+    private String warehouseRackSid;
-    @ApiModelProperty("联系人")
+    @ApiModelProperty("库区名")
-    private String contact;
+    private String warehouseRackName;
-    @ApiModelProperty("联系人手机")
+    @ApiModelProperty("申请人")
-    private String mobile;
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("供应商")
     private String supplierName;
-    @ApiModelProperty("货主sid")
+    @ApiModelProperty("外部单号")
-    private String goodsOwnerSid;
+    private String sourceBillNo;
-    @ApiModelProperty("货主")
+    @ApiModelProperty("联系人")
-    private String goodsOwner;
+    private String contact;
-    @ApiModelProperty("预计到货日期")
+    @ApiModelProperty("联系电话")
-    private Date deliveryDate;
+    private String mobile;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml

@@ -10,19 +10,7 @@
     </select>
 
     <select id="listPages" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
-        select wab.sid,
+        select wab.*
-               wab.billNo,
-               DATE_FORMAT(wab.createTime, '%Y-%m-%d')   as createTime,
-               wab.createByName,
-               wab.sourceBillNo,
-               wab.busTypeValue,
-               wab.supplierName,
-               wab.contact,
-               wab.mobile,
-               DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               wab.billState,
-               wab.reviewStatus,
-               wab.refuseReason
         from warehouse_ans_bill wab
         LEFT JOIN ss_user.sys_organization as s ON wab.useOrgSid = s.sid
         <where>
@@ -32,17 +20,7 @@
     </select>
 
     <select id="details" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsDetailsVo">
-        select wab.billNo,
+        select wab.*
-               wab.createByName,
-               DATE_FORMAT(wab.createTime, '%Y-%m-%d')   as createTime,
-               wab.sourceBillNo,
-               wab.busTypeKey,
-               wab.busTypeValue,
-               wab.supplierSid,
-               wab.supplierName,
-               DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               wab.billState,
-               wab.reviewStatus
         from warehouse_ans_bill wab
         where sid = #{sid}
     </select>

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java

@@ -11,24 +11,26 @@ import lombok.Data;
  **/
 @Data
 public class WarehouseAnsBillQuery implements Query {
-
+    @ApiModelProperty("业务类型")
+    private String busTypeKey;
+    @ApiModelProperty("外部单号（业务单据编号）")
+    private String sourceBillNo;
     @ApiModelProperty("单据编号")
     private String billNo;
-    @ApiModelProperty("开始时间")
+    @ApiModelProperty("商品sid")
+    private String goodsSkuSid;
+    @ApiModelProperty("申请开始时间")
     private String applicationTimeStart;
-    @ApiModelProperty("结束时间")
+    @ApiModelProperty("申请结束时间")
     private String applicationTimeEnd;
-    @ApiModelProperty("业务类型")
+    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
-    private String busTypeKey;
+    private String billState;
     @ApiModelProperty("供应商")
     private String supplierName;
-    //单据状态
+    @ApiModelProperty("运单号")
-    private String billState;
+    private String waybillNumber;
-
+    @ApiModelProperty("库区sid")
-    @ApiModelProperty("外部单号（业务单据编号）")
+    private String warehouseRackSid;
-    private String sourceBillNo;
-
-
 
     private String orgLevelKey;//权限等级
     @ApiModelProperty("菜单路由")

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java

@@ -105,7 +105,7 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
             if (StringUtils.isNotBlank(query.getBillNo())) {
                 qw.like("wab.billNo", query.getBillNo());
             }
-            //单据日期开始时间-单据日期结束时间
+            //申请日期开始时间-申请日期结束时间
             qw.apply(StringUtils.isNotBlank(query.getApplicationTimeStart()), "date_format (wab.createTime,'%Y-%m-%d') >= date_format('" + query.getApplicationTimeStart() + "','%Y-%m-%d')").
                     apply(StringUtils.isNotBlank(query.getApplicationTimeEnd()), "date_format (wab.createTime,'%Y-%m-%d') <= date_format('" + query.getApplicationTimeEnd() + "','%Y-%m-%d')"
                     );
@@ -147,6 +147,11 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
         }
         return rb.success().setData(WarehouseAnsDetailsVo);
     }
+    public ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(String sid) {
+        ResultBean<WarehouseAnsDetailsVo> rb = ResultBean.fireFail();
+        WarehouseAnsDetailsVo WarehouseAnsDetailsVo = baseMapper.details(sid);
+        return rb.success().setData(WarehouseAnsDetailsVo);
+    }
     public ResultBean<String> saveBill(WarehouseAnsBillDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java

@@ -16,43 +16,45 @@ public class WarehouseAnsBillVo {
 
 
     private String sid;
-    @ApiModelProperty("外部单号（业务单据编号）")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private String sourceBillNo;
+    @ApiModelProperty("申请时间")
+    private Date applicationTime;
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
     private String busTypeKey;
     @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
     private String busTypeValue;
-    @ApiModelProperty("单据日期")
+    @ApiModelProperty("交接状态")
-    private String createTime;
+    private String handoverStatus;
-    @ApiModelProperty("制单人")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private String createBySid;
+    @ApiModelProperty("交接时间")
-    @ApiModelProperty("制单人姓名")
+    private Date handoverTime;
-    private String createByName;
     @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
     private Integer billState;
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
+    @ApiModelProperty("仓库sid")
-    private String reviewStatus;
+    private Integer warehouseSid;
-    @ApiModelProperty("拒绝原因")
+    @ApiModelProperty("仓库名")
-    private String refuseReason;
+    private String warehouseName;
-    @ApiModelProperty("备注")
+    @ApiModelProperty("库区sid")
-    private String remarks;
+    private String warehouseRackSid;
-    @ApiModelProperty("联系人")
+    @ApiModelProperty("库区名")
-    private String contact;
+    private String warehouseRackName;
-    @ApiModelProperty("联系人手机")
+    @ApiModelProperty("申请人")
-    private String mobile;
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("供应商")
     private String supplierName;
-    @ApiModelProperty("货主sid")
+    @ApiModelProperty("外部单号")
-    private String goodsOwnerSid;
+    private String sourceBillNo;
-    @ApiModelProperty("货主")
+    @ApiModelProperty("联系人")
-    private String goodsOwner;
+    private String contact;
-    @ApiModelProperty("预计到货日期")
+    @ApiModelProperty("联系电话")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String mobile;
-    private Date deliveryDate;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.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;
 
 /**
@@ -15,32 +16,49 @@ import java.util.List;
  **/
 @Data
 public class WarehouseAnsDetailsVo {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("申请时间")
+    private Date applicationTime;
+    @ApiModelProperty("单据编号")
     private String billNo;
-    @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 handoverStatus;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("交接时间")
+    private Date handoverTime;
+    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
+    private Integer billState;
+    @ApiModelProperty("仓库sid")
+    private Integer warehouseSid;
+    @ApiModelProperty("仓库名")
+    private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseRackSid;
+    @ApiModelProperty("库区名")
+    private String warehouseRackName;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
     @ApiModelProperty("供应商sid")
     private String supplierSid;
-    @ApiModelProperty("供应商名称")
+    @ApiModelProperty("供应商")
     private String supplierName;
-    @ApiModelProperty("预计到货日期")
+    @ApiModelProperty("外部单号")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String sourceBillNo;
-    private String deliveryDate;
+    @ApiModelProperty("联系人")
-
+    private String contact;
-    //单据状态
+    @ApiModelProperty("联系电话")
-    private String billState;
+    private String mobile;
-
+    @ApiModelProperty("使用组织sid")
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
+    private String useOrgSid;
-    private String reviewStatus;
+    @ApiModelProperty("创建组织sid")
-    @ApiModelProperty("拒绝原因")
+    private String createOrgSid;
-    private String refuseReason;
     
     private List<WarehouseAnsListDetailsVo> list = new ArrayList<>();
 }

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsSupplierVo.java

@@ -0,0 +1,60 @@
+package com.yxt.warehouse.biz.warehouseansbill;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/23 16:26
+ */
+@Data
+public class WarehouseAnsSupplierVo {
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("申请时间")
+    private Date applicationTime;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
+    private String busTypeKey;
+    @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
+    private String busTypeValue;
+    @ApiModelProperty("交接状态")
+    private String handoverStatus;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("交接时间")
+    private Date handoverTime;
+    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
+    private Integer billState;
+    @ApiModelProperty("仓库sid")
+    private Integer warehouseSid;
+    @ApiModelProperty("仓库名")
+    private String warehouseName;
+    @ApiModelProperty("库区sid")
+    private String warehouseRackSid;
+    @ApiModelProperty("库区名")
+    private String warehouseRackName;
+    @ApiModelProperty("申请人")
+    private String applicant;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预约时间")
+    private Date reservationTime;
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商")
+    private String supplierName;
+    @ApiModelProperty("外部单号")
+    private String sourceBillNo;
+    @ApiModelProperty("联系人")
+    private String contact;
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+
+}

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java

@@ -14,34 +14,24 @@ import java.math.BigDecimal;
 @Data
 public class WarehouseAnsBillDetail extends BaseEntity {
 
-    @ApiModelProperty("单据sid")
+    @ApiModelProperty("来源单sid")
     private String billSid;
-    @ApiModelProperty("商品基础信息sid")
+    @ApiModelProperty("图示")
-    private String goodSpuSid;
+    private String illustration;
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
     @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 cost;
     @ApiModelProperty("预约数量（采购订单数量）")
-    private String orderCount;
+    private double orderCount;
     @ApiModelProperty("待入库数量-根据收货单计算")
     private Integer waitInCount;
     @ApiModelProperty("实际入库数量-根据收货单计算")
     private Integer actualInCount;
-    @ApiModelProperty("税额")
-    private BigDecimal taxAmount;
-    @ApiModelProperty("含税价")
-    private BigDecimal taxPrice;
-    @ApiModelProperty("金额")
-    private BigDecimal amount;
 }

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java

@@ -12,28 +12,24 @@ import lombok.Data;
 public class WarehouseAnsBillDetailDto {
     private String sid;
 
-    @ApiModelProperty("商品基础信息sid")
+    @ApiModelProperty("来源单sid")
-    private String goodSpuSid;
+    private String sourceBillSid;
-    @ApiModelProperty("商品名称")
+    @ApiModelProperty("图示")
-    private String goodsSpuName;
+    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 cost;
     @ApiModelProperty("预约数量（采购订单数量）")
-    private String orderCount;
+    private double orderCount;
-    @ApiModelProperty("税额")
+    @ApiModelProperty("待入库数量-根据收货单计算")
-    private String taxAmount;
+    private Integer waitInCount;
-    @ApiModelProperty("含税价")
+    @ApiModelProperty("实际入库数量-根据收货单计算")
-    private String taxPrice;
+    private Integer actualInCount;
-    @ApiModelProperty("金额")
-    private String amount;
 }

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml

@@ -8,18 +8,7 @@
     </delete>
 
     <select id="selectByBillSid" resultType="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo">
-        select wd.goodsSkuTitle,
+        select wd.*
-               wd.goodsSkuCode,
-               wd.goodsSkuOwnSpec,
-               wd.unit,
-               wd.orderCount,
-               wd.waitInCount,
-               wd.actualInCount,
-               wd.cost,
-               wd.taxAmount,
-               wd.taxPrice,
-               wd.amount,
-               wd.goodsSkuSid
         from warehouse_ans_bill_detail wd
         where billSid = #{sid}
     </select>

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java

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

src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsListDetailsVo.java

@@ -10,47 +10,26 @@ import lombok.Data;
  **/
 @Data
 public class WarehouseAnsListDetailsVo {
+    @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;
-
-    //仓库
-    private String warehouseName;
-    //库位
-    private String warehouseRack;
-
-    //预约数量
     @ApiModelProperty("预约数量（采购订单数量）")
-    private String orderCount;
+    private double orderCount;
-    //待收货数量
     @ApiModelProperty("待入库数量-根据收货单计算")
     private Integer waitInCount;
-    //已收货数量
     @ApiModelProperty("实际入库数量-根据收货单计算")
     private Integer actualInCount;
-    //入库价
-    @ApiModelProperty("单位成本（采购价）")
-    private String cost;
-    @ApiModelProperty("税额")
-    private String taxAmount;
-    @ApiModelProperty("含税价")
-    private String taxPrice;
-    //采购金额
-    @ApiModelProperty("金额")
-    private String amount;
-
-
- /*   @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;*/
-    @ApiModelProperty("商品Skusid")
-    private String goodsSkuSid;
 
 
 }