yxt_product
/
wms-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

入库预约单

master
wangpengfei 9 months ago
parent
449463e7f2
commit
869ad291ee
8 changed files with 150 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java
  2. 35
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java
  3. 19
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java
  4. 63
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java
  5. 61
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsSupplierVo.java
  6. 20
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsListDetailsVo.java
  7. 3
      wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java
  8. 5
      wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java

6
wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java
View File

@ -48,6 +48,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);
}
}

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

@ -12,29 +12,26 @@ import lombok.Data;
@Data
public class WarehouseAnsBillQuery implements Query {
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("开始时间")
private String createTimeStart;
@ApiModelProperty("结束时间")
private String createTimeEnd;
@ApiModelProperty("业务类型")
private String busTypeKey;
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("预期到货日期开始时间")
private String deliveryDateStart;
@ApiModelProperty("预期到货日期结束时间")
private String deliveryDateEnd;
//单据状态
private String billState;
@ApiModelProperty("审核状态")
private String reviewStatus;
@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("菜单路由")

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

@ -1,11 +1,15 @@
package com.yxt.wms.biz.func.warehouseansbill;
import cn.hutool.core.bean.BeanUtil;
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.supplierinfo.SupplierInfoDetailsVo;
import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsListDetailsVo;
import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign;
import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -21,6 +25,8 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
@Autowired
private WarehouseAnsBillFeign wmsAnsBillFeign;
@Autowired
SupplierInfoFeign supplierInfoFeign;
@Autowired
private CommonMethod commonMethod;
public ResultBean<String> saveOrUpdateBill(WarehouseAnsBillDto dto) {
@ -29,7 +35,7 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
public ResultBean<PagerVo<WarehouseAnsBillVo>> listPages(PagerQuery<WarehouseAnsBillQuery> pq) {
WarehouseAnsBillQuery query=new WarehouseAnsBillQuery();
WarehouseAnsBillQuery query=pq.getParams();
DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();
pq.getParams().setOrgLevelKey(dataRule.getDataRuleId());
pq.getParams().setIndex(dataRule.getIndex());
@ -39,4 +45,15 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
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);
}
}

63
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java
View File

@ -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,45 +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("预计到货日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private String deliveryDate;
//单据状态
private String billState;
@ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
private String reviewStatus;
/* @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
private Integer billState;*/
@ApiModelProperty("拒绝原因")
private String refuseReason;
/* @ApiModelProperty("联系人")
@ApiModelProperty("外部单号")
private String sourceBillNo;
@ApiModelProperty("联系人")
private String contact;
@ApiModelProperty("联系人手机")
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("货主sid")
private String goodsOwnerSid;
@ApiModelProperty("货主")
private String goodsOwner;*/
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private List<WarehouseAnsListDetailsVo> list = new ArrayList<>();

61
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsSupplierVo.java
View File

@ -0,0 +1,61 @@
package com.yxt.wms.biz.func.warehouseansbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.wms.biz.func.supplierinfo.SupplierInfoDetailsVo;
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;
SupplierInfoDetailsVo supplierInfoDetailsVo;
}

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

@ -10,28 +10,24 @@ 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;
}

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

@ -42,4 +42,7 @@ public interface WarehouseAnsBillFeign {
@GetMapping("details")
@ApiOperation("详情")
ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid);
@GetMapping("getWarehouseAns")
@ApiOperation("获取入库单")
ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(@RequestParam("sid") String sid);
}

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

@ -44,4 +44,9 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign {
public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
return null;
}
@Override
public ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(String sid) {
return null;
}
}
Write Preview
Loading…
Cancel
Save