2022年8月26日19点00分

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderFeesClient.java

@@ -32,4 +32,13 @@ public interface IOrderFeesClient {
 
 	@GetMapping("/orderfees/submitPay")
 	R submitPay(@RequestParam("id") Long id);
+
+	/**
+	 * 修改订单费用明细审核状态
+	 *
+	 * @param id
+	 * @return
+	 */
+	@GetMapping("/orderfees/updateOrderFees")
+	R updateOrder(@RequestParam("id") Long id);
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/InvoiceItem.java

@@ -49,6 +49,11 @@ public class InvoiceItem implements Serializable {
 	*/
 		@ApiModelProperty(value = "费用服务名称")
 		private String serverName;
+		/**
+	* 费用服务id
+	*/
+		@ApiModelProperty(value = "费用服务id")
+		private String server;
 	/**
 	* 规格型号
 	*/

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Settlement.java

@@ -255,6 +255,12 @@ public class Settlement  implements Serializable {
 	@ApiModelProperty(value = "本次溢付款")
 	private BigDecimal caseOverPayment;
 
+	/**
+	 * 数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal number;
+
 	@ApiModelProperty(value = "1.代表结算列表 2.销项进项")
 	private int settlementType;
 

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -94,6 +94,7 @@ public class AuditProecessController extends BladeController {
 		lambdaQueryWrapper.gt(auditProecess.getApplybegintime() != null, AuditProecess::getSendTime, auditProecess.getApplybegintime());//请核时间
 		lambdaQueryWrapper.le(auditProecess.getApplyendtime() != null, AuditProecess::getSendTime, auditProecess.getApplyendtime());
 		lambdaQueryWrapper.orderByDesc(AuditProecess::getSendTime);
+		lambdaQueryWrapper.ne(auditProecess.getAuditStatus() != null ,AuditProecess::getAuditStatus,"N");
 
 		IPage pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);
 		List<AuditProecess> auditProecessList = pages.getRecords();

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryReportController.java

@@ -34,6 +34,7 @@ import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -97,9 +98,10 @@ public class DeliveryReportController extends BladeController {
 		LambdaQueryWrapper<Delivery> idQueryWrapper = new LambdaQueryWrapper<>();
 		idQueryWrapper.select(Delivery::getId)
 			.eq(Delivery::getIsDeleted, 0)
-			.eq(Delivery::getTenantId, reportVO.getTenantId())
+			.eq(Delivery::getTenantId, AuthUtil.getTenantId())
 			.gt(Delivery::getBillWeight, 0)
-			.between(Delivery::getBusinessDate, getDayOfMonth(year, lastMonth - 2).get(0), getDayOfMonth(year, lastMonth).get(1));
+			.apply( "date_format(business_date,'%Y-%m-%d') >= '" + getDayOfMonth(year, lastMonth - 2).get(0) + "'")
+			.apply( "date_format(business_date,'%Y-%m-%d') <= '" + getDayOfMonth(year, lastMonth).get(1) + "'");
 		deliveryService.list(idQueryWrapper).forEach(delivery -> idList.add(delivery.getId()));
 
 		// 查不到直接返回

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -405,7 +405,11 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		//stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().add(deliveryItems.getActualQuantity()));//锁定数量 加
 		stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().add(deliveryItems.getActualQuantity()));//结余数量 加
 		stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(deliveryItems.getActualQuantity()));//可用数量 加
-		stockGoods.setOutAmount(stockGoods.getOutAmount().subtract(deliveryItems.getDeliveryAmount()));//出库金额减
+		if ("681169".equals(AuthUtil.getTenantId())){
+			stockGoods.setOutAmount(stockGoods.getOutAmount().subtract(deliveryItems.getDeliveryAmount()));//出库金额减
+		}else{
+			stockGoods.setOutAmount(stockGoods.getOutAmount().subtract(deliveryItems.getContractAmount()));//出库金额减
+		}
 		if (tradeType.equals(OrderTypeEnum.IMPORT.getType())){
 			//判断出库发票重量和结余发票重量
 			if (stockGoods.getOutWeight().compareTo(deliveryItems.getInvoiceWeight()) < 0){
@@ -519,6 +523,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			}
 			stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().subtract(deliveryItems.getActualQuantity()));
 		}
+		stockGoods.setCntrNo(deliveryItems.getCntrNo());
 		stockGoods.setUpdateTime(new Date());
 		stockGoods.setUpdateUser(SecureUtil.getUserId());
 		R updateStock = stockGoodsClient.updateStock(stockGoods);
@@ -589,6 +594,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			stockGoods.setTradeType("JXS");
 			stockGoods.setStorageId(storageId);
 		}
+		stockGoods.setCntrNo(deliveryItems.getCntrNo());
 		stockGoods.setCreateUser(SecureUtil.getUserId());
 		stockGoods.setTenantId(SecureUtil.getTenantId());
 		stockGoods.setCreateTime(new Date());

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -422,10 +422,18 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 
 		String billStatus = null;//订单状态
-		if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
-			billStatus = DeliveryStatusEnum.DELIVER.getType();
-		} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
-			billStatus = DeliveryStatusEnum.REPEAL.getType();
+		if("681169".equals(AuthUtil.getTenantId())){
+			if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
+				billStatus = DeliveryStatusEnum.DELIVER.getType();
+			} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
+				billStatus = DeliveryStatusEnum.REPEAL.getType();
+			}
+		}else{
+			if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType())) {
+				billStatus = DeliveryStatusEnum.REVOCATION.getType();
+			} else if (delivery.getDeliveryType() != null && delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType())) {
+				billStatus = DeliveryStatusEnum.REPEAL.getType();
+			}
 		}
 		if (delivery.getId() == null) {
 			R billNo = serialClient.getBillNo(delivery.getBillType(), delivery.getTradeType(), delivery.getBillType());
@@ -441,13 +449,24 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			baseMapper.insert(delivery);
 		} else {
 			Delivery deliverys = baseMapper.selectById(delivery.getId());//查询原始单据
-			if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
-				//发货
-				throw new RuntimeException("已收货请勿重复收货");
-			} else if (delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
-				//撤销发货
-				throw new RuntimeException("已撤销收货请勿重复撤销收货");
+			if("681169".equals(AuthUtil.getTenantId())){
+				if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
+					//发货
+					throw new RuntimeException("已收货请勿重复收货");
+				} else if (delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.DELIVER.getType())) {
+					//撤销发货
+					throw new RuntimeException("已撤销收货请勿重复撤销收货");
+				}
+			}else{
+				if (delivery.getDeliveryType().equals(DeliveryEnum.DELIVER.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {
+					//发货
+					throw new RuntimeException("已收货请勿重复收货");
+				} else if (delivery.getDeliveryType().equals(DeliveryEnum.REPEAL.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {
+					//撤销发货
+					throw new RuntimeException("已撤销收货请勿重复撤销收货");
+				}
 			}
+
 			delivery.setDeliveryStatus(billStatus);
 			delivery.setUpdateUser(SecureUtil.getUserId());
 			delivery.setUpdateTime(new Date());
@@ -464,10 +483,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				orderTemp.setDeliverQuantity(delivery.getTotalQuantity());
 				orderTemp.setDeliverTime(date);
 			} else {
-				orderTemp.setOrderStatus("待收货");
+				if("681169".equals(AuthUtil.getTenantId())){
+					orderTemp.setOrderStatus("待收货");
+				}else{
+					orderTemp.setOrderStatus("待发货");
+				}
 				orderTemp.setDeliverQuantity(BigDecimal.ZERO);
 			}
-
 			baseMapper.updateById(delivery);
 			orderDescClient.updateOrder(orderTemp);
 
@@ -745,26 +767,51 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 
 		Date date = new Date();
-		//更改收货主表状态
-		delivery.setDeliveryStatus("已发货");
-		delivery.setFreightQuantity(delivery.getTotalQuantity());
-		delivery.setFreightTime(date);
-		delivery.setFreightUser(AuthUtil.getUserName());
 
-		Order temp = new Order();
-		temp.setId(select.getOrgId());
-		temp.setOrderStatus("待收货");
-		temp.setDeliverQuantity(delivery.getTotalQuantity());
-		temp.setDeliverTime(date);
-		orderDescClient.updateOrder(temp);
+		if("681169".equals(AuthUtil.getTenantId())){
+			delivery.setDeliveryStatus("已发货");
+			delivery.setFreightQuantity(delivery.getTotalQuantity());
+			delivery.setFreightTime(date);
+			delivery.setFreightUser(AuthUtil.getUserName());
+
+			Order temp = new Order();
+			temp.setId(select.getOrgId());
+			temp.setOrderStatus("待收货");
+			temp.setDeliverQuantity(delivery.getTotalQuantity());
+			temp.setDeliverTime(date);
+			orderDescClient.updateOrder(temp);
+
+			Order orderTemp = new Order();
+			orderTemp.setId(select.getSrcId());
+			orderTemp.setOrderStatus("待收货");
+			orderTemp.setDeliverQuantity(delivery.getTotalQuantity());
+			orderTemp.setDeliverTime(date);
+			orderDescClient.updateOrder(orderTemp);
+			baseMapper.updateById(delivery);
+		}else{
+			delivery.setDeliveryStatus("已收货");
+			delivery.setFreightQuantity(delivery.getTotalQuantity());
+			delivery.setFreightTime(date);
+			delivery.setFreightUser(AuthUtil.getUserName());
+
+			Order temp = new Order();
+			temp.setId(select.getOrgId());
+			temp.setOrderStatus("待发货");
+			temp.setDeliverQuantity(delivery.getTotalQuantity());
+			temp.setDeliverTime(date);
+			orderDescClient.updateOrder(temp);
+
+			Order orderTemp = new Order();
+			orderTemp.setId(select.getSrcId());
+			orderTemp.setOrderStatus("已发货");
+			orderTemp.setDeliverQuantity(delivery.getTotalQuantity());
+			orderTemp.setDeliverTime(date);
+			orderDescClient.updateOrder(orderTemp);
+			baseMapper.updateById(delivery);
+		}
+
+
 
-		Order orderTemp = new Order();
-		orderTemp.setId(select.getSrcId());
-		orderTemp.setOrderStatus("待收货");
-		orderTemp.setDeliverQuantity(delivery.getTotalQuantity());
-		orderTemp.setDeliverTime(date);
-		orderDescClient.updateOrder(orderTemp);
-		baseMapper.updateById(delivery);
 
 	}
 
@@ -778,9 +825,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		if (select == null) {
 			throw new SecurityException("未查到相关数据,操作失败");
 		}
-		if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus())) {
-			throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
+		if("681169".equals(AuthUtil.getTenantId())){
+			if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus())) {
+				throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
+			}
+		}else{
+			if (select.getDeliveryStatus() == null || !DeliveryStatusEnum.DELIVER.getType().equals(select.getDeliveryStatus())) {
+				throw new SecurityException("此单据已撤回或者不存在,禁止重复操作");
+			}
 		}
+
 		if (select.getDeliveryStatus() != null && DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus()) && "681169".equals(AuthUtil.getTenantId())){
 			throw new SecurityException("此单据已生成凭证,禁止撤销");
 		}

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

@@ -20,6 +20,7 @@ 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.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
@@ -580,10 +581,12 @@ public class OrderController extends BladeController {
 
 				//成本单价=(货款+关税+配额)/发票重量---精确小数点2位
 				BigDecimal unitPrice = null;
-				if (service.getInvoiceWeight() == null || service.getInvoiceWeight().compareTo(BigDecimal.ZERO) == 0) {
-					unitPrice = BigDecimal.ZERO;
-				} else {
-					unitPrice = ((itemMoney.add(quotaMoney)).add(customDutyMoney)).divide(service.getInvoiceWeight(), 2, BigDecimal.ROUND_HALF_UP);
+				if (ObjectUtils.isNotNull(service)){
+					if (service.getInvoiceWeight() == null || service.getInvoiceWeight().compareTo(BigDecimal.ZERO) == 0) {
+						unitPrice = BigDecimal.ZERO;
+					} else {
+						unitPrice = ((itemMoney.add(quotaMoney)).add(customDutyMoney)).divide(service.getInvoiceWeight(), 2, BigDecimal.ROUND_HALF_UP);
+					}
 				}
 				e.setUnitPrice(unitPrice);
 

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

@@ -16,25 +16,24 @@
  */
 package org.springblade.purchase.sales.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.purchase.sales.entity.Order;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.purchase.sales.entity.OrderFees;
-import org.springblade.purchase.sales.vo.OrderFeesVO;
 import org.springblade.purchase.sales.service.IOrderFeesService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.purchase.sales.vo.OrderFeesVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 订单费用明细表 控制器
@@ -62,9 +61,8 @@ public class OrderFeesController extends BladeController {
 	}
 
 	@GetMapping("/getById")
-	OrderFees getById(@RequestParam("id") Long id)
-	{
-		return  orderFeesService.getById(id);
+	OrderFees getById(@RequestParam("id") Long id) {
+		return orderFeesService.getById(id);
 	}
 
 	/**
@@ -108,8 +106,8 @@ public class OrderFeesController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入orderFees")
 	public R update(@Valid @RequestBody OrderFees orderFees) {
-		if (orderFees.getId() == null){
-			return R.fail(500,"请选择要删除的数据");
+		if (orderFees.getId() == null) {
+			return R.fail(500, "请选择要删除的数据");
 		}
 		orderFees.setIsDeleted(1);
 		return R.status(orderFeesService.updateById(orderFees));
@@ -135,10 +133,20 @@ public class OrderFeesController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(orderFeesService.removeByIds(Func.toLongList(ids)));
 	}
+
 	@GetMapping("/submitPay")
-	R submitPay(@RequestParam("id") Long id)
-	{
-		return  R.status(orderFeesService.submitPay(id));
+	R submitPay(@RequestParam("id") Long id) {
+		return R.status(orderFeesService.submitPay(id));
+	}
+
+
+	@GetMapping("/updateOrderFees")
+	R updateOrderFees(@RequestParam("id") Long id) {
+		if (id == null) {
+			throw new SecurityException("修改状态失败");
+		}
+		orderFeesService.updateIsCheck(id);
+		return R.status(true);
 	}
 
 }

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

@@ -38,20 +38,23 @@ public class OrderDescClient implements IOrderDescClient {
 		if (order.getId() == null) {
 			throw new SecurityException("修改状态失败");
 		}
-		iOrderService.updateById(order);
 
-		if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
-			iOrderService.update(null, new LambdaUpdateWrapper<Order>()
-				.set(Order::getDeliverTime, null)
-				.eq(Order::getId, order.getId())
-			);
-		}
-		if (order.getReceiveQuantity().compareTo(BigDecimal.ZERO) == 0) {
-			iOrderService.update(null, new LambdaUpdateWrapper<Order>()
-				.set(Order::getReceiveTime, null)
-				.eq(Order::getId, order.getId())
-			);
+		if("681169".equals(AuthUtil.getTenantId())){
+			if (order.getDeliverQuantity().compareTo(BigDecimal.ZERO) == 0) {
+				iOrderService.update(null, new LambdaUpdateWrapper<Order>()
+					.set(Order::getDeliverTime, null)
+					.eq(Order::getId, order.getId())
+				);
+			}
+			if (order.getReceiveQuantity().compareTo(BigDecimal.ZERO) == 0) {
+				iOrderService.update(null, new LambdaUpdateWrapper<Order>()
+					.set(Order::getReceiveTime, null)
+					.eq(Order::getId, order.getId())
+				);
+			}
 		}
+		iOrderService.updateById(order);
+
 		return R.success("操作成功");
 	}
 

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

@@ -44,6 +44,8 @@ public interface OrderFeesMapper extends BaseMapper<OrderFees> {
 	 * @param id
 	 */
 	void updateByPid (@Param("id") Long id);
+
+	int updateIsCheck (@Param("id") Long id);
 	/**
 	 * 更新生成货款状态
 	 *

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

@@ -36,6 +36,9 @@
     <update id="updateByPid" parameterType="long">
         UPDATE business_order_fees SET is_deleted = '1' WHERE pid = #{id}
     </update>
+    <update id="updateIsCheck" parameterType="long">
+        UPDATE business_order_fees SET is_check = 0 WHERE pid = #{id}
+    </update>
     <update id="submitPay" parameterType="long">
         UPDATE business_order_fees SET submit_pay = '1',is_check = '1' WHERE pid = #{id}
     </update>

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

@@ -42,6 +42,9 @@ public interface IOrderFeesService extends IService<OrderFees> {
 	 * @param id
 	 */
 	public void updateByPid(Long id);
+
+
+	public int updateIsCheck(Long id);
 	/**
 	 * 更新生成货款状态
 	 *

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

@@ -114,6 +114,11 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
 	}
 
 	@Override
+	public int updateIsCheck(Long id) {
+		return baseMapper.updateIsCheck(id);
+	}
+
+	@Override
 	public boolean submitPay(Long id) {
 		Integer integer = baseMapper.submitPay(id);
 		if (integer != null && integer >0){

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -67,7 +67,8 @@
 	sum(a.out_quantity) as outQuantity ,
 	sum(a.out_weight) as outWeight ,
 	sum(a.balance_quantity) as balanceQuantity ,
-	sum(a.balance_weight) as balanceWeight
+	sum(a.balance_weight) as balanceWeight,
+    a.cntr_no AS cntrNo
     FROM
 	business_stock_goods a
     where a.tenant_id=#{tenantId}

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/InvoiceItemMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="invoiceItemResultMap" type="org.springblade.finance.entity.InvoiceItem">
         <id column="id" property="id"/>
         <result column="server_name" property="serverName"/>
+        <result column="server_id" property="server"/>
         <result column="typeno" property="typeno"/>
         <result column="unit" property="unit"/>
         <result column="number" property="number"/>

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@@ -217,6 +218,12 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			});
 		}
 		model.setItemsList(itemsList);
+		Order order = new Order();
+		order.setOrderNo(settlement.getSrcOrderno());
+		Order order1 = orderDescClient.getByOrder(order);
+		if (ObjectUtils.isNotNull(order1)){
+			orderFeesClient.updateOrder(order1.getId());
+		}
 		return model;
 	}
 
@@ -710,8 +717,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Override
 	@Transactional
 	public Settlement apply(List<Items> itemsList, String billType, String url, String pageStatus, String pageLabel, String checkType, String tradeType) throws Exception {
-		BigDecimal total = itemsList.stream().filter(e -> e.getAmount() != null && "CNY".equals(e.getCurrency())).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-		BigDecimal foreignTotal = itemsList.stream().filter(e -> e.getAmount() != null && !"CNY".equals(e.getCurrency())).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal total = itemsList.stream().filter(e -> e.getAmount() != null && ObjectUtil.isNotEmpty(e.getCurrency())).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal foreignTotal = itemsList.stream().filter(e -> e.getAmount() != null && !"CYN".equals(e.getCurrency())).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 		Settlement settlement = new Settlement();
 		settlement.setBillType(billType);
 		settlement.setCorpId(itemsList.get(0).getCorpId());
@@ -726,7 +733,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		// 人民币总金额
 		settlement.setAmount(total);
 		// 外币总金额
-		// settlement.setForeignAmount(foreignTotal);
+//		 settlement.setForeignAmount(foreignTotal);
 		settlement.setTenantId(AuthUtil.getTenantId());
 		settlement.setCreateUser(AuthUtil.getUserId());
 		settlement.setStatus(0);
@@ -737,7 +744,11 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		settlement.setCheckStatus("录入");
 		settlement.setDc("c");
 		settlement.setSettlementType(1);
+		settlement.setBillNo(itemsList.get(0).getBillNo());
+		settlement.setNumber(itemsList.get(0).getQuantity());
 		baseMapper.insert(settlement);
+
+
 		if ((StringUtils.isBlank(tradeType)) || (StringUtils.isNotBlank(tradeType)) && !tradeType.equals(OrderTypeEnum.DOMESTIC.getType())){
 			itemsList.forEach(e -> {
 				// 修改原费用明细状态
@@ -912,6 +923,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			auditProecessDTO.setSendName(AuthUtil.getUserName());
 			auditProecessDTO.setSendTime(new Date());
 			auditProecessDTO.setSendMsg(selectOne.getRemark());
+			auditProecessDTO.setOrderQuantity(settlement.getNumber());
 			R financeProcess = iCheckClient.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");
@@ -1152,6 +1164,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	//审核取消方法
 	@Override
+	@Transactional
 	public void passCancel(Long settlementId) {
 
 		LambdaQueryWrapper<Settlement> settlementLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -1162,6 +1175,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		if (settlement == null) {
 			throw new SecurityException("审批取消失败");
 		}
+		orderFeesClient.updateOrder(settlement.getSrcBillId());
 		settlement.setCheckStatus("录入");
 		baseMapper.updateById(settlement);
 		/*

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

@@ -24,4 +24,10 @@ public interface OrderFeesMapper extends BaseMapper<OrderFees> {
 	 */
 	List<OrderFeesVO> selectOrderFeesPage(IPage page, OrderFeesVO orderFees);
 
+	/**
+	 * 修改订单费用明细审核状态
+	 * @param order
+	 * @return
+	 */
+    int updateByPid(OrderFees order);
 }

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

@@ -27,6 +27,14 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
+    <update id="updateByPid" parameterType="com.trade.purchase.order.entity.OrderFees">
+        UPDATE business_order_fees
+        SET
+            is_check = #{isCheck},
+            update_user = #{updateUser},
+            update_time = #{updateTime}
+        WHERE pid = #{pid}
+    </update>
 
 
     <select id="selectOrderFeesPage" resultMap="orderFeesResultMap">

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

@@ -22,4 +22,12 @@ public interface IOrderFeesService extends IService<OrderFees> {
 	 */
 	IPage<OrderFeesVO> selectOrderFeesPage(IPage<OrderFeesVO> page, OrderFeesVO orderFees);
 
+	/**
+	 * 修改订单费用明细审核状态
+	 *
+	 * @param order
+	 * @return
+	 */
+	int updateByPid(OrderFees order);
+
 }

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

@@ -29,6 +29,17 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
 	}
 
 	/**
+	 * 修改订单费用明细审核状态
+	 *
+	 * @param order
+	 * @return
+	 */
+	@Override
+	public int updateByPid(OrderFees order) {
+		return baseMapper.updateByPid(order);
+	}
+
+	/**
 	 * @param list 订单费用信息
 	 * @param date 订单时间
 	 * @param Pid  订单主表id

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

@@ -790,13 +790,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		// 查询费用明细
 		List<OrderFees> orderFeesList = orderFeesService.list(Wrappers.<OrderFees>lambdaQuery().eq(OrderFees::getPid, orderId).eq(OrderFees::getIsDeleted,0)
 		.eq(OrderFees::getTenantId,SecureUtil.getTenantId()));
-
-
-		orderFeesList.forEach(item -> {
-
-
-		});
-
 		if (CollectionUtils.isNotEmpty(orderFeesList)) {
 			orderFeesList.stream().forEach(item -> {
 				if (item.getItemId() != null) {