diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java index cc48f55..c4dfa9d 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java @@ -85,5 +85,7 @@ public class PurchaseBillDetail extends BaseEntity { @ApiModelProperty("税额") private BigDecimal taxAmount; // 税额 @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 + private BigDecimal taxPrice; // 含税价、 + private String goodsCode; // spucode、 + } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java index 94b6e73..c4bb4e3 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -114,4 +114,6 @@ public class PurchaseBillDetailDetailsVo implements Vo { @ApiModelProperty("过期日期") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date expireDate; // 过期日期 + private String goodsCode; // spucode、 + } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java index 20c01bb..e050a07 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java @@ -106,4 +106,6 @@ public class PurchaseBillDetailDto implements Dto { private String madeDate; @ApiModelProperty("过期日期") private String expireDate; + private String goodsCode; // spucode、 + } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index 32de1f4..30ca642 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -64,6 +64,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.math.RoundingMode; import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -202,6 +203,14 @@ public class SmsSalesBillService extends MybatisBaseService> customerSales(PagerQuery pq) { // crmCustomerTempFeign. + if(StringUtils.isNotBlank(pq.getParams().getCustomerCode())){ + ResultBean crmCustomerTempResultBean = crmCustomerTempFeign.selectByCustomerNo(pq.getParams().getCustomerCode()); + if(crmCustomerTempResultBean.getData()!=null){ + pq.getParams().setCustomerSid(crmCustomerTempResultBean.getData().getSid()); + }else{ + pq.getParams().setCustomerSid("999999"); + } + } ResultBean> pagerVoResultBean = warehouseInventoryRecordFeign.customerSales(pq); for (WarehouseOutReportVo record : pagerVoResultBean.getData().getRecords()) { ResultBean crmCustomerTempResultBean = crmCustomerTempFeign.fetchBySid(record.getCustomerSid()); @@ -209,28 +218,37 @@ public class SmsSalesBillService extends MybatisBaseService> goodsSales(PagerQuery pq) { // crmCustomerTempFeign. GoodsSpuQuery query=new GoodsSpuQuery(); - if(StringUtils.isNotBlank(query.getBrandSid())){ - query.setBrandSid(query.getBrandSid()); - } - if(StringUtils.isNotBlank(query.getTypeSid())){ - query.setTypeSid(query.getTypeSid()); + GoodsSpuQuery query1=new GoodsSpuQuery(); + if(StringUtils.isNotBlank(pq.getParams().getState())){ + query1.setState(pq.getParams().getState()); + query1.setOrgPath(pq.getParams().getOrgPath()); + ResultBean> listResultBean = baseGoodsSpuFeign.listAllByQuery(query1); + if(listResultBean.getData().size()!=0){ + pq.getParams().setGoodsSids(listResultBean.getData().stream().map(s->s.getSid()).collect(Collectors.toList())); + + }else{ + return new ResultBean>().success().setData(new PagerVo<>()); + } } - if(StringUtils.isNotBlank(query.getBrandSid())|| StringUtils.isNotBlank(query.getTypeSid())){ + if(StringUtils.isNotBlank(query.getBrandSid())||StringUtils.isNotBlank(query.getTypeSid())){ + query.setOrgPath(pq.getParams().getOrgPath()); + query.setBrandSid(pq.getParams().getBrandSid()); + query.setTypeSid(pq.getParams().getTypeSid()); ResultBean> listResultBean = baseGoodsSpuFeign.listAllByQuery(query); pq.getParams().setTypeSids(listResultBean.getData().stream().map(s->s.getSid()).collect(Collectors.toList())); - } + }else{pq.getParams().setTypeSids(new ArrayList<>());} ResultBean> pagerVoResultBean = warehouseInventoryRecordFeign.goodsSales(pq); for (WarehouseGoodsSalesReportVo record : pagerVoResultBean.getData().getRecords()) { BigDecimal bigDecimal=new BigDecimal(record.getAmount()); if(bigDecimal.compareTo(new BigDecimal(0))!=1){ record.setAmount(new BigDecimal(record.getCount()).multiply(new BigDecimal(record.getCost())).toString()); - record.setAverageCost(new BigDecimal(record.getAmount()).divide(new BigDecimal(record.getCount())).toString()); + record.setAverageCost(new BigDecimal(record.getAmount()).divide(new BigDecimal(record.getCount()),2, RoundingMode.HALF_UP).toString()); } ResultBean initialization1=new ResultBean<>(); if(StringUtils.isBlank(record.getGoodsSpuSid())){ @@ -247,7 +265,7 @@ public class SmsSalesBillService extends MybatisBaseService initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid()); record.setBrandSid(initialization3.getData().getSid()); @@ -264,7 +282,14 @@ public class SmsSalesBillService extends MybatisBaseService crmCustomerTempResultBean = crmCustomerTempFeign.selectByCustomerNo(pq.getCustomerCode()); + if(crmCustomerTempResultBean.getData()!=null){ + pq.setCustomerSid(crmCustomerTempResultBean.getData().getSid()); + }else{ + pq.setCustomerSid("999999"); + } + } List exportVoList = warehouseInventoryRecordFeign.customerSalesExport(pq); for (WarehouseCustomerOutReportExcelVo record : exportVoList) { BigDecimal bigDecimal=new BigDecimal(record.getAmount()); @@ -286,24 +311,32 @@ public class SmsSalesBillService extends MybatisBaseService> listResultBean = baseGoodsSpuFeign.listAllByQuery(query); - pq.setTypeSids(listResultBean.getData().stream().map(s->s.getSid()).collect(Collectors.toList())); - } + public void goodsSalesExport(WarehouseInventoryCountReportQuery pq) { + GoodsSpuQuery query=new GoodsSpuQuery(); + GoodsSpuQuery query1=new GoodsSpuQuery(); + if(StringUtils.isNotBlank(pq.getState())){ + query1.setState(pq.getState()); + query1.setOrgPath(pq.getOrgPath()); + ResultBean> listResultBean = baseGoodsSpuFeign.listAllByQuery(query1); + if(listResultBean.getData().size()!=0){ + pq.setGoodsSids(listResultBean.getData().stream().map(s->s.getSid()).collect(Collectors.toList())); + }else{ + + } + } + if(StringUtils.isNotBlank(query.getBrandSid())||StringUtils.isNotBlank(query.getTypeSid())){ + query.setOrgPath(pq.getOrgPath()); + query.setBrandSid(pq.getBrandSid()); + query.setTypeSid(pq.getTypeSid()); + ResultBean> listResultBean = baseGoodsSpuFeign.listAllByQuery(query); + pq.setTypeSids(listResultBean.getData().stream().map(s->s.getSid()).collect(Collectors.toList())); + }else{pq.setTypeSids(new ArrayList<>());} List exportVoList = warehouseInventoryRecordFeign.goodsSalesExport(pq); for (WarehouseGoodsSalesReportExcelVo record : exportVoList) { BigDecimal bigDecimal=new BigDecimal(record.getAmount()); if(bigDecimal.compareTo(new BigDecimal(0))!=1){ record.setAmount(new BigDecimal(record.getCount()).multiply(new BigDecimal(record.getCost())).toString()); - record.setAverageCost(new BigDecimal(record.getAmount()).divide(new BigDecimal(record.getCount())).toString()); + record.setAverageCost(new BigDecimal(record.getAmount()).divide(new BigDecimal(record.getCount()),2, RoundingMode.HALF_UP).toString()); } ResultBean initialization1=new ResultBean<>(); if(StringUtils.isBlank(record.getGoodsSpuSid())){ @@ -320,7 +353,7 @@ public class SmsSalesBillService extends MybatisBaseService initialization3 = baseBrandInfoFeign.initialization(initialization1.getData().getBrandSid()); record.setBrandSid(initialization3.getData().getSid()); diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/GoodsSpuQuery.java b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/GoodsSpuQuery.java index d781995..4487f89 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/GoodsSpuQuery.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/basegoodsspu/GoodsSpuQuery.java @@ -41,4 +41,5 @@ public class GoodsSpuQuery implements Query { private int index; private String brandSid; private String typeSid; + private String state; } diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java index 7b614b1..e942a2e 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseInventoryCountReportQuery.java @@ -19,13 +19,17 @@ public class WarehouseInventoryCountReportQuery implements Query { private String endDate; private String orgPath; private String customerName; + private String customerSid; private String customerCode; private String warehouseSid; private String goodsSid; + private List goodsSids; private String supplierSid; // private String private String brandSid; private String typeSid; private List typeSids; private List brandSids; + private String state; + private String count; } diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java index 8811e1e..1d0554c 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinventoryrecord/WarehouseOutReportVo.java @@ -1,5 +1,6 @@ package com.yxt.oms.feign.warehouse.warehouseinventoryrecord; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /**