2022年9月23日18:00:26

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

@@ -334,4 +334,25 @@ public class Acc implements Serializable {
 	@ApiModelProperty(value = "未付金额")
 	@TableField(exist = false)
 	private BigDecimal outstandingAmount;
+
+	/**
+	 * 上期结算金额
+	 */
+	@TableField(exist = false)
+	private BigDecimal lastSettlementAmount;
+
+
+	/**
+	 * 上期金额
+	 */
+	@TableField(exist = false)
+	private BigDecimal lastAmount;
+
+	/**
+	 * 业务类型
+	 */
+	@TableField(exist = false)
+	private String type;
+
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderTotalDTO.java

@@ -13,6 +13,8 @@ import java.util.Date;
 @ApiModel(value = "OrderTotalDTO对象", description = "库存明细")
 public class OrderTotalDTO extends OrderItems {
 
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * 系统编号
 	 */

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -18,9 +18,12 @@ package org.springblade.finance.controller;
 
 import com.alibaba.fastjson.JSON;
 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.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.financing.entity.Financing;
 import io.swagger.annotations.Api;
@@ -48,7 +51,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -124,21 +130,25 @@ public class AccController extends BladeController {
 			.eq(StringUtils.isNotBlank(acc.getCostType()), Acc::getCostType, acc.getCostType())
 			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
 			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
-			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc())
-			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
-			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
-			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getSettlementAmount, 0)
-			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getSettlementAmount, 0)
-			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
-			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0)
-			.eq(Acc::getTenantId, SecureUtil.getTenantId())
+			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
+		if ("CMY".equals(acc.getType())) {
+			accLambdaQueryWrapper.eq(Acc::getSettlementAmount, 0);
+		} else {
+			accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
+				.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
+				.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getSettlementAmount, 0)
+				.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getSettlementAmount, 0)
+				.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
+				.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0);
+		}
+		accLambdaQueryWrapper.eq(Acc::getTenantId, SecureUtil.getTenantId())
 			.eq(Acc::getIsDeleted, 0);
-		if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 1){
+		if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 1) {
 			accLambdaQueryWrapper.apply("Amount = Settlement_Amount");
-		}else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2){
+		} else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2) {
 			accLambdaQueryWrapper.apply("Amount != Settlement_Amount");
 		}
