散货司机权限

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/CorpsDescVO.java

@@ -63,4 +63,10 @@ public class CorpsDescVO extends CorpsDesc {
 	@ApiModelProperty(value = "客户类别中文")
 	private String corpsTypeName;
 
+	/**
+	 * 首字母
+	 */
+	@ApiModelProperty(value = "首字母")
+	private String initials;
+
 }

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

@@ -270,14 +270,14 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "车体积")
 	private String fleetVolum;
 	/**
-	 * 单车收费
+	 * 单车运费
 	 */
 	@ApiModelProperty(value = "单车收费")
 	private BigDecimal freightCollect;
 	/**
-	 * 单车运费
+	 * 应付运费
 	 */
-	@ApiModelProperty(value = "单车付费")
+	@ApiModelProperty(value = "应付运费")
 	private BigDecimal freightPay;
 	/**
 	 * 到场时间

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

@@ -102,11 +102,13 @@ public class OrderItem implements Serializable {
 	private BigDecimal landWeight;
 	/**
 	 * 陆运费(D)
+	 * 应收运费
 	 */
 	@ApiModelProperty(value = "陆运费(D)")
 	private BigDecimal landAmountD;
 	/**
 	 * 陆运费(C)
+	 * 应付运费
 	 */
 	@ApiModelProperty(value = "陆运费(C)")
 	private BigDecimal landAmountC;

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/DatasetVO.java

@@ -47,4 +47,9 @@ public class DatasetVO {
 
 	private String endCreateTime;
 
+	/**
+	 * 政策
+	 */
+	private String priceType;
+
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/SalesDetailsVo.java

@@ -104,4 +104,7 @@ public class SalesDetailsVo implements Serializable {
 
 	//采购金额
 	private BigDecimal orderAmount;
+
+	//政策
+	private String priceType;
 }

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

@@ -182,9 +182,9 @@ public class OrderIndexController extends BladeController {
 		// 运行中
 		if (mold == 2){
 			if (userRole.contains(LandConst.ROLE_CD)) {//车队
-				active = itemList.stream().filter(item -> item.getStatus() == 3 || item.getStatus() == 4).count();
+				active = itemList.stream().filter(item -> item.getStatus() == 3 || item.getStatus() == 4 || item.getStatus() == 6).count();
 			}else if (userRole.contains(LandConst.ROLE_SJ)) {//司机
-				active = itemList.stream().filter(item -> item.getStatus() == 4).count();
+				active = itemList.stream().filter(item -> item.getStatus() == 4 || item.getStatus() == 6).count();
 			}else {
 				active = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 5).count();
 			}

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

@@ -144,15 +144,16 @@
             <if test="acct.status == 2 and acct.shippingMode == '散货' and acct.userRoleControl != '车队' and acct.userRoleControl != '司机'">and t1.status not in (0, 1, 5)</if>
 
             <if test="acct.status == 1 and acct.shippingMode == '散货' and acct.userRoleControl == '车队'">and t1.status = 2</if>
-            <if test="acct.status == 2 and acct.shippingMode == '散货' and acct.userRoleControl == '车队'">and t1.status in (3, 4)</if>
+            <if test="acct.status == 2 and acct.shippingMode == '散货' and acct.userRoleControl == '车队'">and t1.status in (3, 4, 6)</if>
 
             <if test="acct.status == 1 and acct.shippingMode == '散货' and acct.userRoleControl == '司机'">and t1.status = 3</if>
-            <if test="acct.status == 2 and acct.shippingMode == '散货' and acct.userRoleControl == '司机'">and t1.status = 4</if>
+            <if test="acct.status == 2 and acct.shippingMode == '散货' and acct.userRoleControl == '司机'">and t1.status in (4, 6)</if>
 
             <if test="acct.status == 3 and acct.shippingMode == '散货'">and t1.status = 5</if>
         </where>
         group by t1.id, t2.id, t2.plate_no, t2.arrival_time
-        order by t2.arrival_time desc
+        <if test="acct.shippingMode != null and acct.shippingMode != '' and acct.shippingMode == '散货'">order by t1.arrival_time desc</if>
+        <if test="acct.shippingMode != null and acct.shippingMode != '' and acct.shippingMode != '散货'">order by t2.arrival_time desc</if>
     </select>
 
 </mapper>

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

@@ -488,11 +488,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		String userRole = AuthUtil.getUserRole();
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			//未派车2，未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,2,3,4,5);
+			orderQueryWrapper.in(Order::getStatus,2,3,4,5,6);
 		}
 		if (userRole.contains(LandConst.ROLE_SJ)){//司机
 			//未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,3,4,5);
+			orderQueryWrapper.in(Order::getStatus,3,4,5,6);
 		}
 
 		orderIdList = baseMapper.selectList(orderQueryWrapper);
@@ -603,8 +603,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				item.setDriverId(order.getDriverId());
 				item.setPlateNo(order.getPlateNo());
 				item.setTel(order.getDriverTel());
-				item.setLandAmountD(order.getFreightPay());
-				item.setLandAmountC(order.getFreightCollect());
+				item.setLandAmountD(order.getFreightCollect());
+				item.setLandAmountC(order.getFreightPay());
 				orderItemMapper.insert(item);
 			}else {
 				item.setTenantId(AuthUtil.getTenantId());
@@ -614,8 +614,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				item.setDriverId(order.getDriverId());
 				item.setPlateNo(order.getPlateNo());
 				item.setTel(order.getDriverTel());
-				item.setLandAmountD(order.getFreightPay());
-				item.setLandAmountC(order.getFreightCollect());
+				item.setLandAmountD(order.getFreightCollect());
+				item.setLandAmountC(order.getFreightPay());
 				orderItemMapper.updateById(item);
 			}
 		}
