|
|
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
+import com.trade.purchase.excel.PurchaseOrderExcel;
|
|
|
import com.trade.purchase.order.dto.OrderSubmitDto;
|
|
|
import com.trade.purchase.order.entity.Order;
|
|
|
import com.trade.purchase.order.entity.OrderFees;
|
|
|
@@ -42,7 +43,9 @@ import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
import org.springblade.system.user.entity.User;
|
|
|
import org.springblade.system.user.feign.IUserClient;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springblade.core.excel.util.ExcelUtil;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
import javax.validation.Valid;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
@@ -222,6 +225,7 @@ public class PurchaseOrderController extends BladeController {
|
|
|
queryWrapper.orderByDesc("create_time");
|
|
|
Page<Order> page=new Page<>(current,size);
|
|
|
IPage<Order> pages = orderService.page(page,queryWrapper);
|
|
|
+ List<Order> orderList = orderService.list(queryWrapper);
|
|
|
List<Order> records = pages.getRecords();
|
|
|
if(CollectionUtils.isNotEmpty(records))
|
|
|
{
|
|
|
@@ -310,6 +314,202 @@ public class PurchaseOrderController extends BladeController {
|
|
|
return R.data(pages);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 销售或采购订单表导出
|
|
|
+ */
|
|
|
+ @GetMapping("/selOrderExport")
|
|
|
+ @ApiOperationSupport(order = 2)
|
|
|
+ @ApiOperation(value = "采购订单表列表导出", notes = "传入order")
|
|
|
+ public void selOrderExport( @RequestParam(name = "current", defaultValue = "1") Integer current,
|
|
|
+ @RequestParam(name = "size", defaultValue = "10") Integer size,
|
|
|
+ @RequestParam(value = "billNo",required = false) String billNo,//提单号
|
|
|
+ @RequestParam(value = "orderNo",required = false) String orderNo,//合同号
|
|
|
+ @RequestParam(value = "tradeType",required = false) String tradeType,//贸易类型
|
|
|
+ @RequestParam(value = "strCorpName",required = false) String strCorpName,//供应商名称
|
|
|
+ @RequestParam(value = "corpId",required = false) String corpId,//供应商id
|
|
|
+ @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
|
|
|
+ @RequestParam(value = "salesName",required = false) String salesName,//业务员
|
|
|
+
|
|
|
+ @RequestParam(value = "banksAccountName",required = false) String banksAccountName,//公司户头
|
|
|
+ @RequestParam(value = "packageRemarks",required = false) String packageRemarks,//包装要求
|
|
|
+ @RequestParam(value = "createUser",required = false) Long createUser,//制单人
|
|
|
+ @RequestParam(value = "paymentType",required = false) String paymentType,//付款方式
|
|
|
+ @RequestParam(value = "createStartTime",required = false) String createStartTime,//制单日期
|
|
|
+ @RequestParam(value = "createEndTime",required = false) String createEndTime,//制单日期
|
|
|
+
|
|
|
+
|
|
|
+ @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间 busines_date
|
|
|
+ @RequestParam(value = "businesEndDate",required = false) String businesEndDate,//订单结束时间
|
|
|
+ @RequestParam(value = "accountsCollectionStartDate",required = false) String accountsCollectionStartDate,//应收(付)款开始时间 accounts_collection_date
|
|
|
+ @RequestParam(value = "accountsCollectionEndDate",required = false) String accountsCollectionEndDate,//应收(付)款结束时间
|
|
|
+
|
|
|
+ @RequestParam(value = "dateOfStartArrival",required = false) String dateOfStartArrival,//实际到港开始日期 date_of_arrival
|
|
|
+ @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//实际到港结束时间,
|
|
|
+
|
|
|
+ @RequestParam(value = "requiredDeliveryStartDate",required = false) String requiredDeliveryStartDate,//要求发货开始日期 required_delivery_date
|
|
|
+ @RequestParam(value = "requiredDeliveryEndDate",required = false) String requiredDeliveryEndDate,//要求发货结束时间
|
|
|
+
|
|
|
+ @RequestParam(value = "requiredArrivalStartDate",required = false) String requiredArrivalStartDate,//要求到货开始日期 required_arrival_date
|
|
|
+ @RequestParam(value = "requiredArrivalEndDate",required = false) String requiredArrivalEndDate,//要求到货结束日期
|
|
|
+
|
|
|
+ @RequestParam(value = "creditStartDate",required = false) String creditStartDate,//信用证到期日-开始日期 credit_date
|
|
|
+ @RequestParam(value = "creditEndDate",required = false) String creditEndDate,//信用证到期日-结束时间
|
|
|
+ @RequestParam(value = "gathering",required = false) Integer gathering,//是否付款 0 已付款 1 未付款
|
|
|
+ Order order,HttpServletResponse response
|
|
|
+ )
|
|
|
+ {
|
|
|
+
|
|
|
+ QueryWrapper<Order> queryWrapper =new QueryWrapper<>();
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(tradeType), "trade_type",tradeType);
|
|
|
+
|
|
|
+ //供应商
|
|
|
+ if(StringUtils.isNotBlank(strCorpName))
|
|
|
+ {
|
|
|
+ List<CorpsDesc> corpsDescs = corpsDescClient.listCorpByName(strCorpName);
|
|
|
+ if(CollectionUtils.isNotEmpty(corpsDescs))
|
|
|
+ {
|
|
|
+ List<Long> corpIds = corpsDescs.stream().map(CorpsDesc::getId).collect(Collectors.toList());
|
|
|
+ queryWrapper.in("corp_id",corpIds);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //采购商
|
|
|
+ if(StringUtils.isNotBlank(strPurchaserName))
|
|
|
+ {
|
|
|
+ List<CorpsDesc> corpsDescs = corpsDescClient.listCorpByName(strPurchaserName);
|
|
|
+ if(CollectionUtils.isNotEmpty(corpsDescs))
|
|
|
+ {
|
|
|
+ List<Long> purchaserIds = corpsDescs.stream().map(CorpsDesc::getId).collect(Collectors.toList());
|
|
|
+ queryWrapper.in("purchaser_id",purchaserIds);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(banksAccountName),"banks_account_name",banksAccountName);
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(packageRemarks),"package_remarks",packageRemarks);
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(salesName),"sales_name",salesName);
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(orderNo),"order_no",orderNo);
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(paymentType),"payment_type",paymentType);
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(corpId),"corp_id",corpId);
|
|
|
+ queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
|
|
|
+ queryWrapper.eq(createUser!=null,"create_user",createUser);
|
|
|
+ queryWrapper.eq("bill_type",OrderTypeEnum.PURCHASE.getType());
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(order.getTradeType()), "trade_type",order.getTradeType());
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(billNo),"bill_no", billNo);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),"create_time",createStartTime,createEndTime);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(businesStartDate)&&StringUtils.isNotBlank(businesEndDate),"busines_date",businesStartDate,businesEndDate);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(accountsCollectionStartDate)&&StringUtils.isNotBlank(accountsCollectionEndDate),"accounts_collection_date",accountsCollectionStartDate,accountsCollectionEndDate);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(dateOfStartArrival)&&StringUtils.isNotBlank(dateOfEndArrival),"date_of_arrival",dateOfStartArrival,dateOfEndArrival);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(requiredDeliveryStartDate)&&StringUtils.isNotBlank(requiredDeliveryEndDate),"required_delivery_date",requiredDeliveryStartDate,requiredDeliveryEndDate);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(requiredArrivalStartDate)&&StringUtils.isNotBlank(requiredArrivalEndDate),"required_arrival_date",requiredArrivalStartDate,requiredArrivalEndDate);
|
|
|
+ queryWrapper.between(StringUtils.isNotBlank(creditStartDate)&&StringUtils.isNotBlank(creditEndDate),"credit_date",creditStartDate,creditEndDate);
|
|
|
+ if (gathering != null && gathering == 0){
|
|
|
+ queryWrapper.eq("balance_amount",BigDecimal.ZERO);
|
|
|
+ }else if (gathering != null && gathering == 1){
|
|
|
+ queryWrapper.gt("balance_amount",BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ queryWrapper.orderByDesc("create_time");
|
|
|
+ List<Order> records = orderService.list(queryWrapper);
|
|
|
+ List<PurchaseOrderExcel> list = new ArrayList<>();
|
|
|
+ if(CollectionUtils.isNotEmpty(records))
|
|
|
+ {
|
|
|
+ records.forEach(e->{
|
|
|
+ if(e.getBelongToCorpId()!=null)
|
|
|
+ {
|
|
|
+ R<CorpsDesc> corpMessage3 = corpsDescClient.getCorpMessage(e.getBelongToCorpId());
|
|
|
+ if(corpMessage3.getData()!=null)
|
|
|
+ {
|
|
|
+ e.setBelongToCorpName(corpMessage3.getData().getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //制单人名字
|
|
|
+ if(e.getCreateUser()!=null)
|
|
|
+ {
|
|
|
+ R<User> userR = userClient.userInfoById(e.getCreateUser());
|
|
|
+ if(userR.isSuccess())
|
|
|
+ {
|
|
|
+ e.setCreateUserName(userR.getData().getRealName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //修改制单人名字
|
|
|
+ if(e.getUpdateUser()!=null)
|
|
|
+ {
|
|
|
+ R<User> userR = userClient.userInfoById(e.getUpdateUser());
|
|
|
+ if(userR.isSuccess())
|
|
|
+ {
|
|
|
+ e.setUpdateUserName(userR.getData().getRealName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //获取供应商中文名
|
|
|
+ if (e.getCorpId() != null){
|
|
|
+ R<CorpsDesc> corpMessage1 = corpsDescClient.getCorpMessage(e.getCorpId());
|
|
|
+ if(corpMessage1.getData()!=null)
|
|
|
+ {
|
|
|
+ e.setStrCorpName(corpMessage1.getData().getCname());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ //获取采购商中文名
|
|
|
+ if (e.getPurchaserId() != null){
|
|
|
+ R<CorpsDesc> corpMessage2 = corpsDescClient.getCorpMessage(e.getPurchaserId());
|
|
|
+ if(corpMessage2.getData()!=null)
|
|
|
+ {
|
|
|
+ e.setStrPurchaserName(corpMessage2.getData().getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ List<OrderItems> orderItemsList = orderItemsService.list(new LambdaQueryWrapper<OrderItems>().eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getPid, e.getId()));
|
|
|
+ if(CollectionUtils.isNotEmpty(orderItemsList))
|
|
|
+ {
|
|
|
+ //子项总件数
|
|
|
+ BigDecimal orderQuantity = orderItemsList.stream().map(OrderItems::getOrderQuantity)
|
|
|
+ .filter(Objects::nonNull)
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ e.setOrderQuantity(orderQuantity);
|
|
|
+
|
|
|
+ //子项总收货数
|
|
|
+ BigDecimal actualQuantity = orderItemsList.stream().map(OrderItems::getActualQuantity)
|
|
|
+ .filter(Objects::nonNull)
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ e.setActualQuantity(actualQuantity);
|
|
|
+
|
|
|
+ //已收重量
|
|
|
+ BigDecimal actualWeight = orderItemsList.stream().map(OrderItems::getActualWeight)
|
|
|
+ .filter(Objects::nonNull)
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ e.setActualWeight(actualWeight);
|
|
|
+
|
|
|
+ orderItemsList.forEach(item -> {
|
|
|
+ //商品信息
|
|
|
+ R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
|
|
|
+ if(goodsDesc.isSuccess() && ObjectUtil.isNotEmpty(goodsDesc.getData()))
|
|
|
+ {
|
|
|
+ item.setGoodsName(goodsDesc.getData().getCname());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ e.setItemsList(orderItemsList);
|
|
|
+ PurchaseOrderExcel purchaseOrderExcel = new PurchaseOrderExcel();
|
|
|
+ purchaseOrderExcel.setOrderNo(e.getOrderNo());//采购单号
|
|
|
+ purchaseOrderExcel.setStrCorpName(e.getStrCorpName());//供应商
|
|
|
+ purchaseOrderExcel.setOrderQuantity(e.getOrderQuantity());//订单数量
|
|
|
+ purchaseOrderExcel.setActualQuantity(e.getActualQuantity());//收货数量
|
|
|
+ purchaseOrderExcel.setOrderAmount(e.getOrderAmount());//采购金额
|
|
|
+ purchaseOrderExcel.setPackageRemarks(e.getPackageRemarks());//包装要求
|
|
|
+ purchaseOrderExcel.setBanksAccountName(e.getBanksAccountName());//公司户头
|
|
|
+ purchaseOrderExcel.setMorderNo(e.getMorderNo());//来源单号
|
|
|
+ purchaseOrderExcel.setCreateUserName(e.getCreateUserName());//制单人
|
|
|
+ purchaseOrderExcel.setDebitAmount(e.getDebitAmount());//应付金额
|
|
|
+ purchaseOrderExcel.setSettlmentAmount(e.getSettlmentAmount());//已付金额
|
|
|
+
|
|
|
+ list.add(purchaseOrderExcel);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ ExcelUtil.export(response, "采购订单", "采购订单", list, PurchaseOrderExcel.class);
|
|
|
+ }
|
|
|
+
|
|
|
/* *//**
|
|
|
* 自定义分页 销售或采购订单表
|
|
|
*//*
|
lichao