-		accLambdaQueryWrapper.eq(Acc::getStatus,0);
+		accLambdaQueryWrapper.eq(Acc::getStatus, 0);
 		accLambdaQueryWrapper.orderByDesc(Acc::getCreateTime);
 		IPage<Acc> pages = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
 		pages.getRecords().forEach(e -> {
@@ -322,8 +332,8 @@ public class AccController extends BladeController {
 	@GetMapping("/accountList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入financing")
-	public R<List<Map<String,Object>>> accountList(Acc acc) {
-		List<Map<String,Object>> list = accService.accountList(acc);
+	public R<List<Map<String, Object>>> accountList(Acc acc) {
+		List<Map<String, Object>> list = accService.accountList(acc);
 		return R.data(list);
 	}
 
@@ -337,4 +347,50 @@ public class AccController extends BladeController {
 		return accService.deleteBySrcFeesId(feesId);
 	}
 
+
+	/**
+	 * 应收，应付总账（嘉通木材）
+	 */
+	@GetMapping("/accBillList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入acc")
+	public R<IPage<Acc>> accBillList(Acc acc, Query query) {
+		IPage<Acc> pages = accService.selectAccBillList(acc);
+		return R.data(pages);
+	}
+
+	/**
+	 * app 营收金额，支出金额（嘉通木材）
+	 */
+	@GetMapping("/revenueExpenditure")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入acc")
+	public R<Map<String, BigDecimal>> revenueExpenditure(Acc acc, Query query) {
+		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		accLambdaQueryWrapper
+			.eq(Acc::getTenantId, AuthUtil.getTenantId())
+			.eq(Acc::getIsDeleted, 0)
+			.gt(Acc::getSettlementAmount, new BigDecimal("0"))
+			.eq(acc.getCorpId() != null, Acc::getCorpId, acc.getCorpId())
+			.apply("date_format(create_time,'%Y-%m') = date_format(now(),'%Y-%m')");
+		List<Acc> list = accService.list(accLambdaQueryWrapper);
+		Map<String, BigDecimal> map = new HashMap<>();
+
+		BigDecimal settlementAmountD = new BigDecimal(0);
+		BigDecimal settlementAmountC = new BigDecimal(0);
+
+		for (Acc accs : list) {
+			//收费金额
+			if (ObjectUtils.isNotNull(accs.getDc()) && "d".equals(accs.getDc())) {
+				settlementAmountD = settlementAmountD.add(accs.getSettlementAmount());
+			} else if (ObjectUtils.isNotNull(accs.getDc()) && "c".equals(accs.getDc())) {
+				//付费金额
+				settlementAmountC = settlementAmountC.add(accs.getSettlementAmount());
+			}
+		}
+		map.put("settlementAmountD", settlementAmountD);
+		map.put("settlementAmountC", settlementAmountC);
+		return R.data(map);
+	}
+
 }

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

@@ -25,7 +25,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.finance.vo.AccVO;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 财务账单 Mapper 接口
@@ -77,4 +79,8 @@ public interface AccMapper extends BaseMapper<Acc> {
     int updateByOrderId(@Param("orderId")Long orderId);
 
     int deleteBySrcFeesId(@Param("feesId") Long feesId);
+
+    Map<String, BigDecimal> selectlastIssueAmount(Acc acc);
+
+	List<Long> selectListCorpId(Acc acc);
 }

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

@@ -242,4 +242,31 @@ FROM
 	) c ON d.corpId = c.corpId
     </select>
 
+    <select id="selectlastIssueAmount" resultType="java.util.Map">
+        sum( IF ( DC = 'd', Settlement_Amount, 0 ) ) AS lastSettlementAmountD,
+        sum( IF ( DC = 'd', Amount, 0 ) ) AS lastAmountD,
+        sum( IF ( DC = 'c', Settlement_Amount, 0 ) ) AS lastSettlementAmountC,
+        sum( IF ( DC = 'c', Amount, 0 ) ) AS lastAmountC
+        FROM finance_acc
+        WHERE
+        is_deleted = 0
+        and status = 0
+        and corp_id = #{corpId}
+        <if test="createTime == null">
+            and date_format(create_time,'%Y-%m') &lt; date_format(now(),'%Y-%m')
+        </if>
+        <if test="createTime != null">
+            and date_format(create_time,'%Y-%m') &lt; date_format(#{createTime},'%Y-%m')
+        </if>
+    </select>
+
+
+    <select id="selectListCorpId" resultType="java.lang.Long">
+        SELECT Corpid
+        FROM finance_acc
+        WHERE
+            is_deleted = 0 and tenant_id = #{tenantId}
+        GROUP BY Corpid
+    </select>
+
 </mapper>

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

@@ -23,6 +23,7 @@ import org.springblade.finance.vo.AccVO;
 import org.springblade.finance.vo.CostMessage;
 import org.springblade.finance.vojo.Acc;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -81,4 +82,20 @@ public interface IAccService extends IService<Acc> {
     List<Map<String, Object>> accountList(Acc acc);
 
 	R deleteBySrcFeesId(Long feesId);
+
+	/**
+	 * 获取该客户上期结余金额
+	 * @param acc
+	 * @return
+	 */
+    Map<String, BigDecimal> selectlastIssueAmount(Acc acc);
+
+	/**
+	 * 通过客户进行分组查询
+	 * @param acc
+	 * @return
+	 */
+	List<Long> selectListCorpId(Acc acc);
+
+	IPage<Acc> selectAccBillList(Acc acc);
 }

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

@@ -17,12 +17,16 @@
 package org.springblade.finance.service.impl;
 
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.finance.mapper.AccMapper;
@@ -39,6 +43,8 @@ import org.springblade.purchase.sales.feign.IOrderItemsClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -60,6 +66,11 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 
 	private final IOrderFeesClient orderFeesClient;
 
+	/**
+	 * 获取客户信息
+	 */
+	private final ICorpsDescClient corpsDescClient;
+
 	@Override
 	public IPage<AccVO> selectAccPage(IPage<AccVO> page, AccVO acc) {
 		return page.setRecords(baseMapper.selectAccPage(page, acc));
@@ -197,4 +208,190 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		return R.data(baseMapper.deleteBySrcFeesId(feesId));
 	}
 
+	@Override
+	public Map<String, BigDecimal> selectlastIssueAmount(Acc acc) {
+		return baseMapper.selectlastIssueAmount(acc);
+	}
+
+	@Override
+	public List<Long> selectListCorpId(Acc acc) {
+		return baseMapper.selectListCorpId(acc);
+	}
+
+
+	@Override
+	public IPage<Acc> selectAccBillList(Acc acc) {
+		//判断是否选择客户
+		if (ObjectUtils.isNotNull(acc.getCorpId())) {
+			QueryWrapper<Acc> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("is_deleted", 0);
+			queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
+			queryWrapper.eq("status", 0);
+			queryWrapper.eq("Corpid", acc.getCorpId());
+			queryWrapper.eq("DC", acc.getDc());
+			if (ObjectUtils.isNull(acc.getCreateTime())) {
+				queryWrapper.apply("date_format(create_time,'%Y-%m') = date_format(now(),'%Y-%m')");
+			} else {
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+				String format = sdf.format(acc.getCreateTime());
+				queryWrapper.eq("date_format(create_time,'%Y-%m')", format);
+			}
+			//查询该客户本月数据
+			List<Acc> accList = baseMapper.selectList(queryWrapper);
+
+			List<Acc> newAccList = new ArrayList<>();
+
+			//获取该客户上期金额
+			acc.setIsDeleted(0);
+			acc.setTenantId(AuthUtil.getTenantId());
+			//上期应收结算金额
+			BigDecimal lastSettlementAmountD = new BigDecimal("0");
+			//上期应付结算金额
+			BigDecimal lastSettlementAmountC = new BigDecimal("0");
+			//上期应收金额
+			BigDecimal lastAmountD = new BigDecimal("0");
+			//上期应付金额
+			BigDecimal lastAmountC = new BigDecimal("0");
+
+			Map<String,BigDecimal> map  = baseMapper.selectlastIssueAmount(acc);
+			if (ObjectUtils.isNotNull(map)) {
+				lastSettlementAmountD = map.get("repaymentAmount");
+				lastSettlementAmountC = map.get("repaymentAmount");
+				lastAmountD = map.get("repaymentAmount");
+				lastAmountC = map.get("repaymentAmount");
+			}
+
+
+			BigDecimal settlementAmount = new BigDecimal(0);
+
+			BigDecimal amount = new BigDecimal(0);
+
+			//便利该客户本月数据 计算借款、还款，结余金额
+			for (Acc accs : accList) {
+				//本期金额
+				if (ObjectUtils.isNotNull(accs.getDc()) && "d".equals(accs.getDc())) {
+					amount = amount.add(accs.getAmount());
+					settlementAmount = settlementAmount.add(accs.getSettlementAmount());
+				} else if (ObjectUtils.isNotNull(accs.getDc()) && "c".equals(accs.getDc())) {
+					//本期结算金额
+					amount = amount.add(accs.getAmount());
+					settlementAmount = settlementAmount.add(accs.getSettlementAmount());
+				}
+			}
+			Acc acc1 = new Acc();
+			acc1.setCorpId(acc.getCorpId());
+			//客户
+			if (ObjectUtils.isNotNull(acc.getCorpId())) {
+				R<CorpsDesc> corpsDesc = corpsDescClient.getCorpMessage(acc.getCorpId());
+				if (corpsDesc.isSuccess()) {
+					acc1.setCorpName(corpsDesc.getData().getCname());
+				}
+			}
+
+			if ("d".equals(acc.getDc())){
+				acc1.setAmount(amount);
+				acc1.setSettlementAmount(settlementAmount);
+				acc1.setLastAmount(lastAmountD);
+				acc1.setLastSettlementAmount(lastSettlementAmountD);
+			}else{
+				acc1.setAmount(amount);
+				acc1.setSettlementAmount(settlementAmount);
+				acc1.setLastAmount(lastAmountC);
+				acc1.setLastSettlementAmount(lastSettlementAmountC);
+			}
+			newAccList.add(acc1);
+
+			//返回数据
+			IPage<Acc> pages = new Page<>();
+			pages.setRecords(newAccList);
+			pages.setTotal(1);
+			pages.setSize(1);
+			pages.setCurrent(1);
+			pages.setPages(1);
+			return pages;
+		} else {
+			acc.setIsDeleted(0);
+			acc.setTenantId(AuthUtil.getTenantId());
+			//通过客户进行分组查询
+			List<Long> corpList = baseMapper.selectListCorpId(acc);
+
+			List<Acc> accList = new ArrayList<>();
+
+			for (Long corp : corpList) {
+				Acc acc1 = new Acc();
+				acc1.setCorpId(corp);
+				//客户
+				R<CorpsDesc> corpsDesc = corpsDescClient.getCorpMessage(corp);
+				if (corpsDesc.isSuccess()) {
+					acc1.setCorpName(corpsDesc.getData().getCname());
+				}
+				QueryWrapper<Acc> queryWrapper = new QueryWrapper<>();
+				queryWrapper.eq("is_deleted", 0);
+				queryWrapper.eq("status", 3);
+				queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
+				queryWrapper.eq("Corpid", acc1.getCorpId());
+				queryWrapper.eq("DC", acc.getDc());
+				if (ObjectUtils.isNull(acc.getCreateTime())) {
+					queryWrapper.apply("date_format(create_time,'%Y-%m') = date_format(now(),'%Y-%m')");
+				} else {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+					String format = sdf.format(acc.getCreateTime());
+					queryWrapper.eq("date_format(create_time,'%Y-%m')", format);
+				}
+				List<Acc> financingsList = baseMapper.selectList(queryWrapper);
+
+				acc.setCorpId(acc1.getCorpId());
+				acc.setIsDeleted(0);
+				acc.setTenantId(AuthUtil.getTenantId());
+				//上期应收结算金额
+				BigDecimal lastSettlementAmountD = new BigDecimal("0");
+				//上期应付结算金额
+				BigDecimal lastSettlementAmountC = new BigDecimal("0");
+				//上期应收金额
+				BigDecimal lastAmountD = new BigDecimal("0");
+				//上期应付金额
+				BigDecimal lastAmountC = new BigDecimal("0");
+				Map<String,BigDecimal> map  = baseMapper.selectlastIssueAmount(acc);
+				if (ObjectUtils.isNotNull(map)) {
+					lastSettlementAmountD = map.get("lastSettlementAmountD");
+					lastSettlementAmountC = map.get("lastSettlementAmountC");
+					lastAmountD = map.get("lastAmountD");
+					lastAmountC = map.get("lastAmountC");
+				}
+
+				BigDecimal settlementAmount = new BigDecimal(0);
+
+				BigDecimal amount = new BigDecimal(0);
+
+				for (Acc acc2 : financingsList) {
+					//本期金额
+					if (ObjectUtils.isNotNull(acc2.getDc()) && "d".equals(acc2.getDc())) {
+						amount = amount.add(acc2.getAmount());
+						settlementAmount = settlementAmount.add(acc2.getSettlementAmount());
+					} else if (ObjectUtils.isNotNull(acc2.getDc()) && "c".equals(acc2.getDc())) {
+						//本期结算金额
+						amount = amount.add(acc2.getAmount());
+						settlementAmount = settlementAmount.add(acc2.getSettlementAmount());
+					}
+				}
+				if ("d".equals(acc.getDc())){
+					acc1.setAmount(amount);
+					acc1.setSettlementAmount(settlementAmount);
+					acc1.setLastAmount(lastAmountD);
+					acc1.setLastSettlementAmount(lastSettlementAmountD);
+				}else{
+					acc1.setAmount(amount);
+					acc1.setSettlementAmount(settlementAmount);
+					acc1.setLastAmount(lastAmountC);
+					acc1.setLastSettlementAmount(lastSettlementAmountC);
+				}
+				accList.add(acc1);
+			}
+			//返回数据
+			IPage<Acc> page = new Page<>();
+			page.setRecords(accList);
+			return page;
+		}
+	}
+
 }

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

@@ -222,7 +222,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		order.setOrderNo(settlement.getSrcOrderno());
 		Order order1 = orderDescClient.getByOrder(order);
 		if (ObjectUtils.isNotNull(order1)) {
-			orderFeesClient.updateOrder(order1.getId());
+			if (!"673511".equals(AuthUtil.getTenantId())) {
+				orderFeesClient.updateOrder(order1.getId());
+			}
 		}
 		return model;
 	}
@@ -512,6 +514,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				throw new SecurityException("撤销账单失败,剩余已收金额不够本次扣款");
 			}
 			orderFees.setSettlmentAmount(decimal);
