20230412 17:46

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/TradingBoxItemRentExcelEnter.java

@@ -54,6 +54,16 @@ public class TradingBoxItemRentExcelEnter implements Serializable {
 	@ExcelProperty(value = "租金（必填）")
 	private BigDecimal price;
 	/**
+	 * 超期金额
+	 */
+	@ExcelProperty(value = "超期金额")
+	private BigDecimal overdueAmount;
+	/**
+	 * 天数
+	 */
+	@ExcelProperty(value = "天数")
+	private BigDecimal overdueDays;
+	/**
 	 * 币别
 	 */
 	@ExcelProperty(value = "币别")
@@ -66,12 +76,12 @@ public class TradingBoxItemRentExcelEnter implements Serializable {
 	/**
 	 * 最新地点
 	 */
-	@ExcelProperty(value = "最新地点")
+	@ExcelProperty(value = "最新地点（必填）")
 	private String address;
 	/**
 	 * 最新日期
 	 */
-	@ExcelProperty(value = "最新日期")
+	@ExcelProperty(value = "最新日期（必填）")
 	private Date newDate;
 	/**
 	 * 容积

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsAttn.java

@@ -138,8 +138,14 @@ public class CorpsAttn implements Serializable {
 	@ApiModelProperty(value = "是否已删除")
 	private Integer isDeleted;
 
+	/**
+	 * 性别
+	 */
 	private String sex;
 
+	/**
+	 * 邮箱
+	 */
 	private String email;
 
 	@TableField(exist = false)

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -429,6 +429,10 @@ public class OrderItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "币别")
 	private String currency;
+
+	/**
+	 * 采购成本
+	 */
 	@ApiModelProperty(value = "采购成本")
 	private BigDecimal purchaseCost;
 	@ApiModelProperty(value = "配件成本")

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/service/impl/AnnualBudgetItemServiceImpl.java

@@ -77,6 +77,8 @@ public class AnnualBudgetItemServiceImpl extends ServiceImpl<AnnualBudgetItemMap
 				e.setLuxxanDeliverQuantity(BigDecimal.ZERO);
 				e.setDrivemasterOrdQuantity(BigDecimal.ZERO);
 				e.setDrivemasterDeliverQuantity(BigDecimal.ZERO);
+				e.setOrderSummary(BigDecimal.ZERO);
+				e.setDeliverySummary(BigDecimal.ZERO);
 
 				//根据年 月 客户 查询订单数量和发货数量
 				List<OrderStatisticsVo> orderList = orderDescClient.getByOrderQuantity(e.getYear(), e.getMonth(), e.getCorpId());
@@ -104,18 +106,8 @@ public class AnnualBudgetItemServiceImpl extends ServiceImpl<AnnualBudgetItemMap
 					//发货汇总
 					e.setDeliverySummary(e.getKeterDeliverQuantity().add(e.getXcentwayDeliverQuantity()).add(e.getLuxxanDeliverQuantity()).add(e.getDrivemasterDeliverQuantity()));
 
-				}else {
-					e.setKeterOrdQuantity(BigDecimal.ZERO);
-					e.setKeterDeliverQuantity(BigDecimal.ZERO);
-					e.setXcentwayOrdQuantity(BigDecimal.ZERO);
-					e.setXcentwayDeliverQuantity(BigDecimal.ZERO);
-					e.setLuxxanOrdQuantity(BigDecimal.ZERO);
-					e.setLuxxanDeliverQuantity(BigDecimal.ZERO);
-					e.setDrivemasterOrdQuantity(BigDecimal.ZERO);
-					e.setDrivemasterDeliverQuantity(BigDecimal.ZERO);
-					e.setOrderSummary(BigDecimal.ZERO);
-					e.setDeliverySummary(BigDecimal.ZERO);
 				}
+
 				if (ObjectUtil.isEmpty(e.getQuantitySummary())){
 					e.setQuantitySummary(BigDecimal.ZERO);
 				}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/ocean/service/impl/ShippingBillServiceImpl.java

@@ -259,7 +259,7 @@ public class ShippingBillServiceImpl extends ServiceImpl<ShippingBillMapper, Shi
 			//单据信息
 			if (shippingBill.getShippingBillDetails().getId() == null) {
 				//获取系统编号
-				R billNo = serialClient.getBillNo(shippingBill.getShippingBillDetails().getBillType(), shippingBill.getShippingBillDetails().getTradeType(), shippingBill.getShippingBillDetails().getBillType());
+				R billNo = serialClient.getBillNo(shippingBill.getBillType(), shippingBill.getTradeType(), shippingBill.getBillType());
 				if (!billNo.isSuccess()) {
 					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 					throw new Error("生成系统编号失败");

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsAttnController.java

@@ -1,6 +1,7 @@
 package org.springblade.client.corps.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -174,4 +175,14 @@ public class CorpsAttnController extends BladeController {
 		return R.data(null);
 	}
 
+	/**
+	 * 客户联系人
+	 */
+	@GetMapping("/corpByAttnList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入corpsAttn")
+	public R<List<CorpsAttn>> corpByAttnList(@RequestParam("corpId") String corpId) {
+		return R.data(corpsAttnService.list(new QueryWrapper<CorpsAttn>().eq("pid", corpId).eq("is_deleted", 0).eq("tenant_id", AuthUtil.getTenantId()).eq("status", 0)));
+	}
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -67,6 +67,6 @@
                 and BB.release_time  <= #{biding.releaseEndTime}
             </if>
         </where>
-        ORDER BY BB.release_time desc
+        ORDER BY BB.create_dept desc
     </select>
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -491,7 +491,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				} else {
 					amount = list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 				}
-				//毛利额 = 销售金额-采购金额-预计海运费-本次使用返利+应收费用（除包装费）- 本次产生返利
+				//毛利额=销售金额-采购金额-产生返利-其他费用（不包括包装）-预估运费+采购返利
 				//BigDecimal grossProfit = amount.subtract(reduce.add(order.getPredictOceanFreight())).subtract(order.getThisUsedProfit() == null ? BigDecimal.ZERO : order.getThisUsedProfit());
 				BigDecimal grossProfit = amount.subtract(reduce).subtract(order.getPredictOceanFreight());
 				//BigDecimal grossProfit = amount.subtract(reduce.add(order.getPredictOceanFreight())).subtract(order.getCreateProfit() == null ? BigDecimal.ZERO : order.getCreateProfit());
@@ -500,7 +500,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				BigDecimal cntrVolumn = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getCntrVolumn().multiply(y.getOrderQuantity())), BigDecimal::add);
 				//总体积求和
 				BigDecimal cartonWeight = list.stream().reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getCartonWeight().multiply(y.getOrderQuantity())), BigDecimal::add);
-				// 毛利额添加应收费用（除包装费）
+				// 毛利额减其他费用（除包装费）
 				Long feeId = 0L;
 				R<FeesDesc> fees = feesDescClient.getFeesByName("包装费");
 				if (fees.isSuccess() && ObjectUtil.isNotEmpty(fees.getData())) {
@@ -524,7 +524,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderMessage.setCreateProfit(order.getCreateProfit());
 				// 毛利额
 				orderMessage.setGrossProfit(grossProfit);
-				// 毛利率
+				// 毛利率=毛利额/销售价
 				orderMessage.setGrossProfitRate(grossProfitRate);
 				//总重量
 				orderMessage.setCntrVolumn(cntrVolumn);