销售对账和明细

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/Order.java

@@ -285,6 +285,21 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "应付运费")
 	private BigDecimal freightPay;
 	/**
+	 * 计价单位
+	 */
+	@ApiModelProperty(value = "计价单位")
+	private Long pricingUnit;
+	/**
+	 * 装卸货
+	 */
+	@ApiModelProperty(value = "装卸货")
+	private String loadingUnloading;
+	/**
+	 * 单价
+	 */
+	@ApiModelProperty(value = "单价")
+	private BigDecimal unitPrice;
+	/**
 	 * 到场时间
 	 */
 	@ApiModelProperty(value = "到场时间")

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/OrderAddress.java

@@ -132,8 +132,8 @@ public class OrderAddress implements Serializable {
 	 * 货运日期
 	 */
 	@ApiModelProperty(value = "货运日期")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date freightTime;
 
 	/**

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderAcctVO.java

@@ -21,6 +21,8 @@ public class OrderAcctVO {
 
 	private String shippingMode;
 
+	private String corpId;
+
 	private String corpName;
 
 	private String corpShortName;
@@ -81,12 +83,14 @@ public class OrderAcctVO {
 
 	private BigDecimal landAmountC;
 
+	//应付杂费
 	private BigDecimal extraAmountC;
 
 	private String extraAmountItemC;
 
 	private BigDecimal landAmountD;
 
+	//应收杂费
 	private BigDecimal extraAmountD;
 
 	private String extraAmountItemD;

blade-service/blade-client/src/main/java/org/springblade/client/land/controller/LandVehicleController.java

@@ -160,6 +160,34 @@ public class LandVehicleController extends BladeController {
 	}
 
 	/**
+	 * 派车根据车号检索
+	 */
+	@GetMapping("/driver-list")
+	@ApiOperation(value = "车辆", notes = "传入landVehicle")
+	public R<List<LandVehicle>> plateNoVehicleList(String plateNo) {
+		LandVehicle landVehicle = new LandVehicle();
+		List<LandVehicle> vehicleList = null;
+
+		LambdaQueryWrapper<LandVehicle> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(LandVehicle::getPlateNo, plateNo);
+		lambdaQueryWrapper.eq(LandVehicle::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.eq(LandVehicle::getIsDeleted, 0);
+
+		vehicleList = landVehicleService.list(lambdaQueryWrapper);
+		vehicleList.forEach(vehicle -> {
+			if (ObjectUtil.isNotEmpty(vehicle.getDriverId())) {
+				LandDriver driver = landDriverService.getById(vehicle.getDriverId());
+				if (driver != null) {
+					vehicle.setDriverName(driver.getName());
+					vehicle.setTel(driver.getTel());
+				}
+			}
+		});
+
+		return R.data(vehicleList);
+	}
+
+	/**
 	 * 自定义分页 陆运车辆表
 	 */
 	@GetMapping("/page")

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -32,6 +32,7 @@
             t3.short_name as corpShortName,
             t1.salesman,
             t5.name as salesmanName,
+            t1.shipping_mode as shippingMode,
             t1.salesman_dept as salesmanDept,
             t1.create_user as createUser,
             t1.dispatcher,
@@ -110,8 +111,10 @@
             and t1.is_deleted = 0
             and t2.kind = '2'
             <if test="acct.corpName != null and acct.corpName != ''">and t3.cname like concat('%', #{acct.corpName}, '%')</if>
+            <if test="acct.corpId != null and acct.corpId != ''">and t1.corp_id like concat('%', #{acct.corpId}, '%')</if>
             <if test="acct.salesmanName != null and acct.salesmanName != ''">and t5.name like concat('%', #{acct.salesmanName}, '%')</if>
             <if test="acct.corpShortName != null and acct.corpShortName != ''">and t3.short_name like concat('%', #{acct.corpShortName}, '%')</if>
+            <if test="acct.station != null and acct.station != '' and acct.shippingMode != '散货'">and t1.station like concat('%', #{acct.station}, '%')</if>
             <if test="acct.fleetId != null and acct.shippingMode != '散货'">and t2.fleet_id = #{acct.fleetId}</if>
             <if test="acct.fleetId != null and acct.shippingMode == '散货'">and t1.fleet_id = #{acct.fleetId}</if>
             <if test="acct.fleetShortName != null and acct.fleetShortName != ''">and t4.short_name like concat('%', #{acct.fleetShortName}, '%')</if>
@@ -120,6 +123,8 @@
             <if test="acct.billNo != null and acct.billNo != ''">and t1.bill_no like concat('%', #{acct.billNo}, '%')</if>
             <if test="acct.plateNo != null and acct.plateNo != '' and acct.shippingMode != '散货'">and t2.plate_no like concat('%', #{acct.plateNo}, '%')</if>
             <if test="acct.plateNo != null and acct.plateNo != '' and acct.shippingMode == '散货'">and t1.plate_no like concat('%', #{acct.plateNo}, '%')</if>
+            <if test="acct.dispatchNumber != null and acct.dispatchNumber != '' and acct.shippingMode == '散货'">and t1.dispatch_number like concat('%', #{acct.dispatchNumber}, '%')</if>
+            <if test="acct.contractNo != null and acct.contractNo != '' and acct.shippingMode == '散货'">and t1.contract_no like concat('%', #{acct.contractNo}, '%')</if>
             <if test="acct.ctnDetail != null and acct.ctnDetail != '' and acct.shippingMode != '散货'">and t2.ctn_type like concat('%', #{acct.ctnDetail}, '%')</if>
             <if test="acct.beginArrivalTime != null and acct.beginArrivalTime != '' and acct.shippingMode != '散货'">and t2.arrival_time &gt;= #{acct.beginArrivalTime}</if>
             <if test="acct.endArrivalTime != null and acct.endArrivalTime != '' and acct.shippingMode != '散货'">and t2.arrival_time &lt;= #{acct.endArrivalTime}</if>

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

@@ -608,9 +608,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(OrderItem::getOrderId, order.getId())
 				.eq(OrderItem::getKind, 2)
 				.eq(OrderItem::getShippingMode, "散货");
-			OrderItem orderItem = orderItemMapper.selectOne(queryWrapper);
-			OrderItem item = new OrderItem();
-			if (ObjectUtil.isEmpty(orderItem)){
+			OrderItem item = orderItemMapper.selectOne(queryWrapper);
+			if (ObjectUtil.isEmpty(item)){
 				item.setOrderId(order.getId());
 				item.setShippingMode("散货");
 				item.setKind(2);
@@ -1214,6 +1213,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			LambdaQueryWrapper<OrderFee> orderFeeLambda = new LambdaQueryWrapper<>();
 			orderFeeLambda.eq(OrderFee::getIsDeleted, 0);
 
+			System.out.println("是散货======="+acct.getShippingMode());
+
 			if (!ObjectUtil.isEmpty(acct.getShippingMode()) && acct.getShippingMode().equals("散货")){
 				orderFeeLambda.eq(OrderFee::getOrderId, acct.getOrderId());
 			}else {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/dealer/DealerOrderController.java

@@ -56,9 +56,7 @@ import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.orderItemStat;
 import org.springblade.purchase.sales.excel.orderItemStatExcel;
 import org.springblade.purchase.sales.service.*;
-import org.springblade.purchase.sales.vo.OrderItemsVO;
-import org.springblade.purchase.sales.vo.OrderStatisticAnalysisVO;
-import org.springblade.purchase.sales.vo.OrderVO;
+import org.springblade.purchase.sales.vo.*;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -484,5 +482,4 @@ public class DealerOrderController extends BladeController {
 		ExcelUtil.export(response, "销售统计表", "销售统计表", list, orderItemStatExcel.class);
 	}
 
-
 }