+			orderFees.setIsCheck(0);
+			orderFees.setSubmitPay(0);
 			orderFeesClient.submit(orderFees);
 		}
 
@@ -640,6 +644,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			}
 			acc.setSettlementAmount(acc.getSettlementAmount() != null ? acc.getSettlementAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
 			orderFees.setSettlmentAmount(orderFees.getSettlmentAmount() != null ? orderFees.getSettlmentAmount().add(items.getThisAmount()) : new BigDecimal("0").add(items.getThisAmount()));
+			orderFees.setIsCheck(1);
+			orderFees.setSubmitPay(1);
 			accMapper.updateById(acc);
 			orderFeesClient.submit(orderFees);
 		}
@@ -1015,12 +1021,17 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 					}
 				}
 				acc.setBillType(billType);
+				acc.setDc("d");
 			} else {
+				if ("申请".equals(e.getSrcFeesType())) {
+					acc.setDc("c");
+				} else {
+					acc.setDc("d");
+				}
 				acc.setBillType(e.getSrcFeesType());
 			}
 			BeanUtils.copyProperties(e, acc);
 			acc.setId(null);
-			acc.setDc("d");
 			acc.setItemType(e.getItemType());
 			acc.setAccSysNo(e.getSrcOrderno());
 			acc.setSrcRefno(e.getSrcOrderno());

