2022年10月12日18:12:50

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

@@ -965,4 +965,10 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "日期条款")
 	private String dateClause;
+
+	/**
+	 * 货物类型
+	 */
+	@ApiModelProperty(value = "货物类型")
+	private BigDecimal cargoType;
 }

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

@@ -17,11 +17,16 @@
 package org.springblade.purchase.sales.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -75,7 +80,7 @@ public class OrderCost implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人
 	*/
@@ -85,7 +90,7 @@ public class OrderCost implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 状态（0 正常 1停用）
 	*/
@@ -100,12 +105,24 @@ public class OrderCost implements Serializable {
 	* 1.陆运费 2.港杂费
 	*/
 		@ApiModelProperty(value = "1.陆运费 2.港杂费")
-		private Boolean feesType;
+		private Integer feesType;
 	/**
 	* 合计
 	*/
 		@ApiModelProperty(value = "合计")
 		private BigDecimal amount;
 
+	/**
+	 * 陆运以及港杂费明细
+	 */
+	@TableField(exist = false)
+	private List<OrderCostItem> orderCostItemList;
+
+	/**
+	 * 租户
+	 */
+	@ApiModelProperty(value = "租户")
+	private String tenantId;
+
 
 }

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

@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -115,7 +117,7 @@ public class OrderCostItem implements Serializable {
 	* 创建时间
 	*/
 		@ApiModelProperty(value = "创建时间")
-		private LocalDateTime createTime;
+		private Date createTime;
 	/**
 	* 修改人
 	*/
@@ -125,7 +127,7 @@ public class OrderCostItem implements Serializable {
 	* 修改时间
 	*/
 		@ApiModelProperty(value = "修改时间")
-		private LocalDateTime updateTime;
+		private Date updateTime;
 	/**
 	* 状态（0 正常 1停用）
 	*/
@@ -140,7 +142,13 @@ public class OrderCostItem implements Serializable {
 	* 1.陆运费 2.海运费 3.杂费
 	*/
 		@ApiModelProperty(value = "1.陆运费 2.海运费 3.杂费")
-		private Boolean type;
+		private Integer type;
+
+	/**
+	 * 租户
+	 */
+	@ApiModelProperty(value = "租户")
+	private String tenantId;
 
 
 }

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

@@ -510,12 +510,6 @@ public class OrderItems implements Serializable {
 	private BigDecimal grossWeight;
 
 	/**
-	 * 货物类型
-	 */
-	@ApiModelProperty(value = "货物类型")
-	private BigDecimal cargoType;
-
-	/**
 	 * 自定义7
 	 */
 	@ApiModelProperty(value = "自定义7")

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/dto/ScanningCodeAddPcDto.java

@@ -0,0 +1,42 @@
+package com.trade.purchase.order.dto;
+
+import com.trade.purchase.order.entity.*;
+import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.vo.OrderItemsVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author  caifc
+ * @date 2021-10-20 18:29
+*/
+@Data
+@Builder
+@AllArgsConstructor
+public class ScanningCodeAddPcDto {
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	private Long purchaserId;
+	private Long storageId;
+	private String billNo;
+	private String mainBillNo;
+	private Long itemId;
+	private String length;
+	private String thickness;
+	private String grade;
+	private String containerNo;
+	private String itemType;
+	private String stockTimeStart;
+	private String stockTimeEnd;
+	private String tenantId;
+
+
+
+}

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -790,14 +790,12 @@ public class Order extends OrderBase {
 	private Date requiredArrivalEndDate;
 
 	@TableField(exist = false)
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createStartTime;
+
+	private String createStartTime;
 
 	@TableField(exist = false)
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createEndTime;
+
+	private String createEndTime;
 
 	//请核标识  1采购 2销售
 	@TableField(exist = false)

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderCostController.java

@@ -108,7 +108,7 @@ public class OrderCostController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入orderCost")
 	public R submit(@Valid @RequestBody OrderCost orderCost) {
-		return R.status(orderCostService.saveOrUpdate(orderCost));
+		return R.data(orderCostService.savesubmit(orderCost));
 	}
 
 

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

@@ -360,4 +360,15 @@ public class ExportEnquiryController extends BladeController {
 	public R monthSales(OrderVO order) {
 		return R.data(orderService.monthSales(order));
 	}
+
+
+	/**
+	 * 计算国内费用
+	 */
+	@GetMapping("/calculationDomesticFees")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "计算国内费用", notes = "计算国内费用")
+	public R calculationDomesticFees(Order order) {
+		return R.data(orderService.calculationDomesticFees(order));
+	}
 }

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

@@ -38,4 +38,5 @@ public interface IOrderCostService extends IService<OrderCost> {
 	 */
 	IPage<OrderCostVO> selectOrderCostPage(IPage<OrderCostVO> page, OrderCostVO orderCost);
 
+	OrderCost savesubmit(OrderCost orderCost);
 }

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

@@ -25,6 +25,7 @@ import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.excel.*;
 import org.springblade.purchase.sales.vo.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -243,4 +244,9 @@ public interface IOrderService extends IService<Order> {
 	 * 销售明细对账导出
 	 */
 	List<OrderDetailedExcel> orderDetailedExport(OrderReconciliationVo order);
+
+	/**
+	 * 计算国内费用
+	 */
+	BigDecimal calculationDomesticFees(Order order);
 }

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

@@ -16,13 +16,20 @@
  */
 package org.springblade.purchase.sales.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.purchase.sales.entity.OrderCost;
-import org.springblade.purchase.sales.vo.OrderCostVO;
+import org.springblade.purchase.sales.entity.OrderCostItem;
+import org.springblade.purchase.sales.mapper.OrderCostItemMapper;
 import org.springblade.purchase.sales.mapper.OrderCostMapper;
 import org.springblade.purchase.sales.service.IOrderCostService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.purchase.sales.vo.OrderCostVO;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 /**
  * 陆运以及港杂费 服务实现类
@@ -31,11 +38,43 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  * @since 2022-10-11
  */
 @Service
+@AllArgsConstructor
 public class OrderCostServiceImpl extends ServiceImpl<OrderCostMapper, OrderCost> implements IOrderCostService {
 
+	private final OrderCostItemMapper orderCostItemMapper;
+
 	@Override
 	public IPage<OrderCostVO> selectOrderCostPage(IPage<OrderCostVO> page, OrderCostVO orderCost) {
 		return page.setRecords(baseMapper.selectOrderCostPage(page, orderCost));
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public OrderCost savesubmit(OrderCost orderCost) {
+		if (orderCost.getId() == null){
+			orderCost.setTenantId(AuthUtil.getTenantId());
+			orderCost.setCreateTime(new Date());
+			orderCost.setCreateUser(AuthUtil.getUserId());
+			baseMapper.insert(orderCost);
+		}else{
+			orderCost.setUpdateTime(new Date());
+			orderCost.setUpdateUser(AuthUtil.getUserId());
+			baseMapper.updateById(orderCost);
+		}
+		for (OrderCostItem orderCostItem : orderCost.getOrderCostItemList()) {
+			if (orderCostItem.getId() == null){
+				orderCostItem.setPId(orderCost.getId());
+				orderCostItem.setTenantId(AuthUtil.getTenantId());
+				orderCostItem.setCreateTime(new Date());
+				orderCostItem.setCreateUser(AuthUtil.getUserId());
+				orderCostItemMapper.insert(orderCostItem);
+			}else{
+				orderCostItem.setUpdateTime(new Date());
+				orderCostItem.setUpdateUser(AuthUtil.getUserId());
+				orderCostItemMapper.updateById(orderCostItem);
+			}
+		}
+		return orderCost;
+	}
+
 }

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

@@ -1486,6 +1486,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return baseMapper.orderDetailedExport(order);
 	}
 
+	/**
+	 * 计算国内费用
+	 * @param order
+	 * @return
+	 */
+	@Override
+	public BigDecimal calculationDomesticFees(Order order) {
+
+//		if (){
+//
+//		}
+
+		return null;
+	}
+
 	@Override
 	public MonthSales monthSales(OrderVO order) {
 		MonthSales monthSales = new MonthSales();

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/WoodHarvestingCloudController.java

@@ -9,12 +9,14 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.excel.CMYWarehousingExcel;
 import com.trade.purchase.excel.GeneralLedgerExcel;
 import com.trade.purchase.order.dto.OrderSubmitDto;
+import com.trade.purchase.order.dto.ScanningCodeAddPcDto;
 import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.service.IOrderFilesService;
 import com.trade.purchase.order.service.IOrderItemsService;
 import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.vo.OrderPartsVO;
 import com.trade.purchase.order.vo.OrderTotalDTO;
 import com.trade.purchase.order.vo.OrderVO;
 import io.swagger.annotations.Api;
@@ -390,24 +392,14 @@ public class WoodHarvestingCloudController {
 	@GetMapping("/scanningCodeAddPc")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "Pc添加明细", notes = "billNo")
-	public R pcSubmit(Query query,
-					  @RequestParam(value = "purchaserId") Long purchaserId,
-					  @RequestParam(value = "storageId") Long storageId,
-					  @RequestParam(value = "billNo",required = false) String billNo,
-					  @RequestParam(value = "mainBillNo",required = false) String mainBillNo,
-					  @RequestParam(value = "itemId",required = false) Long itemId,
-					  @RequestParam(value = "length",required = false) String length,
-					  @RequestParam(value = "thickness",required = false) String thickness,
-					  @RequestParam(value = "grade",required = false) String grade,
-					  @RequestParam(value = "cntrNo",required = false) String cntrNo,
-					  @RequestParam(value = "itemType",required = false) String itemType,
-					  @RequestParam(value = "stockTimeStart",required = false) String stockTimeStart,
-					  @RequestParam(value = "stockTimeEnd",required = false) String stockTimeEnd
+	public R scanningCodeAddPc(Query query, ScanningCodeAddPcDto scanningCodeAddPcDto
 	) {
-		if (ObjectUtils.isNull(purchaserId) || ObjectUtils.isNull(storageId)) {
+		if (ObjectUtils.isNull(scanningCodeAddPcDto.getPurchaserId()) || ObjectUtils.isNull(scanningCodeAddPcDto.getStorageId())) {
 			return R.fail("缺少必要参数");
 		}
-		LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		scanningCodeAddPcDto.setTenantId(AuthUtil.getTenantId());
+		IPage<ScanningCodeAddPcDto> pages = orderItemsService.selectScanningCodeAddPc(Condition.getPage(query), scanningCodeAddPcDto);
+		/*LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
 			.eq(OrderItems::getIsDeleted, 0)
 			.eq(OrderItems::getPurchaserId, purchaserId)
@@ -419,12 +411,12 @@ public class WoodHarvestingCloudController {
 			.eq(ObjectUtils.isNotNull(length), OrderItems::getLength, length)
 			.eq(ObjectUtils.isNotNull(thickness), OrderItems::getThickness, thickness)
 			.eq(ObjectUtils.isNotNull(grade), OrderItems::getGrade, grade)
-			.eq(ObjectUtils.isNotNull(cntrNo), OrderItems::getCntrNo, cntrNo)
+			.eq(ObjectUtils.isNotNull(containerNo), OrderItems::getContainerNo, containerNo)
 			.eq(ObjectUtils.isNotNull(itemType), OrderItems::getItemType, itemType)
 			.ge(ObjectUtils.isNotNull(stockTimeStart), OrderItems::getStockTime, stockTimeStart)
 			.le(ObjectUtils.isNotNull(stockTimeEnd), OrderItems::getStockTime, stockTimeEnd)
 			.eq(OrderItems::getWarehouseId, storageId);
-		IPage<OrderItems> pages = orderItemsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		IPage<OrderItems> pages = orderItemsService.page(Condition.getPage(query), lambdaQueryWrapper);*/
 		return R.data(pages);
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.java

@@ -3,6 +3,7 @@ package com.trade.purchase.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.trade.purchase.order.dto.ScanningCodeAddPcDto;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderItemsVO;
@@ -62,4 +63,6 @@ public interface OrderItemsMapper extends BaseMapper<OrderItems> {
 	 * @return
 	 */
 	BigDecimal appIndexStatistics(@Param("type") String type, @Param("billType") String billType);
+
+    List<ScanningCodeAddPcDto> selectScanningCodeAddPc(IPage<ScanningCodeAddPcDto> page, ScanningCodeAddPcDto scanningCodeAddPcDto);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -157,6 +157,59 @@
                 and YEARWEEK(date_format(create_time,'%Y-%m-%d')) = YEARWEEK(now())-1;
             </if>
     </select>
+    <select id="selectScanningCodeAddPc" resultType="com.trade.purchase.order.dto.ScanningCodeAddPcDto">
+        select boi.*,bo.bill_no AS mainBillNo
+        FROM
+            business_order bo
+            LEFT JOIN business_order_items boi ON boi.pid = bo.id
+        WHERE
+        boi.is_deleted = 0
+        AND bo.is_deleted = 0
+        and boi.bill_type = 'RK'
+        and boi.is_Issue = '3'
+        and boi.scanning_comparison = 'N'
+        <if test="scanningCodeAddPcDto.purchaserId!=null">
+            and boi.purchaser_id = #{scanningCodeAddPcDto.purchaserId}
+        </if>
+        <if test="scanningCodeAddPcDto.storageId!=null">
+            and boi.warehouse_id = #{scanningCodeAddPcDto.storageId}
+        </if>
+        <if test="scanningCodeAddPcDto.billNo!=null and scanningCodeAddPcDto.billNo != ''">
+            and boi.bill_no like CONCAT(CONCAT('%', #{scanningCodeAddPcDto.billNo}), '%')
+        </if>
+        <if test="scanningCodeAddPcDto.mainBillNo!=null and scanningCodeAddPcDto.mainBillNo != ''">
+            and bo.bill_no = #{scanningCodeAddPcDto.mainBillNo}
+        </if>
+        <if test="scanningCodeAddPcDto.itemId!=null and scanningCodeAddPcDto.itemId != ''">
+            and boi.item_id = #{Order.itemId}
+        </if>
+        <if test="scanningCodeAddPcDto.length!=null  and scanningCodeAddPcDto.length != ''">
+            and boi.length = #{scanningCodeAddPcDto.length}
+        </if>
+        <if test="scanningCodeAddPcDto.thickness!=null and scanningCodeAddPcDto.thickness != ''">
+            and boi.thickness = #{scanningCodeAddPcDto.thickness}
+        </if>
+        <if test="scanningCodeAddPcDto.tenantId!=null and scanningCodeAddPcDto.tenantId != ''">
+            and boi.tenant_id = #{scanningCodeAddPcDto.tenantId}
+        </if>
+        <if test="scanningCodeAddPcDto.grade!=null and scanningCodeAddPcDto.grade != ''">
+            and boi.grade = #{scanningCodeAddPcDto.grade}
+        </if>
+        <if test="scanningCodeAddPcDto.containerNo!=null and scanningCodeAddPcDto.containerNo != ''">
+            and boi.container_no = #{scanningCodeAddPcDto.containerNo}
+        </if>
+        <if test="scanningCodeAddPcDto.itemType!=null and scanningCodeAddPcDto.itemType != ''">
+            and boi.item_type=#{scanningCodeAddPcDto.itemType}
+        </if>
+        <if test="scanningCodeAddPcDto.stockTimeStart!=null and scanningCodeAddPcDto.stockTimeStart != ''">
+            and DATE_FORMAT(boi.stock_time,'%Y-%m-%d') >= DATE_FORMAT(#{scanningCodeAddPcDto.stockTimeStart},'%Y-%m-%d')
+        </if>
+        <if test="scanningCodeAddPcDto.stockTimeEnd!=null and scanningCodeAddPcDto.stockTimeEnd != ''">
+            and DATE_FORMAT(boi.stock_time,'%Y-%m-%d') >= DATE_FORMAT(#{scanningCodeAddPcDto.stockTimeEnd},'%Y-%m-%d')
+        </if>
+        order by bo.busines_date
+
+    </select>
 
 
 </mapper>

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -411,7 +411,7 @@
             and bo.sys_no=#{Order.sysNo}
         </if>
         <if test="Order.morderNo!=null and Order.morderNo != ''">
-            and bo.morder_no = #{Order.morderNo}
+            and bo.bill_no = #{Order.morderNo}
         </if>
         <if test="Order.businesStartDate!=null">
             and bo.busines_date &gt; #{businesStartDate}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IOrderItemsService.java

@@ -2,6 +2,7 @@ package com.trade.purchase.order.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trade.purchase.order.dto.ScanningCodeAddPcDto;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.vo.OrderItemsVO;
 
@@ -43,4 +44,12 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * app首页统计
 	 */
 	BigDecimal appIndexStatistics(String type, String billType);
+
+	/**
+	 * pc添加明细
+	 * @param page
+	 * @param scanningCodeAddPcDto
+	 * @return
+	 */
+	IPage<ScanningCodeAddPcDto> selectScanningCodeAddPc(IPage<ScanningCodeAddPcDto> page, ScanningCodeAddPcDto scanningCodeAddPcDto);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderItemsServiceImpl.java

@@ -3,6 +3,7 @@ package com.trade.purchase.order.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trade.purchase.order.dto.ScanningCodeAddPcDto;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.mapper.OrderItemsMapper;
@@ -73,6 +74,12 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 		return baseMapper.appIndexStatistics(type, billType);
 	}
 
+
+	@Override
+	public IPage<ScanningCodeAddPcDto> selectScanningCodeAddPc(IPage<ScanningCodeAddPcDto> page, ScanningCodeAddPcDto scanningCodeAddPcDto) {
+		return page.setRecords(baseMapper.selectScanningCodeAddPc(page, scanningCodeAddPcDto));
+	}
+
 	/**
 	 * 保存订单明细信息
 	 *

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -990,10 +990,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public List<CMYWarehousingExcel> warehousing(List<CMYWarehousingExcel> excelList) {
 
 		for (CMYWarehousingExcel cMYWarehousingExcel : excelList) {
-
-			OrderItems orderItems = new OrderItems();
-
-			orderItems.setContainerNo(cMYWarehousingExcel.getContainerNo());//箱号
+			cMYWarehousingExcel.setContainerNo(cMYWarehousingExcel.getContainerNo());//箱号
 			if (ObjectUtils.isNotNull(cMYWarehousingExcel.getReservoirAreaName())) {
 				//库区
 				StorageDesc storageDesc = iStorageClient.getName(cMYWarehousingExcel.getReservoirAreaName());
@@ -1021,11 +1018,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					cMYWarehousingExcel.setUnit("");
 				}
 			}
-			if (ObjectUtils.isNotNull(cMYWarehousingExcel.getUnit())) {
-				orderItems.setUnit("1");
+			if (ObjectUtils.isNull(cMYWarehousingExcel.getUnit())) {
+				cMYWarehousingExcel.setUnit("1");
 			}
 			if (ObjectUtils.isNotNull(cMYWarehousingExcel.getPrice()) && ObjectUtils.isNotNull(cMYWarehousingExcel.getStorageInQuantity())) {
-				orderItems.setStorageAmount(cMYWarehousingExcel.getPrice().multiply(cMYWarehousingExcel.getStorageInQuantity()));
+				cMYWarehousingExcel.setStorageAmount(cMYWarehousingExcel.getPrice().multiply(cMYWarehousingExcel.getStorageInQuantity()));
 			}
 
 		}
@@ -1329,6 +1326,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 		//明细品名去重
+		goodsName.removeAll(Collections.singleton(null));
 		goodsName = goodsName.stream().distinct().collect(Collectors.toList());
 		// 保存费用信息
 		saveFees(submitDto.getOrderFeesList(), submitDto.getDelFeesIds(), submitDto.getId());
@@ -1755,13 +1753,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(OrderFees::getSubmitPay, 1);
 		List<OrderFees> orderFeesList = orderFeesService.list(lambdaQueryWrapper);
 		for (OrderFees orderFees : orderFeesList) {
+			financeClient.deleteBySrcFeesId(orderFees.getId());
 			if ("1".equals(orderFees.getStorageFee())) {
 				orderFeesService.removeById(orderFees.getId());
 			} else {
 				orderFees.setIsCheck(0);
 				orderFees.setSubmitPay(0);
 				orderFees.setSettlmentAmount(new BigDecimal("0"));
-				financeClient.deleteBySrcFeesId(orderFees.getId());
 				orderFeesService.updateById(orderFees);
 			}
 		}
@@ -2183,8 +2181,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 		}
-		queryWrapper.ge(ObjectUtils.isNotNull(order.getCreateStartTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d')", order.getCreateStartTime())
-			.le(ObjectUtils.isNotNull(order.getCreateEndTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d')", order.getCreateEndTime())
+		queryWrapper.apply(ObjectUtils.isNotNull(order.getCreateStartTime()),"DATE_FORMAT(stock_time,'%Y-%m-%d') >= DATE_FORMAT('"+order.getCreateStartTime()+"','%Y-%m-%d')")
+		.apply(ObjectUtils.isNotNull(order.getCreateStartTime()),"DATE_FORMAT(stock_time,'%Y-%m-%d') >= DATE_FORMAT('"+order.getCreateStartTime()+"','%Y-%m-%d')")
+//		queryWrapper.ge(ObjectUtils.isNotNull(order.getCreateEndTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d')", order.getCreateEndTime())
+//			.le(ObjectUtils.isNotNull(order.getCreateEndTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d')", order.getCreateEndTime())
 			.orderByDesc("stock_time");
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), queryWrapper);
 		List<Order> orderList = pages.getRecords();
@@ -2571,6 +2571,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 									text.append(order.getStorageQuantity()).append("*").append(agreementitems.getPrice()).append("*").append(date + 2).append("^");
 									date = date - (agreementitems.getEnDays() - agreementitems.getFromDays() + 1);
 								}
+							}else{
+
 							}
 						}
 						count++;
@@ -2612,7 +2614,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			orderFees.setAmount(amount);
 			orderFees.setCurrency("CNY");
 			orderFees.setExchangeRate(new BigDecimal("1"));
-			orderFees.setUnit(feeUnitId + "");
+			orderFees.setUnit("立方");
 			orderFees.setFeesType(1);
 			orderFees.setRemarks(text.toString());
 			orderFees.setCreateTime(new Date());