2023年2月27日17:42:35

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/ocean/entity/ShippingBill.java

@@ -450,6 +450,12 @@ public class ShippingBill implements Serializable {
 	private List<ShippingFile> shippingFileList;
 
 	/**
+	 * 分单明细
+	 */
+	@TableField(exist = false)
+	private List<ShippingBill> shippingBillList;
+
+	/**
 	 * TEU
 	 */
 	@ApiModelProperty(value = "TEU")
@@ -524,6 +530,12 @@ public class ShippingBill implements Serializable {
 	private String originLand;
 
 	/**
+	 * 来源id（主单id）
+	 */
+	@ApiModelProperty(value = "来源id（主单id）")
+	private Long srcId;
+
+	/**
 	 * 请核类型
 	 */
 	@TableField(exist = false)

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/ocean/entity/ShippingBillDetails.java

@@ -471,6 +471,12 @@ public class ShippingBillDetails implements Serializable {
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date releaseDate;
 
+	/**
+	 * 来源主表id
+	 */
+	@ApiModelProperty(value = "来源主表id")
+	private Long srcPid;
+
 	public String get$managementCompanyId() {
 		return $managementCompanyId;
 	}

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/ocean/entity/ShippingFees.java

@@ -178,5 +178,29 @@ public class ShippingFees implements Serializable {
 	@ApiModelProperty(value = "结算时间")
 	private Date settlementDate;
 
+	/**
+	 * 发票状态
+	 */
+	@ApiModelProperty(value = "发票状态")
+	private String invoiceStatus;
+
+	/**
+	 * 发票号
+	 */
+	@ApiModelProperty(value = "发票号")
+	private String invoiceNo;
+
+	/**
+	 * 发票日期
+	 */
+	@ApiModelProperty(value = "发票日期")
+	private String invoiceDate;
+
+	/**
+	 * 是否公开
+	 */
+	@ApiModelProperty(value = "是否公开")
+	private String ifOpen;
+
 
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/ocean/entity/ShippingMatchBox.java

@@ -130,4 +130,10 @@ public class ShippingMatchBox implements Serializable {
 	@ApiModelProperty(value = "租户")
 	private String tenantId;
 
+	/**
+	 * 来源主表id
+	 */
+	@ApiModelProperty(value = "来源主表id")
+	private Long srcPid;
+
 }

blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -259,6 +259,12 @@ public class AuditProecess implements Serializable {
 	private String referenceNo;
 
 	/**
+	 * 仓库
+	 */
+	@ApiModelProperty(value = "仓库")
+	private String storage;
+
+	/**
 	 * 运费
 	 */
 	@TableField(exist = false)

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

@@ -273,7 +273,6 @@ public class OrderItems implements Serializable {
 	 * 英文名称
 	 */
 	@ApiModelProperty(value = "英文名称")
-	@TableField(exist = false)
 	private String ename;
 	/**
 	 * 规格编码

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/ocean/controller/ShippingBillController.java

@@ -224,4 +224,15 @@ public class ShippingBillController extends BladeController {
 		return R.data(generateBill);
 	}
 
+	/**
+	 * 生成分单信息
+	 */
+	@PostMapping("/createReinsurancePolicy")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "生成分单信息", notes = "传入shippingBill")
+	@RepeatSubmit
+	public R createReinsurancePolicy(@Valid @RequestBody ShippingBill shippingBill) {
+		return R.data(shippingBillService.createReinsurancePolicy(shippingBill));
+	}
+
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/ocean/service/IShippingBillService.java

@@ -64,4 +64,6 @@ public interface IShippingBillService extends IService<ShippingBill> {
 	ShippingBill generateBill(ShippingBill shippingBill);
 
 	ShippingBill revokeBill(ShippingBill shippingBill);
+
+	ShippingBill createReinsurancePolicy(ShippingBill shippingBill);
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/ocean/service/impl/ShippingBillServiceImpl.java

@@ -43,6 +43,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.finance.dto.ApplyDTO;
 import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.finance.vojo.Acc;
@@ -142,6 +143,10 @@ public class ShippingBillServiceImpl extends ServiceImpl<ShippingBillMapper, Shi
 		}
 		shippingBillDetail.setShippingFeesList(shippingFeesList);
 
+		//分单明细
+		List<ShippingBill> shippingBillList = baseMapper.selectList(new LambdaQueryWrapper<ShippingBill>().eq(ShippingBill::getSrcId, shippingBill.getId()));
+		shippingBillDetail.setShippingBillList(shippingBillList);
+
 		//附件
 		List<ShippingFile> shippingFile = shippingFileMapper.selectList(new LambdaQueryWrapper<ShippingFile>().eq(ShippingFile::getPid, shippingBill.getId()));
 		shippingBillDetail.setShippingFileList(shippingFile);
@@ -357,7 +362,7 @@ public class ShippingBillServiceImpl extends ServiceImpl<ShippingBillMapper, Shi
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public ShippingBill checkShippingBill(ShippingBill shippingBill) {
 		ShippingBill selectShippingBill = baseMapper.selectById(shippingBill.getId());
-		if (ObjectUtils.isNull(selectShippingBill)){
+		if (ObjectUtils.isNull(selectShippingBill)) {
 			throw new SecurityException("请核失败:未找到单据信息");
 		}
 		//审批数据
@@ -614,6 +619,66 @@ public class ShippingBillServiceImpl extends ServiceImpl<ShippingBillMapper, Shi
 		return selectShippingBill;
 	}
 
+	@Override
+	public ShippingBill createReinsurancePolicy(ShippingBill shippingBill) {
+		if (null == shippingBill.getId()) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		if (ObjectUtils.isNotNull(shippingBill.getShippingMatchBoxList()) && shippingBill.getShippingMatchBoxList().size() > 0) {
+			throw new RuntimeException("请先选择分箱明细");
+		}
+		ShippingBill shippingBillCopy = new ShippingBill();
+		ShippingBill detail = baseMapper.selectById(shippingBill.getId());
+		if (ObjectUtils.isNotNull(detail)) {
+			BeanUtil.copyProperties(detail, shippingBillCopy);
+			shippingBillCopy.setId(null);
+			if (detail.getBillType().equals("HYJK")) {
+				shippingBillCopy.setBillType("HYJK-FD");
+			} else {
+				shippingBillCopy.setBillType("HYCK-FD");
+			}
+			shippingBillCopy.setSrcId(detail.getId());
+			shippingBillCopy.setCreateUser(AuthUtil.getUserId());
+			shippingBillCopy.setCreateUserName(AuthUtil.getUserName());
+			shippingBillCopy.setCreateTime(new Date());
+			shippingBillCopy.setUpdateUserName(null);
+			shippingBillCopy.setUpdateTime(null);
+			shippingBillCopy.setUpdateUser(null);
+			baseMapper.insert(shippingBillCopy);
+
+			//明细
+			if (ObjectUtils.isNotNull(shippingBill.getShippingBillDetails())) {
+				shippingBill.getShippingBillDetails().setAccountingDeptName(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getAccountingDeptName()) ? shippingBill.getShippingBillDetails().get$accountingDeptId() : shippingBill.getShippingBillDetails().getAccountingDeptName());//核算部门
+				shippingBill.getShippingBillDetails().setShipName(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getShipName()) ? shippingBill.getShippingBillDetails().get$shipId() : shippingBill.getShippingBillDetails().getShipName());//船名
+				shippingBill.getShippingBillDetails().setBranchPayPlaceName(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getBranchPayPlaceName()) ? shippingBill.getShippingBillDetails().get$branchPayPlaceId() : shippingBill.getShippingBillDetails().getBranchPayPlaceName());//分单付费地点
+				shippingBill.getShippingBillDetails().setGoodsName(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getGoodsName()) ? shippingBill.getShippingBillDetails().get$goodsId() : shippingBill.getShippingBillDetails().getGoodsName());//货物
+				shippingBill.getShippingBillDetails().setOperatorName(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getOperatorName()) ? shippingBill.getShippingBillDetails().get$operatorId() : shippingBill.getShippingBillDetails().getOperatorName());//操作员
+				shippingBill.getShippingBillDetails().setMainPayPlaceName(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getMainPayPlaceName()) ? shippingBill.getShippingBillDetails().get$mainPayPlaceId() : shippingBill.getShippingBillDetails().getMainPayPlaceName());//主单付费地点
+				shippingBill.getShippingBillDetails().setVoyageNumber(ObjectUtils.isNull(shippingBill.getShippingBillDetails().getVoyageNumber()) ? shippingBill.getShippingBillDetails().get$voyageNumberId() : shippingBill.getShippingBillDetails().getVoyageNumber());//航次
+				shippingBill.getShippingBillDetails().setCreateUser(AuthUtil.getUserId());
+				shippingBill.getShippingBillDetails().setCreateTime(new Date());
+				shippingBill.getShippingBillDetails().setTenantId(AuthUtil.getTenantId());
+				shippingBill.getShippingBillDetails().setPid(shippingBillCopy.getId());
+				shippingBill.getShippingBillDetails().setSrcPid(detail.getId());
+				shippingBillDetailsMapper.insert(shippingBill.getShippingBillDetails());
+				detail.setShippingBillDetails(shippingBill.getShippingBillDetails());
+			}
+			//配箱信息
+			if (ObjectUtils.isNotNull(shippingBill.getShippingMatchBoxList())) {
+				for (ShippingMatchBox shippingMatchBox : shippingBill.getShippingMatchBoxList()) {
+					shippingMatchBox.setCreateUser(AuthUtil.getUserId());
+					shippingMatchBox.setCreateTime(new Date());
+					shippingMatchBox.setTenantId(AuthUtil.getTenantId());
+					shippingMatchBox.setPid(shippingBillCopy.getId());
+					shippingMatchBox.setSrcPid(detail.getId());
+					shippingMatchBoxMapper.insert(shippingMatchBox);
+				}
+			}
+			detail.setShippingMatchBoxList(shippingBill.getShippingMatchBoxList());
+		}
+		return detail;
+	}
+
 
 	/**
 	 * 订单生成账单 并且推送财务消息

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

@@ -339,7 +339,9 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 						item.setCode(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getCode());
 						item.setCname(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getCname());
 						item.setTypeno(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getTypeno());
-						item.setEname(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getEname());
+						if (!"577435".equals(AuthUtil.getTenantId())){
+							item.setEname(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getEname());
+						}
 						item.setBrandItem(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getBrandItem());
 						item.setSize(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getSize());
 						item.setSpecsOne(goodsDescList.stream().filter(e -> e.getId().equals(item.getItemId())).findFirst().get().getSpecsOne());

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

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.finance.excel.AccProfitStatisticsExcel;
 import org.springblade.finance.service.IAccService;
@@ -49,6 +50,7 @@ public class ProfitStatisticsController {
 
 			AccProfitStatisticsExcel accProfitStatisticsCollect = new AccProfitStatisticsExcel();
 			accProfitStatisticsCollect.setBillType("收费");
+			accProfitStatisticsCollect.setTenantId(AuthUtil.getTenantId());
 			AccProfitStatisticsExcel accProfitStatisticsExcelCollect = new AccProfitStatisticsExcel();
 			if ("1".equals(accProfitStatisticsExcel.getWhetherStatistics())) {
 				accProfitStatisticsCollect.setSrcSysno(accOne.getSrcSysno());

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

@@ -773,7 +773,7 @@
         sum( ifnull( fa.Amount, 0 ) ) AS receivableAmount,
         sum( ifnull( fa.Settlement_Amount, 0 ) ) AS receivedAmount,
         sum( ifnull( fa.Amount, 0 ) ) AS answerPayAmount,
-        sum( ifnull( fa.Settlement_Amount, 0 ) ) AS alreadyPayAmount,
+        sum( ifnull( fa.Settlement_Amount, 0 ) ) AS alreadyPayAmount
         FROM
         finance_acc fa
         LEFT JOIN basic_corps_desc bcd ON fa.Corpid = bcd.id

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

@@ -204,7 +204,7 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		LambdaQueryWrapper<Items> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Items::getTenantId, AuthUtil.getTenantId()).eq(Items::getIsDeleted, 0).eq(Items::getSrcFeesId, feesId);
 		Items items = itemsMapper.selectOne(lambdaQueryWrapper);
-		if (ObjectUtils.isNotNull(items)){
+		if (ObjectUtils.isNotNull(items)) {
 			itemsMapper.deleteById(items.getId());
 			settlementMapper.deleteById(items.getPid());
 		}
@@ -233,8 +233,8 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 			queryWrapper.eq("is_deleted", 0);
 			queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
 			queryWrapper.eq("status", 0);
-			queryWrapper.eq(ObjectUtils.isNotNull(acc.getCorpId()),"Corpid", acc.getCorpId());
-			queryWrapper.eq(ObjectUtils.isNotNull(acc.getDc()),"DC", acc.getDc());
+			queryWrapper.eq(ObjectUtils.isNotNull(acc.getCorpId()), "Corpid", acc.getCorpId());
+			queryWrapper.eq(ObjectUtils.isNotNull(acc.getDc()), "DC", acc.getDc());
 			if (ObjectUtils.isNull(acc.getRetrieval())) {
 				queryWrapper.apply("date_format(create_time,'%Y-%m') = date_format(now(),'%Y-%m')");
 				acc1.setRetrieval(new Date());
@@ -262,7 +262,7 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 			//上期应付金额
 			BigDecimal lastAmountC = new BigDecimal("0");
 
-			Map<String,BigDecimal> map  = baseMapper.selectlastIssueAmount(acc);
+			Map<String, BigDecimal> map = baseMapper.selectlastIssueAmount(acc);
 			if (ObjectUtils.isNotNull(map)) {
 				lastSettlementAmountD = map.get("repaymentAmount");
 				lastSettlementAmountC = map.get("repaymentAmount");
@@ -298,33 +298,32 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 			acc1.setAmount(amount);
 			acc1.setSettlementAmount(settlementAmount);
 			acc1.setOutstandingAmount(amount.subtract(settlementAmount));
-			if ("d".equals(acc.getDc())){
+			if ("d".equals(acc.getDc())) {
 				acc1.setLastAmount(lastAmountD);
 				acc1.setLastSettlementAmount(lastSettlementAmountD);
-			}else{
+			} else {
 				acc1.setLastAmount(lastAmountC);
 				acc1.setLastSettlementAmount(lastSettlementAmountC);
 			}
-			if (ObjectUtil.isEmpty(acc1.getLastAmount())){
+			if (ObjectUtil.isEmpty(acc1.getLastAmount())) {
 				acc1.setLastAmount(BigDecimal.ZERO);
 			}
-			if (ObjectUtil.isEmpty(acc1.getLastSettlementAmount())){
+			if (ObjectUtil.isEmpty(acc1.getLastSettlementAmount())) {
 				acc1.setLastSettlementAmount(BigDecimal.ZERO);
 			}
 
 			acc1.setLastOutstandingAmount(acc1.getLastAmount().subtract(acc1.getLastSettlementAmount()));
 
-			if (acc.getWhether().equals("1")){
-				if(acc1.getLastAmount().compareTo(BigDecimal.ZERO) > 0
+			if (acc.getWhether().equals("1")) {
+				if (acc1.getLastAmount().compareTo(BigDecimal.ZERO) > 0
 					|| acc1.getLastOutstandingAmount().compareTo(BigDecimal.ZERO) > 0
 					|| acc1.getLastSettlementAmount().compareTo(BigDecimal.ZERO) > 0
 					|| acc1.getAmount().compareTo(BigDecimal.ZERO) > 0
 					|| acc1.getSettlementAmount().compareTo(BigDecimal.ZERO) > 0
-					|| acc1.getOutstandingAmount().compareTo(BigDecimal.ZERO) > 0)
-				{
+					|| acc1.getOutstandingAmount().compareTo(BigDecimal.ZERO) > 0) {
 					newAccList.add(acc1);
 				}
-			}else {
+			} else {
 				newAccList.add(acc1);
 			}
 
@@ -357,7 +356,7 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 				queryWrapper.eq("status", 0);
 				queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
 				queryWrapper.eq("Corpid", corp);
-				queryWrapper.eq(ObjectUtils.isNotNull(acc.getDc()),"DC", acc.getDc());
+				queryWrapper.eq(ObjectUtils.isNotNull(acc.getDc()), "DC", acc.getDc());
 				if (ObjectUtils.isNull(acc.getRetrieval())) {
 					queryWrapper.apply("date_format(create_time,'%Y-%m') = date_format(now(),'%Y-%m')");
 					acc1.setRetrieval(new Date());
@@ -380,7 +379,7 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 				BigDecimal lastAmountD = new BigDecimal("0");
 				//上期应付金额
 				BigDecimal lastAmountC = new BigDecimal("0");
-				Map<String,BigDecimal> map  = baseMapper.selectlastIssueAmount(acc);
+				Map<String, BigDecimal> map = baseMapper.selectlastIssueAmount(acc);
 				if (ObjectUtils.isNotNull(map)) {
 					lastSettlementAmountD = map.get("lastSettlementAmountD");
 					lastSettlementAmountC = map.get("lastSettlementAmountC");
@@ -406,26 +405,25 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 				acc1.setAmount(amount);
 				acc1.setSettlementAmount(settlementAmount);
 				acc1.setOutstandingAmount(amount.subtract(settlementAmount));
-				if ("d".equals(acc.getDc())){
+				if ("d".equals(acc.getDc())) {
 					acc1.setLastAmount(lastAmountD);
 					acc1.setLastSettlementAmount(lastSettlementAmountD);
-				}else{
+				} else {
 					acc1.setLastAmount(lastAmountC);
 					acc1.setLastSettlementAmount(lastSettlementAmountC);
 				}
 				acc1.setLastOutstandingAmount(acc1.getLastAmount().subtract(acc1.getLastSettlementAmount()));
 
-				if (ObjectUtil.isNotEmpty(acc.getWhether()) && acc.getWhether().equals("1")){
-					if(acc1.getLastAmount().compareTo(BigDecimal.ZERO) > 0
+				if (ObjectUtil.isNotEmpty(acc.getWhether()) && acc.getWhether().equals("1")) {
+					if (acc1.getLastAmount().compareTo(BigDecimal.ZERO) > 0
 						|| acc1.getLastOutstandingAmount().compareTo(BigDecimal.ZERO) > 0
 						|| acc1.getLastSettlementAmount().compareTo(BigDecimal.ZERO) > 0
 						|| acc1.getAmount().compareTo(BigDecimal.ZERO) > 0
 						|| acc1.getSettlementAmount().compareTo(BigDecimal.ZERO) > 0
-						|| acc1.getOutstandingAmount().compareTo(BigDecimal.ZERO) > 0)
-					{
+						|| acc1.getOutstandingAmount().compareTo(BigDecimal.ZERO) > 0) {
 						accList.add(acc1);
 					}
-				}else {
+				} else {
 					accList.add(acc1);
 				}
 
@@ -447,39 +445,39 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 	}
 
 	@Override
-	public IPage<Acc> selBillBalance(IPage<Acc> iPage, Acc acc){
+	public IPage<Acc> selBillBalance(IPage<Acc> iPage, Acc acc) {
 		return iPage.setRecords(baseMapper.selBillBalance(iPage, acc));
 	}
 
 	@Override
-	public List<Acc> selBillBalanceExport(Acc acc){
+	public List<Acc> selBillBalanceExport(Acc acc) {
 		return baseMapper.selBillBalance(null, acc);
 	}
 
 	@Override
-	public IPage<Acc> SelAccItem(IPage<Acc> iPage, Acc acc){
+	public IPage<Acc> SelAccItem(IPage<Acc> iPage, Acc acc) {
 		List<Acc> accList = new ArrayList<>();
-		if ("YING".equals(acc.getChargePay())){
+		if ("YING".equals(acc.getChargePay())) {
 			accList = baseMapper.SelChargeItem(iPage, acc);
-		}else if ("YI".equals(acc.getChargePay())){
+		} else if ("YI".equals(acc.getChargePay())) {
 			accList = baseMapper.SelPayItem(iPage, acc);
 		}
 		return iPage.setRecords(accList);
 	}
 
 	@Override
-	public List<Acc> SelAccItemExport(Acc acc){
+	public List<Acc> SelAccItemExport(Acc acc) {
 		List<Acc> accList = new ArrayList<>();
-		if ("YING".equals(acc.getChargePay())){
+		if ("YING".equals(acc.getChargePay())) {
 			accList = baseMapper.SelChargeItem(null, acc);
-		}else if ("YI".equals(acc.getChargePay())){
+		} else if ("YI".equals(acc.getChargePay())) {
 			accList = baseMapper.SelPayItem(null, acc);
 		}
 		return accList;
 	}
 
 	@Override
-	public Map<String, Object> SumBillBalance(Acc acc){
+	public Map<String, Object> SumBillBalance(Acc acc) {
 		return baseMapper.SumBillBalance(acc);
 	}
 
@@ -505,7 +503,8 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		accProfitStatisticsExcel.setTenantId(AuthUtil.getTenantId());
 		return baseMapper.getAccProfitStatistics(accProfitStatisticsExcel);
 	}
-@Override
+
+	@Override
 	public AccProfitStatisticsExcel getAccProfitStatisticsCode(AccProfitStatisticsExcel accProfitStatisticsExcel) {
 		accProfitStatisticsExcel.setTenantId(AuthUtil.getTenantId());
 		return baseMapper.getAccProfitStatisticsCode(accProfitStatisticsExcel);
@@ -516,6 +515,7 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		accProfitStatisticsExcel.setTenantId(AuthUtil.getTenantId());
 		return baseMapper.accProfitStatisticsList(accProfitStatisticsExcel);
 	}
+
 	@Override
 	public List<AccProfitStatisticsExcel> accProfitStatisticsListcode(AccProfitStatisticsExcel accProfitStatisticsExcel) {
 		accProfitStatisticsExcel.setTenantId(AuthUtil.getTenantId());

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

@@ -448,7 +448,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				vo.setCorpsName(corpMessage.getData());
 			}
 		}
-		if (ObjectUtils.isNotNull(orderMessage.getCorpId())){
+		if (ObjectUtils.isNotNull(orderMessage.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(orderMessage.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
 				vo.setCorpCName(corpsDesc.getCname());
@@ -1556,6 +1556,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 			//审批数据
+			auditProecessDTO.setStorage(iStorageClient.getStorageType(order.getStorageId()) == null ? "" : iStorageClient.getStorageType(order.getStorageId()).getCname());
 			auditProecessDTO.setCaseNo(salesOrder.getCaseNo());
 			auditProecessDTO.setMorderNo(salesOrder.getBillNo());
 			auditProecessDTO.setOrderQuantity(salesOrder.getStorageQuantity());
@@ -1634,7 +1635,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (0 == times) {//第一次审批
 					RKOrderItems.setIsIssue("5");
 					orderItems.setIsIssue("5");
-				}else {//第二次审批
+				} else {//第二次审批
 					RKOrderItems.setIsIssue("7");
 					orderItems.setIsIssue("7");
 				}
@@ -1839,6 +1840,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	/**
 	 * 佳通木材库库存总价和数量
+	 *
 	 * @param order
 	 * @return
 	 */