blade-service/trade-purchase/src/main/java/com/trade/purchase/excel/GeneralLedgerExcel.java

@@ -24,13 +24,13 @@ public class GeneralLedgerExcel {
 	 * 长
 	 */
 	@ExcelProperty(value = "长")
-	private BigDecimal length;
+	private String length;
 
 	/**
 	 * 宽
 	 */
 	@ExcelProperty(value = "宽")
-	private BigDecimal width;
+	private String width;
 
 	/**
 	 * 宽度明细
@@ -42,7 +42,7 @@ public class GeneralLedgerExcel {
 	 * 厚
 	 */
 	@ExcelProperty(value = "厚")
-	private BigDecimal thickness;
+	private String thickness;
 
 	/**
 	 * 捆包号

blade-service/trade-purchase/src/main/java/com/trade/purchase/financing/mapper/FinancingMapper.xml

@@ -31,8 +31,8 @@
     </select>
 
     <select id="selectlastIssueAmount" resultType="Map">
-        SELECT sum(if(financing_type = '1',financing_amount,0)) as repaymentAmount,
-                sum(if(financing_type = '2',financing_amount,0)) as currentIssueAmount
+        SELECT sum(if(financing_type = '2',financing_amount,0)) as repaymentAmount,
+                sum(if(financing_type = '1',financing_amount,0)) as currentIssueAmount
         FROM warehouse_financing
         WHERE
               is_deleted = 0

blade-service/trade-purchase/src/main/java/com/trade/purchase/financing/service/impl/FinancingServiceImpl.java

@@ -108,7 +108,6 @@ public class FinancingServiceImpl extends ServiceImpl<FinancingMapper, Financing
 			}
 
 			financing.setCreateUser(AuthUtil.getUserId());
-			financing.setFinancingDate(new Date());
 			financing.setCreateTime(new Date());
 			financing.setCreateDept(AuthUtil.getDeptId());
 			financing.setSysNo(billNo.getData().toString());

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

@@ -5,7 +5,6 @@ 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.excel.CMYWarehousingExcel;
 import com.trade.purchase.excel.GeneralLedgerExcel;
@@ -29,6 +28,7 @@ import org.springblade.client.entity.StorageType;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.IStorageClient;
+import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -149,8 +149,8 @@ public class WoodHarvestingCloudController {
 			.eq(ObjectUtils.isNotNull(order.getCorpId()), "corp_id", order.getCorpId());
 		if (ObjectUtils.isNotNull(order.getSpecialCheckStatusApp())) {
 			queryWrapper.eq("special_check_status", 0);
-		}else{
-			if (OrderTypeEnum.INVENTORY.getType().equals(order.getBillType())){
+		} else {
+			if (OrderTypeEnum.INVENTORY.getType().equals(order.getBillType())) {
 				queryWrapper.eq("special_check_status", 0);
 			}
 		}
@@ -261,7 +261,7 @@ public class WoodHarvestingCloudController {
 	@PostMapping("/removeByItemId")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "删除", notes = "传入id")
-	public R removeByItemId(@ApiParam(value = "传入itemId", required = true)@RequestParam String itemId) {
+	public R removeByItemId(@ApiParam(value = "传入itemId", required = true) @RequestParam String itemId) {
 		return R.data(orderItemsService.removeByItemId(itemId));
 	}
 
@@ -450,12 +450,12 @@ public class WoodHarvestingCloudController {
 	@GetMapping("/generalLedgerExport")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "库存导出", notes = "传入order")
-	public void generalLedgerExport(OrderTotalDTO order, Query query,HttpServletResponse response) {
+	public void generalLedgerExport(OrderTotalDTO order, Query query, HttpServletResponse response) {
 		order.setTenantId(AuthUtil.getTenantId());
 		IPage<GeneralLedgerExcel> pages = orderService.generalLedgerList(Condition.getPage(query), order);
-		if (ObjectUtils.isNotNull(pages.getRecords())){
+		if (ObjectUtils.isNotNull(pages.getRecords())) {
 			ExcelUtil.export(response, "库存数据导出", "库存数据", pages.getRecords(), GeneralLedgerExcel.class);
-		}else{
+		} else {
 			throw new SecurityException("未查到数据，导出失败");
 		}
 	}
@@ -467,6 +467,13 @@ public class WoodHarvestingCloudController {
 	@ApiOperationSupport(order = 2)
 	public R<List<Map<String, Object>>> generalLedgerListByGoods() {
 		List<Map<String, Object>> mapList = orderService.generalLedgerListByGoods();
+		for (Map<String, Object> map : mapList) {
+			//获取商品编码,名称,规格编码,规格型号
+			R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(Long.parseLong(String.valueOf(map.get("id"))));
+			if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
+				map.put("cname", goodsMessage.getData().getCname());
+			}
+		}
 		return R.data(mapList);
 	}
 
@@ -476,7 +483,7 @@ public class WoodHarvestingCloudController {
 	@PostMapping("/removeByFileId")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "删除", notes = "传入FileId")
-	public R removeByFileId(@ApiParam(value = "传入ids", required = true)@RequestParam String ids) {
+	public R removeByFileId(@ApiParam(value = "传入ids", required = true) @RequestParam String ids) {
 		return R.data(orderFilesService.removeById(ids));
 	}
 

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

@@ -318,39 +318,56 @@
     </select>
     <select id="selOrderListExport" resultType="com.trade.purchase.excel.PurchaseOrderExcel">
         select
-            BO.id,
-            BO.order_no as orderNo,
-            BCD.cname as strCorpName,
-            SUM(BOI.order_quantity) as orderQuantity,
-            SUM(BOI.actual_quantity) as actualQuantity,
-            BO.order_amount as orderAmount,
-            BO.package_remarks as packageRemarks,
-            BO.banks_account_name as banksAccountName,
-            BO.morder_no as morderNo,
-            BU.real_name as createUserName,
-            BO.debit_amount as debitAmount,
-            BO.settlment_amount as settlmentAmount
+        BO.id,
+        BO.order_no as orderNo,
+        BCD.cname as strCorpName,
+        SUM(BOI.order_quantity) as orderQuantity,
+        SUM(BOI.actual_quantity) as actualQuantity,
+        BO.order_amount as orderAmount,
+        BO.package_remarks as packageRemarks,
+        BO.banks_account_name as banksAccountName,
+        BO.morder_no as morderNo,
+        BU.real_name as createUserName,
+        BO.debit_amount as debitAmount,
+        BO.settlment_amount as settlmentAmount
         from business_order BO
         left join basic_corps_desc BCD on BCD.id = BO.corp_id
         left join business_order_items BOI ON BOI.pid = BO.id
         left join blade_user BU ON BU.id = BO.create_user
         <where>
-            BO.tenant_id =  #{order.tenantId}
+            BO.tenant_id = #{order.tenantId}
             AND BO.is_deleted = '0'
-            <if test="order.orderNo != null and order.orderNo != ''">and BO.order_no like concat('%', #{order.orderNo}, '%')</if>
+            <if test="order.orderNo != null and order.orderNo != ''">and BO.order_no like concat('%', #{order.orderNo},
+                '%')
+            </if>
             <if test="order.corpId != null and order.corpId != ''">and BO.corp_id = #{order.corpId}</if>
-            <if test="order.paymentType != null and order.paymentType != ''">and BO.payment_type = #{order.paymentType}</if>
-            <if test="order.packageRemarks != null and order.packageRemarks != ''">and BO.package_remarks like concat('%', #{order.packageRemarks}, '%')</if>
-            <if test="order.banksAccountName != null and order.banksAccountName != ''">and BO.banks_account_name like concat('%', #{order.banksAccountName}, '%')</if>
+            <if test="order.paymentType != null and order.paymentType != ''">and BO.payment_type =
+                #{order.paymentType}
+            </if>
+            <if test="order.packageRemarks != null and order.packageRemarks != ''">and BO.package_remarks like
+                concat('%', #{order.packageRemarks}, '%')
+            </if>
+            <if test="order.banksAccountName != null and order.banksAccountName != ''">and BO.banks_account_name like
+                concat('%', #{order.banksAccountName}, '%')
+            </if>
             <if test="order.createUser != null and order.createUser != ''">and BO.create_user = #{order.createUser}</if>
-            <if test="order.requiredArrivalStartDate != null and order.requiredArrivalStartDate != ''">and BO.required_arrival_date &gt;= #{order.requiredArrivalStartDate}</if>
-            <if test="order.requiredArrivalEndDate != null and order.requiredArrivalEndDate != ''">and BO.required_arrival_date &lt;= #{order.requiredArrivalEndDate}</if>
-            <if test="order.createStartTime != null and order.createStartTime != ''">and BO.create_time &gt;= #{order.createStartTime}</if>
-            <if test="order.createEndTime != null and order.createEndTime != ''">and BO.create_time &lt;= #{order.createEndTime}</if>
+            <if test="order.requiredArrivalStartDate != null and order.requiredArrivalStartDate != ''">and
+                BO.required_arrival_date &gt;= #{order.requiredArrivalStartDate}
+            </if>
+            <if test="order.requiredArrivalEndDate != null and order.requiredArrivalEndDate != ''">and
+                BO.required_arrival_date &lt;= #{order.requiredArrivalEndDate}
+            </if>
+            <if test="order.createStartTime != null and order.createStartTime != ''">and BO.create_time &gt;=
+                #{order.createStartTime}
+            </if>
+            <if test="order.createEndTime != null and order.createEndTime != ''">and BO.create_time &lt;=
+                #{order.createEndTime}
+            </if>
         </where>
     </select>
 
-    <select id="generalLedgerList" parameterType="com.trade.purchase.order.vo.OrderTotalDTO" resultType="com.trade.purchase.excel.GeneralLedgerExcel">
+    <select id="generalLedgerList" parameterType="com.trade.purchase.order.vo.OrderTotalDTO"
+            resultType="com.trade.purchase.excel.GeneralLedgerExcel">
         SELECT
         boi.id AS id,
         boi.item_id AS itemId,
@@ -376,12 +393,12 @@
         bo.sys_no AS sysNo
         FROM
         business_order_items boi
-         JOIN business_order bo ON boi.pid = bo.id
-         JOIN basic_storage_type bst ON bo.storage_id = bst.id
-         JOIN basic_storage_desc bsc ON boi.storage_id = bsc.id
-         JOIN basic_goods_desc bgd ON boi.item_id = bgd.id
-         JOIN basic_corps_desc bcd ON bo.corp_id = bcd.id
-         JOIN basic_corps_desc bcd1 ON bo.purchaser_id = bcd1.id
+        JOIN business_order bo ON boi.pid = bo.id
+        JOIN basic_storage_type bst ON bo.storage_id = bst.id
+        JOIN basic_storage_desc bsc ON boi.storage_id = bsc.id
+        JOIN basic_goods_desc bgd ON boi.item_id = bgd.id
+        JOIN basic_corps_desc bcd ON bo.corp_id = bcd.id
+        JOIN basic_corps_desc bcd1 ON bo.purchaser_id = bcd1.id
         WHERE
         boi.is_deleted = 0
         AND bo.is_deleted = 0
@@ -403,8 +420,8 @@
         <if test="Order.corpId!=null">
             and bo.corp_id=#{Order.corpId}
         </if>
-        <if test="Order.billNo!=null and Order.morderNo != ''">
-            and boi.bill_no = #{Order.billNo}
+        <if test="Order.billNo!=null and Order.billNo != ''">
+            and boi.bill_no like CONCAT(CONCAT('%', #{Order.billNo}), '%')
         </if>
         <if test="Order.purchaserId!=null">
             and bo.purchaser_id = #{Order.purchaserId}
@@ -418,28 +435,28 @@
         <if test="Order.itemId!=null and Order.itemId != ''">
             and boi.item_id = #{Order.itemId}
         </if>
-        <if test="Order.length!=null">
+        <if test="Order.length!=null  and Order.length != ''">
             and boi.length = #{Order.length}
         </if>
         <if test="Order.width!=null and Order.width != ''">
             and boi.width = #{Order.width}
         </if>
-         <if test="Order.thickness!=null and Order.thickness != ''">
+        <if test="Order.thickness!=null and Order.thickness != ''">
             and boi.thickness = #{Order.thickness}
         </if>
-         <if test="Order.vehicleShipNumber!=null and Order.vehicleShipNumber != ''">
+        <if test="Order.vehicleShipNumber!=null and Order.vehicleShipNumber != ''">
             and bo.vehicle_ship_number = #{Order.vehicleShipNumber}
         </if>
-         <if test="Order.itemType!=null and Order.itemType != ''">
+        <if test="Order.itemType!=null and Order.itemType != ''">
             and bo.item_type=#{Order.itemType}
         </if>
-         <if test="Order.grade!=null and Order.grade != ''">
+        <if test="Order.grade!=null and Order.grade != ''">
             and boi.grade = #{Order.grade}
         </if>
-         <if test="Order.storageId!=null">
+        <if test="Order.storageId!=null">
             and boi.storage_id = #{Order.storageId}
         </if>
-         <if test="Order.unit!=null and Order.unit != ''">
+        <if test="Order.unit!=null and Order.unit != ''">
             and boi.unit = #{Order.unit}
         </if>
         and (boi.is_Issue = '1' or boi.is_Issue = '2')
@@ -448,42 +465,13 @@
 
 
     <select id="generalLedgerListByGoods" parameterType="String" resultType="java.util.Map">
-        SELECT
-            bgd.id AS id,
-            bgd.cname AS cname,
-            ifnull( nu.balanceNumber, 0 ) AS balanceNumber,
-            ifnull( nu.sliceNumber, 0 ) AS sliceNumber
-        FROM
-            basic_goods_desc bgd
-                LEFT JOIN (
-                SELECT
-                    bg.id AS id,
-                    sum( boi.balance_number ) AS balanceNumber,
-                    sum( boi.slice_number ) AS sliceNumber
-                FROM
-                    basic_goods_desc bg
-                        JOIN business_order_items boi ON bg.id = boi.item_id
-                        JOIN business_order bo ON boi.pid = bo.id
-                WHERE
-                    bg.is_deleted = 0
-                    AND boi.is_deleted = 0
-                    AND bo.is_deleted = 0
-                    and bo.status = 3
-                    and bo.bill_type = 'RK'
-                    and bo.trade_type = 'CMY'
-                    and bo.confirm_status = 1
-                    AND bo.special_check_status = 0
-                    AND boi.is_Issue = '1'
-                    <if test="tenantId != null and tenantId != ''">
-                        and bg.tenant_id = #{tenantId}
-                        and bo.tenant_id = #{tenantId}
-                    </if>
-                GROUP BY
-                    boi.item_id
-            ) AS nu ON nu.id = bgd.id
-        where bgd.is_deleted = 0
-        <if test="tenantId != null and tenantId != ''">
-            and bgd.tenant_id = #{tenantId}
-        </if>
+        SELECT boi.item_id             AS id,
+               sum(boi.balance_number) AS balanceNumber,
+               sum(boi.slice_number)   AS sliceNumber
+        FROM business_order_items boi
+        where boi.is_deleted = 0
+          and boi.tenant_id = #{tenantId}
+          and is_Issue = '1'
+        GROUP BY boi.item_id
     </select>
 </mapper>

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

@@ -26,6 +26,7 @@ import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.*;
 import com.trade.purchase.order.enums.OrderStatusEnum;
 import com.trade.purchase.order.enums.OrderTypeEnum;
+import com.trade.purchase.order.mapper.OrderFeesMapper;
 import com.trade.purchase.order.mapper.OrderItemsMapper;
 import com.trade.purchase.order.mapper.OrderMapper;
 import com.trade.purchase.order.service.IOrderFreightService;
@@ -1435,7 +1436,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				receivableLambdaQueryWrapper.eq(OrderFees::getPid, order.getId());
 				receivableLambdaQueryWrapper.eq(OrderFees::getFeesType, 2);
 				List<OrderFees> receivableOrderFeesList = orderFeesService.list(receivableLambdaQueryWrapper);
-				auditProecessDTO.setReceivableAmount(receivableOrderFeesList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				auditProecessDTO.setPayAmount(receivableOrderFeesList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 				//应收
 				LambdaQueryWrapper<OrderFees> payLambdaQueryWrapper = new LambdaQueryWrapper<>();
 				payLambdaQueryWrapper.eq(OrderFees::getIsDeleted, 0);
@@ -1443,7 +1444,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				payLambdaQueryWrapper.eq(OrderFees::getPid, order.getId());
 				payLambdaQueryWrapper.eq(OrderFees::getFeesType, 1);
 				List<OrderFees> payOrderFeesList = orderFeesService.list(payLambdaQueryWrapper);
-				auditProecessDTO.setPayAmount(payOrderFeesList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				auditProecessDTO.setReceivableAmount(payOrderFeesList.stream().map(OrderFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
 
 			auditProecessDTO.setOrderQuantity(salesOrder.getStorageQuantity());
@@ -1474,13 +1475,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setPurchaserId(salesOrder.getPurchaserId());
 			order.setStorageId(salesOrder.getStorageId());
 			order.setOrgOrderNo(salesOrder.getOrgOrderNo());
-			order.setOrderRemark(salesOrder.getOrderRemark());
 			order.setStorageQuantity(salesOrder.getStorageQuantity());
 			order.setBillNo(salesOrder.getBillNo());
+			order.setId(salesOrder.getId());
 			//出库生成仓储费
 			if ("CK".equals(salesOrder.getBillType())) {
-				this.paymentApply(order, "收费", OrderTypeEnum.STORAGE_FEE.getType());
 				this.paymentApply(order, "收费", "出库");
+				this.paymentApply(order, "收费", OrderTypeEnum.STORAGE_FEE.getType());
 			} else if ("RK".equals(salesOrder.getBillType())) {
 				this.paymentApply(order, "申请", "入库");
 			}
@@ -1541,7 +1542,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					for (OrderItems RKOrderItems : RKOrderItemsList) {
 						//判断盘点与入库明细捆包号是否相等 true修改入库盘点量，结余量，结余金额
 						if (orderItems.getBillNo().equals(RKOrderItems.getBillNo())) {
-							if (RKOrderItems.getIsIssue().equals("3")) {
+							if (RKOrderItems.getIsIssue().equals("4")) {
 								throw new SecurityException("捆包号：" + RKOrderItems.getBillNo() + "已出库");
 							} else {
 								RKOrderItems.setIsIssue("3");
@@ -1584,7 +1585,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							RKOrderItems.setBalanceNumber(orderItems.getInventory());
 							RKOrderItems.setBalanceMoney(orderItems.getBalanceMoney());
 							RKOrderItems.setSurplusLoss(orderItems.getSurplusLoss());
-							if (RKOrderItems.getIsIssue().equals("3")) {
+							if (RKOrderItems.getIsIssue().equals("4")) {
 								throw new SecurityException("捆包号：" + RKOrderItems.getBillNo() + "已出库");
 							}
 							orderItemsMapper.updateById(RKOrderItems);
@@ -1699,6 +1700,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				List<OrderItems> orderItemsList = orderItemsMapper.selectList(queryWrapper);
 				for (OrderItems orderItems : orderItemsList) {
 					orderItems.setScanningComparison("Y");
+					orderItems.setIsIssue("4");
 					orderItems.setUpdateTime(new Date());
 					orderItems.setUpdateUser(AuthUtil.getUserId());
 					orderItemsMapper.updateById(orderItems);
@@ -1722,7 +1724,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				RKqueryWrapper.eq("is_deleted", 0);
 				List<OrderItems> RKderItemsList = orderItemsMapper.selectList(queryWrapper);
 				for (OrderItems orderItems : RKderItemsList) {
-					orderItems.setIsIssue("3");
+					orderItems.setIsIssue("4");
+					orderItems.setScanningComparison("Y");
 					orderItems.setUpdateTime(new Date());
 					orderItems.setUpdateUser(AuthUtil.getUserId());
 					orderItemsMapper.updateById(orderItems);
@@ -1896,6 +1899,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				order.setCorpName(corpMessage.getData().getCname());
 			}
 		}
+
+		Long pid = order.getId();
+
 		//判断是否未仓储费
 		if (!OrderTypeEnum.STORAGE_FEE.getType().equals(itemType)) {
 			ApplyDTO applyDTO = new ApplyDTO();
@@ -1916,7 +1922,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//获取订单明细信息
 			LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			orderItemsLambdaQueryWrapper.eq(OrderItems::getIsDeleted, 0);
-			orderItemsLambdaQueryWrapper.eq(OrderItems::getPid, order.getId());
+			orderItemsLambdaQueryWrapper.eq(OrderItems::getPid, pid);
 			orderItemsLambdaQueryWrapper.eq(OrderItems::getGoodType, 0);
 			List<OrderItems> orderItemsList = orderItemsService.list(orderItemsLambdaQueryWrapper);
 			if (CollectionUtils.isNotEmpty(orderItemsList)) {
@@ -1924,17 +1930,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				quantity = quantity.add(orderItemsList.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
 			}
 			//获取订单收款信息
-			LambdaQueryWrapper<OrderFees> orderFeesLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			orderFeesLambdaQueryWrapper.eq(OrderFees::getIsDeleted, 0);
-			orderFeesLambdaQueryWrapper.eq(OrderFees::getPid, order.getId());
-			orderFeesLambdaQueryWrapper.eq(OrderFees::getIsCheck, 0);
-			orderFeesLambdaQueryWrapper.eq(OrderFees::getSubmitPay, 0);
+			QueryWrapper<OrderFees> orderFeesQueryWrapper = new QueryWrapper<>();
+			orderFeesQueryWrapper.eq("is_deleted", 0)
+			.eq("pid", pid)
+			.eq("is_check", 0)
+			.eq("submit_pay", 0);
 			/*if ("入库".equals(itemType)) {
 				orderFeesLambdaQueryWrapper.eq(OrderFees::getFeesType, 2);
 			} else {
 				orderFeesLambdaQueryWrapper.eq(OrderFees::getFeesType, 1);
 			}*/
-			List<OrderFees> orderFeesList = orderFeesService.list(orderFeesLambdaQueryWrapper);
+			List<OrderFees> orderFeesList = orderFeesService.list(orderFeesQueryWrapper);
 			if (CollectionUtils.isNotEmpty(orderFeesList)) {
 				for (OrderFees orderFees : orderFeesList) {
 					List<Items> itemsList = new ArrayList<>();
@@ -1958,14 +1964,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					items.setQuantity(quantity);
 					items.setSrcOrderno(order.getOrgOrderNo());
 					items.setCorpId(orderFees.getCorpId());
-					items.setSrcParentId(order.getId());
+					items.setSrcParentId(pid);
 					items.setCurrency("CNY");
 					items.setExchangeRate(new BigDecimal(1));
 					items.setTaxRate(BigDecimal.ZERO);
 					items.setSrcType(1);
 					items.setTradeType(order.getTradeType());
 					items.setUnit("条");
-					items.setRemarks(order.getOrderRemark());
+					items.setRemarks(orderFees.getRemarks());
 					items.setSrcBillNo(order.getBillNo());
 					items.setStatusJT(1);
 					items.setBillNo(order.getBillNo());
@@ -1990,7 +1996,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 								for (User datum : userList.getData()) {
 									//循环发送消息
 									Message sendMessage = new Message();
-									sendMessage.setParameter(String.valueOf(order.getId()));
+									sendMessage.setParameter(String.valueOf(pid));
 									sendMessage.setUserName(AuthUtil.getUserName());
 									sendMessage.setUserId(AuthUtil.getUserId());
 									sendMessage.setToUserId(datum.getId());
@@ -2114,14 +2120,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			items.setQuantity(new BigDecimal("1"));
 			items.setSrcOrderno(order.getOrgOrderNo());
 			items.setCorpId(order.getPurchaserId());
-			items.setSrcParentId(order.getId());
+			items.setSrcParentId(pid);
 			items.setCurrency("CNY");
 			items.setExchangeRate(new BigDecimal(1));
 			items.setTaxRate(BigDecimal.ZERO);
 			items.setSrcType(1);
 			items.setTradeType(order.getTradeType());
 			items.setUnit("条");
-			items.setRemarks(order.getOrderRemark());
+			items.setRemarks(text.toString());
 			items.setSrcBillNo(order.getBillNo());
 			items.setStatusJT(1);
 			items.setBillNo(order.getBillNo());
@@ -2142,7 +2148,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 				//将仓储费添加到费用明细中
 				OrderFees orderFees = new OrderFees();
-				orderFees.setPid(order.getId());
+				orderFees.setPid(pid);
 				orderFees.setItemId(fees.getData().getId());
 				orderFees.setCorpId(order.getPurchaserId());
 				orderFees.setQuantity(new BigDecimal("1"));
@@ -2157,6 +2163,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderFees.setCreateUser(AuthUtil.getUserId());
 				orderFees.setCreateUserName(AuthUtil.getUserName());
 				orderFees.setTenantId(AuthUtil.getTenantId());
+				orderFees.setIsCheck(1);
+				orderFees.setSubmitPay(1);
 				orderFeesService.save(orderFees);
 
 				//给角色为财务的人发送消息