采购单推送入库预约接口开发

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -151,45 +151,36 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         PurchaseBillDetailsVo dto = purchaseBillFeign.fetchDetailsBySid(sid).getData();
         if ("2".equals(state)){
             WarehouseAnsBillDto wmsAnsBillDto = new WarehouseAnsBillDto();
-            wmsAnsBillDto.setDeptName(dto.getDeptName());
-            wmsAnsBillDto.setDeptSid(dto.getDeptSid());
-            wmsAnsBillDto.setCreateBySid(dto.getCreateBySid());
             wmsAnsBillDto.setSourceBillNo(dto.getBillNo());
+            wmsAnsBillDto.setApplicationTime(new Date());
             wmsAnsBillDto.setBusTypeKey("01");
             wmsAnsBillDto.setBusTypeValue("采购预约");
-            wmsAnsBillDto.setCreateByName(dto.getCreateByName());
+            wmsAnsBillDto.setHandoverStatus("0");
+            wmsAnsBillDto.setHandoverTime(new Date());
             wmsAnsBillDto.setBillState(0);
-            wmsAnsBillDto.setReviewStatus("");
-            wmsAnsBillDto.setRefuseReason("");
+            wmsAnsBillDto.setWarehouseSid(dto.getWareHouseSid());
+            wmsAnsBillDto.setWarehouseName(dto.getWareHouseName());
+            wmsAnsBillDto.setApplicant(dto.getCreateByName());
+            wmsAnsBillDto.setReservationTime(new Date());
             wmsAnsBillDto.setMobile(dto.getSupplierPhone());
             wmsAnsBillDto.setSupplierSid(dto.getSupplierSid());
             wmsAnsBillDto.setSupplierName(dto.getSupplierName());
-            wmsAnsBillDto.setGoodsOwnerSid("");
-            wmsAnsBillDto.setGoodsOwner("");
+            wmsAnsBillDto.setSourceBillNo(dto.getBillNo());
             wmsAnsBillDto.setUseOrgSid(dto.getUseOrgSid());
             wmsAnsBillDto.setCreateOrgSid(dto.getCreateOrgSid());
             List<WarehouseAnsBillDetailDto> wmsAnsBillDetailDtos = new ArrayList<>();
             List<PurchaseBillDetailDetailsVo> purchaseBillDetailList = dto.getPurchaseBillDetailList();
             for (PurchaseBillDetailDetailsVo purchaseBillDetailDto : purchaseBillDetailList) {
                 WarehouseAnsBillDetailDto wmsAnsBillDetailDto = new WarehouseAnsBillDetailDto();
-                wmsAnsBillDetailDto.setGoodSpuSid(purchaseBillDetailDto.getGoodsSpuSid());
-                wmsAnsBillDetailDto.setGoodsSpuName(purchaseBillDetailDto.getGoodsSpuName());
                 wmsAnsBillDetailDto.setGoodsSkuSid(purchaseBillDetailDto.getGoodsSkuSid());
                 wmsAnsBillDetailDto.setGoodsSkuTitle(purchaseBillDetailDto.getGoodsSkuTitle());
                 wmsAnsBillDetailDto.setGoodsSkuCode(purchaseBillDetailDto.getGoodsSkuCode());
                 wmsAnsBillDetailDto.setGoodsSkuOwnSpec(purchaseBillDetailDto.getGoodsSkuOwnSpec());
                 wmsAnsBillDetailDto.setUnit(purchaseBillDetailDto.getUnit());
-                if (null != purchaseBillDetailDto.getCost()) {
-                    wmsAnsBillDetailDto.setCost(purchaseBillDetailDto.getCost().doubleValue());
-                }
                 wmsAnsBillDetailDto.setOrderCount(purchaseBillDetailDto.getCount().doubleValue());
-                if (null != purchaseBillDetailDto.getTaxAmount()) {
-                    wmsAnsBillDetailDto.setTaxAmount(purchaseBillDetailDto.getTaxAmount().doubleValue());
-                }
-                wmsAnsBillDetailDto.setAmount(purchaseBillDetailDto.getAmount().doubleValue());
                 wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto);
             }
-            wmsAnsBillDto.setWmsAnsBillDetailList(wmsAnsBillDetailDtos);
+            wmsAnsBillDto.setStorageAnsBillDetailList(wmsAnsBillDetailDtos);
             warehouseAnsBillFeign.saveBill(wmsAnsBillDto);
         }
         return rb;

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java

@@ -40,6 +40,8 @@ public class PurchaseBillVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("审核状态")
+    private String state;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("业务日期")
     private Date createTime;

oms/src/main/java/com/yxt/oms/biz/func/warehouseansbill/WarehouseAnsBillDto.java

@@ -1,5 +1,6 @@
 package com.yxt.oms.biz.func.warehouseansbill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,45 +17,51 @@ import java.util.List;
 @Data
 public class WarehouseAnsBillDto {
 
-    private String sid;
-    private String createBySid;
-
-    @ApiModelProperty("申请部门sid")
-    private String deptSid;
-    @ApiModelProperty("申请部门")
-    private String deptName;
-    @ApiModelProperty("外部单号（业务单据编号）")
-    private String sourceBillNo;
+    @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 createByName;
+    @ApiModelProperty("交接状态")
+    private String handoverStatus;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("交接时间")
+    private Date handoverTime;
     @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
     private Integer billState;
-    @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
-    private String reviewStatus;
-    @ApiModelProperty("拒绝原因")
-    private String refuseReason;
-    @ApiModelProperty("联系人")
-    private String contact;
-    @ApiModelProperty("联系人手机")
-    private String mobile;
+    @ApiModelProperty("仓库sid")
+    private String 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("货主sid")
-    private String goodsOwnerSid;
-    @ApiModelProperty("货主")
-    private String goodsOwner;
-    @ApiModelProperty("预计到货日期")
-    private Date deliveryDate;
+    @ApiModelProperty("外部单号")
+    private String sourceBillNo;
+    @ApiModelProperty("联系人")
+    private String contact;
+    @ApiModelProperty("联系电话")
+    private String mobile;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    private String userSid;
+    private String remarks;
 
-    private List<WarehouseAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
+    private List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = new ArrayList<>();
 }

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

@@ -11,28 +11,24 @@ import lombok.Data;
 @Data
 public class WarehouseAnsBillDetailDto {
 
-    @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 double cost;
     @ApiModelProperty("预约数量（采购订单数量）")
     private double orderCount;
-    @ApiModelProperty("税额")
-    private double taxAmount;
-    @ApiModelProperty("含税价")
-    private double  taxPrice;
-    @ApiModelProperty("金额")
-    private double amount;
+    @ApiModelProperty("待入库数量-根据收货单计算")
+    private Integer waitInCount;
+    @ApiModelProperty("实际入库数量-根据收货单计算")
+    private Integer actualInCount;
 }