@@ -629,16 +629,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 
 		order.setFreight(freight);
-		if (addressDetail.length() > 0) {
+		if (addressDetail.length() > 0) {//货运地址
 			if(order.getShippingMode().equals("散货")){
 				order.setAddressDetail(addressDetail.deleteCharAt(addressDetail.lastIndexOf("\n")).toString());
 				order.setArrivalTime(order.getLoadingAddressList().get(0).getFreightTime());
 			} else {
 				order.setAddressDetail(addressDetail.deleteCharAt(addressDetail.lastIndexOf("\n")).toString());
 			}
+		}else {
+			order.setAddressDetail("");
 		}
-		if (unloadingPlace.length() > 0){
+		if (unloadingPlace.length() > 0){//卸货地址
 			order.setUnloadingPlace(unloadingPlace.deleteCharAt(unloadingPlace.lastIndexOf("\n")).toString());
+		}else {
+			order.setUnloadingPlace("");
 		}
 
 		baseMapper.updateById(order);
@@ -663,7 +667,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	public IPage<Order> selectBulkLoadList(Order order, Query query) {
-		System.out.println("jinlaile========");
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 		orderQueryWrapper.eq(Order::getShippingMode, "散货")
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -686,15 +689,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		// 获取角色 设置权限
 		String userRole = AuthUtil.getUserRole();
 		Long userId = AuthUtil.getUserId();
-		System.out.println("userRole================"+userRole);
-		System.out.println("userId================"+userId);
 		if (userRole.contains(LandConst.ROLE_CD)) {//车队
 			//未派车2，未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,2,3,4,5);
+			orderQueryWrapper.in(Order::getStatus,2,3,4,5,6);
 		}
 		if (userRole.contains(LandConst.ROLE_SJ)){//司机
 			//未受理3，未完工4，已关闭5
-			orderQueryWrapper.in(Order::getStatus,3,4,5);
+			orderQueryWrapper.in(Order::getStatus,3,4,5,6);
 		}
 
 		orderQueryWrapper.in(StringUtil.isNotBlank(order.getStatusIds()), Order::getStatus, Func.toIntList(order.getStatusIds()));

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/excel/DatasetExcel.java

@@ -61,4 +61,7 @@ public class DatasetExcel {
 	@ExcelProperty(value = "包装")
 	private String packageRemarks;
 
+	@ExcelProperty(value = "政策")
+	private String priceType;
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/excel/SalesCommissionExcel.java

@@ -52,4 +52,10 @@ public class SalesCommissionExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "数量")
 	private Long quantity;
+
+	/**
+	 * 政策
+	 */
+	@ExcelProperty(value = "政策")
+	private String priceType;
 }

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

@@ -471,7 +471,8 @@ WHERE
                t2.purchase_amount as purchaseAmount,
                t2.create_time     as createTime,
                t1.package_remarks as packageRemarks,
-               t1.tenant_id       as tenantId
+               t1.tenant_id       as tenantId,
+               t2.price_type      as priceType
         from business_order t1
                  left join business_order_items t2 on t1.id = t2.pid
                  left join basic_corps_desc t3 on t1.corp_id = t3.id

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

@@ -647,10 +647,12 @@ ORDER BY
             bo.saleman as salesName,
             bo.create_time as careteTime,
             bgd.size as specs,
-            boi.Actual_quantity as quantity
+            boi.Actual_quantity as quantity,
+            zboi.price_type as priceType
         FROM business_delivery bo
         LEFT JOIN business_delivery_items boi on boi.pid = bo.id
         LEFT JOIN basic_goods_desc bgd on bgd.id = boi.item_id
+        LEFT JOIN business_order_items zboi ON zboi.id = boi.src_id
         <where>
             bo.bill_type = 'FH'
             AND bo.is_deleted = 0
@@ -677,10 +679,12 @@ ORDER BY
         bo.saleman as salesName,
         bo.create_time as careteTime,
         bgd.size as specs,
-        boi.Actual_quantity as quantity
+        boi.Actual_quantity as quantity,
+        zboi.price_type as priceType
         FROM business_delivery bo
         LEFT JOIN business_delivery_items boi on boi.pid = bo.id
         LEFT JOIN basic_goods_desc bgd on bgd.id = boi.item_id
+        LEFT JOIN business_order_items zboi ON zboi.id = boi.src_id
         <where>
             bo.bill_type = 'FH'
             AND bo.is_deleted = 0