diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java index 45084820cc..e93fe3ddcc 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java @@ -77,7 +77,7 @@ public class PmsPurchaseBillRest { @ApiOperation("选择原单") @PostMapping("/choiceBillListPage") - public ResultBean> choiceBillListPage(@RequestBody PagerQuery pq){ + public ResultBean> choiceBillListPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); PagerVo pv = pmsPurchaseBillService.choiceBillListPage(pq); return rb.success().setData(pv); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java index 911719f650..4ffbecf8ca 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java @@ -62,7 +62,7 @@ import java.util.List; */ @Api(tags = "采购退货单据") @RestController -@RequestMapping("/apiadmin/pms/pmspurchasebackbill") +@RequestMapping("v1/pmspurchasebackbill") public class PmsPurchasebackBillRest { @Autowired diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java index 4d066a2475..1691155a42 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java @@ -64,7 +64,11 @@ public class PmsPurchasebackBill extends BaseEntity { private String billNo; // 单据编号 @ApiModelProperty("退误差调整金额") private BigDecimal backErrorAmount; // 退误差调整金额 - @ApiModelProperty("退优惠金额") + + @ApiModelProperty("退运费") + private BigDecimal backFreight; + + @ApiModelProperty("退优惠金额") private BigDecimal backDiscountAmount; // 退优惠金额 @ApiModelProperty("抵扣欠款") private BigDecimal deductDebts; // 抵扣欠款 @@ -72,10 +76,6 @@ public class PmsPurchasebackBill extends BaseEntity { private String deductBillNo; // 抵扣单号 @ApiModelProperty("转入预付款") private BigDecimal toPrepayment; // 转入预付款 - @ApiModelProperty("欠款状态") - private String arrearsState; - @ApiModelProperty("单据状态") - private String documentState; @ApiModelProperty("已付金额") private BigDecimal paidAmount; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java index b55534eda3..e3c2cf72bf 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.Vo; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto; +import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillDetailsVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -58,6 +59,12 @@ public class PmsPurchasebackBillDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人sid") @@ -72,6 +79,10 @@ public class PmsPurchasebackBillDetailsVo implements Vo { private String billNo; // 单据编号 @ApiModelProperty("退误差调整金额") private BigDecimal backErrorAmount; // 退误差调整金额 + + @ApiModelProperty("退运费") + private BigDecimal backFreight; + @ApiModelProperty("退优惠金额") private BigDecimal backDiscountAmount; // 退优惠金额 @ApiModelProperty("抵扣欠款") @@ -117,4 +128,8 @@ public class PmsPurchasebackBillDetailsVo implements Vo { @ApiModelProperty("采购退货单明细") private List pmsPurchasebackDetailList; + + /*单独查询*/ + @ApiModelProperty("初始化采购单信息") + private PmsPurchaseChoiceBillDetailsVo pmsPurchaseChoiceBillDetailsVo; } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java index 7c9250a1ec..9e90306d42 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java @@ -71,7 +71,11 @@ public class PmsPurchasebackBillDto implements Dto { private String billNo; // 单据编号 @ApiModelProperty("退误差调整金额") private BigDecimal backErrorAmount; // 退误差调整金额 - @ApiModelProperty("退优惠金额") + + @ApiModelProperty("退运费") + private BigDecimal backFreight; + + @ApiModelProperty("退优惠金额") private BigDecimal backDiscountAmount; // 退优惠金额 @ApiModelProperty("抵扣欠款") private BigDecimal deductDebts; // 抵扣欠款 diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml index 74258b514b..47bd4ef90d 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml @@ -7,6 +7,8 @@ SELECT ppb.sid, ppb.`nodeState`, + ppb.`procDefId`, + ppb.`procInstId`, ppb.billNo, ppb.createOrgName, ppb.`deptName`, @@ -17,14 +19,14 @@ pb.`purchaseReasonValue`, pb.`purchaseTypeValue`, pb.supplierName, - SUM(ppbd.backAmount) AS backAmountCount, + SUM(ppd.backAmount) AS backAmountCount, ppb.receivableAmount FROM pms_purchaseback_bill ppb LEFT JOIN pms_purchase_bill pb ON ppb.`sourceBillSid` = pb.`sid` - LEFT JOIN pms_purchase_bill_detail ppbd - ON ppb.`sid` = ppbd.`billSid` + LEFT JOIN pms_purchaseback_detail ppd + ON ppb.`sid` = ppd.`billSid` ${ew.sqlSegment} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index 58dc8bd283..da1c3c0abe 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -26,6 +26,7 @@ package com.yxt.pms.biz.pms.pmspurchasebackbill; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,10 +38,13 @@ import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto; import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService; import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBill; +import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillService; +import com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillDetailsVo; import com.yxt.pms.biz.pms.pmspurchasebill.flowable.*; import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService; import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService; import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService; +import com.yxt.pms.feign.base.Rule; import com.yxt.pms.feign.flowable.flow.*; import com.yxt.pms.feign.flowable.flow2.FlowDelegateQuery; import com.yxt.pms.feign.flowable.flow2.FlowFeign; @@ -85,6 +89,8 @@ public class PmsPurchasebackBillService extends MybatisBaseService pmsPurchasebackDetailList = dto.getPmsPurchasebackDetailList(); + String deptSid = dto.getDeptSid(); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + dto.setUseOrgSid(useOrgSid); + dto.setUseOrgName(organizationVo.getName()); + dto.setCreateOrgSid(useOrgSid); + dto.setCreateOrgName(organizationVo.getName()); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + billNo = "CGTHD" + organizationVo.getOrgCode() + date; + String j = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(j)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); String sid = this.insertByDto(dto); for (PmsPurchasebackDetailDto pmsPurchasebackDetailDto : pmsPurchasebackDetailList) { pmsPurchasebackDetailDto.setBillSid(sid); @@ -175,6 +200,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService SELECT ppb.`sid`, + ppb.`createOrgName`, + ppb.`deptName`, + ppb.`finishTime`, ppb.billNo, ppb.`createTime`, ppb.`purchaserName`, diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 4a842b88ff..e35b601041 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -56,6 +56,9 @@ import com.yxt.pms.feign.message.MessageFlowableQuery; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDetailDto; +import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDto; +import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -105,6 +108,8 @@ public class PmsPurchaseBillService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsPurchaseBillQuery query = pq.getParams(); @@ -156,12 +161,11 @@ public class PmsPurchaseBillService extends MybatisBaseService choiceBillListPage(PagerQuery pq) { - PmsPurchaseBillQuery query = pq.getParams(); + public PagerVo choiceBillListPage(PagerQuery pq) { + PmsPurchaseChoiceBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - String orgPath = query.getOrgPath(); - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - qw.eq("ppb.createOrgSid", createOrgSid); + qw.eq("ppb.createOrgSid", query.getCreateOrgSid()); + qw.eq("ppb.nodeState", "已办结"); if (StringUtils.isNotBlank(query.getCreateOrgName())) { qw.like("ppb.createOrgName", query.getCreateOrgName()); } @@ -204,7 +208,7 @@ public class PmsPurchaseBillService extends MybatisBaseService pagging = baseMapper.choiceBillListPage(page, qw); for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) { BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid()); - if (money != null){ + if (money != null) { record.setPayableAmount(money); } List pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid()); @@ -423,7 +427,44 @@ public class PmsPurchaseBillService extends MybatisBaseService wmsAnsBillDetailDtos = new ArrayList<>(); + List pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(businessSid); + for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) { + WmsAnsBillDetailDto wmsAnsBillDetailDto = new WmsAnsBillDetailDto(); + wmsAnsBillDetailDto.setGoodSpuSid(pmsPurchaseBillDetailDetailsVo.getGoodSpuSid()); + wmsAnsBillDetailDto.setGoodsSpuName(pmsPurchaseBillDetailDetailsVo.getGoodsSpuName()); + wmsAnsBillDetailDto.setGoodsSkuSid(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid()); + wmsAnsBillDetailDto.setGoodsSkuTitle(pmsPurchaseBillDetailDetailsVo.getGoodsSkuTitle()); + wmsAnsBillDetailDto.setGoodsSkuCode(pmsPurchaseBillDetailDetailsVo.getGoodsSkuCode()); + wmsAnsBillDetailDto.setGoodsSkuOwnSpec(pmsPurchaseBillDetailDetailsVo.getGoodsSkuOwnSpec()); + wmsAnsBillDetailDto.setUnit(pmsPurchaseBillDetailDetailsVo.getUnit()); + wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getCost().toString()); + wmsAnsBillDetailDto.setOrderCount(pmsPurchaseBillDetailDetailsVo.getCount().toString()); + wmsAnsBillDetailDto.setTaxAmount(pmsPurchaseBillDetailDetailsVo.getTaxAmount().toString()); + wmsAnsBillDetailDto.setTaxPrice(pmsPurchaseBillDetailDetailsVo.getTaxPrice().toString()); + wmsAnsBillDetailDto.setAmount(pmsPurchaseBillDetailDetailsVo.getAmount().toString()); + wmsAnsBillDetailDtos.add(wmsAnsBillDetailDto); + } + wmsAnsBillDto.setWmsAnsBillDetailList(wmsAnsBillDetailDtos); + wmsAnsBillFeign.saveOrUpdate(wmsAnsBillDto); } else { //极光推送 pmsPurchaseBill = fetchBySid(businessSid); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java new file mode 100644 index 0000000000..a89a65907d --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.pms.biz.pms.pmspurchasebill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillVo
+ * Description: 采购单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PmsPurchaseChoiceBillDetailsVo implements Vo { + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("单据日期") + private Date createTime; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("采购类型Value（厂家采购、外采、其他）") + private String purchaseTypeValue; + @ApiModelProperty("采购原因（储备/客户订单/在修车辆）") + private String purchaseReasonValue; + @ApiModelProperty("付款方式value（预付款/月结/单笔付款）") + private String payTypeValue; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("是否需要开发票（是1，否0）") + private String isInvoicing; + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("采购金额合计") + private BigDecimal amountCount; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java index 5eda614bf8..5d09f0a20a 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java @@ -56,6 +56,15 @@ public class PmsPurchaseChoiceBillVo implements Vo { private String sid; // sid + /*仅页面展示*/ + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("申请部门名称") + private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; + @ApiModelProperty("单据编号") private String billNo; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java new file mode 100644 index 0000000000..96821af66b --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDetailDto.java @@ -0,0 +1,38 @@ +package com.yxt.pms.feign.wms.wmsansbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/9 + **/ +@Data +public class WmsAnsBillDetailDto { + + @ApiModelProperty("商品基础信息sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("单位成本（采购价）") + private String cost; + @ApiModelProperty("预约数量（采购订单数量）") + private String orderCount; + @ApiModelProperty("税额") + private String taxAmount; + @ApiModelProperty("含税价") + private String taxPrice; + @ApiModelProperty("金额") + private String amount; +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java new file mode 100644 index 0000000000..45e9cd6a0f --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillDto.java @@ -0,0 +1,56 @@ +package com.yxt.pms.feign.wms.wmsansbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/9 + **/ +@Data +public class WmsAnsBillDto { + + private String sid; + private String createBySid; + private String orgPath; + + @ApiModelProperty("外部单号（业务单据编号）") + private String sourceBillNo; + @ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）") + private String busTypeKey; + @ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）") + private String busTypeValue; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private Integer billState; + @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）") + private String reviewStatus; + @ApiModelProperty("拒绝原因") + private String refuseReason; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系人手机") + private String mobile; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("货主sid") + private String goodsOwnerSid; + @ApiModelProperty("货主") + private String goodsOwner; + @ApiModelProperty("预计到货日期") + private Date deliveryDate; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + + private List wmsAnsBillDetailList = new ArrayList<>(); +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java new file mode 100644 index 0000000000..037180b4bd --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/wms/wmsansbill/WmsAnsBillFeign.java @@ -0,0 +1,21 @@ +package com.yxt.pms.feign.wms.wmsansbill; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "预期到货通知单") +@FeignClient( + contextId = "yxt-wms-WmsAnsBill", + name = "yxt-wms", + path = "/apiadmin/WmsAnsBill") +public interface WmsAnsBillFeign { + + @PostMapping("saveOrUpdate") + @ApiOperation("新增修改保存") + ResultBean saveOrUpdate(@RequestBody WmsAnsBillDto dto); +} \ No newline at end of file