达沃特修改

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

@@ -388,6 +388,10 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private String fleetName;
 
+	//车队简称
+	@TableField(exist = false)
+	private String fleetShortName;
+
 	//司机名称
 	@TableField(exist = false)
 	private String driverName;

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

@@ -631,14 +631,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		order.setFreight(freight);
 		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());
 			}
+			order.setAddressDetail(addressDetail.deleteCharAt(addressDetail.lastIndexOf("\n")).toString());
 		}else {
 			order.setAddressDetail("");
 		}
+
 		if (unloadingPlace.length() > 0){//卸货地址
 			order.setUnloadingPlace(unloadingPlace.deleteCharAt(unloadingPlace.lastIndexOf("\n")).toString());
 		}else {
@@ -762,6 +761,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				R<CorpsDesc> fleetMessage = corpsDescClient.getCorpMessage(record.getFleetId());
 				if (fleetMessage.isSuccess() && fleetMessage.getData() != null) {
 					record.setFleetName(fleetMessage.getData().getCname());
+					record.setFleetShortName(fleetMessage.getData().getShortName());
 				}
 			}
 			//司机
@@ -1349,38 +1349,38 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			sort = 1;
 
 			//卸货
-			for (OrderAddress address : order.getUnloadedAddressList()){
-				if (ObjectUtil.isEmpty(address.getId())) {
-					address.setOrderId(order.getId());
-					address.setTenantId(AuthUtil.getTenantId());
-					address.setCreateUser(AuthUtil.getUserId());
-					address.setBillType(2);
-					address.setCreateTime(new Date());
-					address.setSort(sort);
-					orderAddressMapper.insert(address);
+			for (OrderAddress unloadedAddress : order.getUnloadedAddressList()){
+				if (ObjectUtil.isEmpty(unloadedAddress.getId())) {
+					unloadedAddress.setOrderId(order.getId());
+					unloadedAddress.setTenantId(AuthUtil.getTenantId());
+					unloadedAddress.setCreateUser(AuthUtil.getUserId());
+					unloadedAddress.setBillType(2);
+					unloadedAddress.setCreateTime(new Date());
+					unloadedAddress.setSort(sort);
+					orderAddressMapper.insert(unloadedAddress);
 				} else {
-					address.setUpdateUser(AuthUtil.getUserId());
-					address.setUpdateTime(new Date());
-					address.setSort(sort);
-					orderAddressMapper.updateById(address);
+					unloadedAddress.setUpdateUser(AuthUtil.getUserId());
+					unloadedAddress.setUpdateTime(new Date());
+					unloadedAddress.setSort(sort);
+					orderAddressMapper.updateById(unloadedAddress);
 				}
 				sort++;
-				if (ObjectUtil.isNotEmpty(address.getCorpId()) || StringUtil.isNotBlank(address.getContacts())
-					|| StringUtil.isNotBlank(address.getTel()) || StringUtil.isNotBlank(address.getAddress())) {
-					if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
-						unloadingPlace.append(i).append(".").append(address.getCorpName()).append("(");
+				if (ObjectUtil.isNotEmpty(unloadedAddress.getCorpId()) || StringUtil.isNotBlank(unloadedAddress.getContacts())
+					|| StringUtil.isNotBlank(unloadedAddress.getTel()) || StringUtil.isNotBlank(unloadedAddress.getAddress())) {
+					if (ObjectUtil.isNotEmpty(unloadedAddress.getCorpId()) && StringUtil.isNotBlank(unloadedAddress.getCorpName())) {
+						unloadingPlace.append(i).append(".").append(unloadedAddress.getCorpName()).append("(");
 					} else {
 						unloadingPlace.append(i).append(".").append("(");
 					}
 
-					if (StringUtil.isNotBlank(address.getContacts())) {
-						unloadingPlace.append(address.getContacts());
+					if (StringUtil.isNotBlank(unloadedAddress.getContacts())) {
+						unloadingPlace.append(unloadedAddress.getContacts());
 					}
-					if (StringUtil.isNotBlank(address.getTel())) {
-						unloadingPlace.append(" ").append(address.getTel());
+					if (StringUtil.isNotBlank(unloadedAddress.getTel())) {
+						unloadingPlace.append(" ").append(unloadedAddress.getTel());
 					}
-					if (StringUtil.isNotBlank(address.getAddress())) {
-						unloadingPlace.append(") ").append(address.getAddress()).append("\n");
+					if (StringUtil.isNotBlank(unloadedAddress.getAddress())) {
+						unloadingPlace.append(") ").append(unloadedAddress.getAddress()).append("\n");
 					} else {
 						unloadingPlace.append(") ").append("\n");
 					}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -662,9 +662,9 @@ public class ExportOrderController extends BladeController {
 	/**
 	 * 统计分析 销售明细导出 重新提交excel
 	 */
-	@GetMapping("/salesDetailsExport")
+	@GetMapping("/selBusinessExport")
 	@ApiOperation(value = "销售明细导出", notes = "销售明细导出")
-	public void salesDetailsExport(SalesDetailsVo detailsVo, Query query, HttpServletResponse response){
+	public void selBusinessExport(SalesDetailsVo detailsVo, Query query, HttpServletResponse response){
 		detailsVo.setTenantId(SecureUtil.getTenantId());
 		List<SalesDetailsExcel> list = orderService.salesDetailsExport(detailsVo);
 		ExcelUtil.export(response, "销售明细", "销售明细", list, SalesDetailsExcel.class);

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

@@ -730,24 +730,38 @@ ORDER BY
     <select id="selPackingFee" resultType="org.springblade.purchase.sales.vo.SalesDetailsVo">
         SELECT
         BO.id AS orderId,
-        BO.order_no as orderNo,
+        BO.order_no AS orderNo,
         BGD.Brand AS brand,
         BO.create_time AS careteTime,
-        BOI.order_quantity AS quantity,
-        (CASE WHEN
-        BO.package_remarks != '有包装'
-        THEN
-        0.00
-        ELSE
-        BOF.Amount
-        END) AS feesAmount
-        FROM business_order_items AS BOI
-        LEFT JOIN business_order BO ON BOI.pid = BO.id
+        BOI.quantity AS quantity,
+        BOF.amount AS feesAmount
+        FROM
+            business_order BO
+        LEFT JOIN (
+            SELECT
+            pid,
+            item_id,
+            IFNULL( SUM( order_quantity ), 0 ) AS quantity
+            FROM
+            business_order_items
+            GROUP BY
+            pid
+        ) BOI ON BOI.pid = BO.id
         LEFT JOIN basic_goods_desc BGD ON BOI.Item_id = BGD.id
-        LEFT JOIN business_order_fees BOF ON BOF.pid = BO.id
+        LEFT JOIN (
+            SELECT
+            pid,
+            IFNULL( SUM( bf.amount ), 0 ) AS amount
+            FROM
+            business_order_fees bf
+            LEFT JOIN basic_fees_desc bfd ON bfd.id = bf.item_id
+            WHERE bfd.cname = '包装费'
+            GROUP BY
+            pid
+        ) BOF ON BOF.pid = BO.id
         LEFT JOIN basic_corps_desc BCD ON BO.Corp_id = BCD.id
         <where>
-            BOI.is_deleted = 0
+            BO.is_deleted = 0
             AND BO.bill_type = 'XS'
             AND BO.tenant_id = #{detailsVo.tenantId}
             <if test="detailsVo.brand != null and detailsVo.brand != ''">
@@ -769,21 +783,35 @@ ORDER BY
         BO.order_no as orderNo,
         BGD.Brand AS brand,
         BO.create_time AS careteTime,
-        BOI.order_quantity AS quantity,
-        (CASE WHEN
-        BO.package_remarks != '有包装'
-        THEN
-        0.00
-        ELSE
-        BOF.Amount
-        END) AS feesAmount
-        FROM business_order_items AS BOI
-        LEFT JOIN business_order BO ON BOI.pid = BO.id
+        BOI.quantity AS quantity,
+        BOF.amount AS feesAmount
+        FROM
+            business_order BO
+        LEFT JOIN (
+            SELECT
+            pid,
+            item_id,
+            IFNULL( SUM( order_quantity ), 0 ) AS quantity
+            FROM
+            business_order_items
+            GROUP BY
+            pid
+        ) BOI ON BOI.pid = BO.id
         LEFT JOIN basic_goods_desc BGD ON BOI.Item_id = BGD.id
-        LEFT JOIN business_order_fees BOF ON BOF.pid = BO.id
+        LEFT JOIN (
+            SELECT
+            pid,
+            IFNULL( SUM( bf.amount ), 0 ) AS amount
+            FROM
+            business_order_fees bf
+            LEFT JOIN basic_fees_desc bfd ON bfd.id = bf.item_id
+            WHERE bfd.cname = '包装费'
+            GROUP BY
+            pid
+        ) BOF ON BOF.pid = BO.id
         LEFT JOIN basic_corps_desc BCD ON BO.Corp_id = BCD.id
         <where>
-            BOI.is_deleted = 0
+            BO.is_deleted = 0
             AND BO.bill_type = 'XS'
             AND BO.tenant_id = #{detailsVo.tenantId}
             <if test="detailsVo.brand != null and detailsVo.brand != ''">