代码提交暂存

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -218,6 +218,9 @@ public class GoodsDesc implements Serializable {
 	private String corpName;
 
 
+	@ApiModelProperty(value = "箱重量")
+	private String cartonWeight;
+
 
 
 

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

@@ -112,6 +112,7 @@ public class AuditPathsActsController extends BladeController {
 	{
 		LambdaQueryWrapper<AuditPathsActs> auditPathsActsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		auditPathsActsLambdaQueryWrapper
+			.eq(AuditPathsActs::getIsEnable,1)
 			.eq(AuditPathsActs::getFidStatus,fidStatus)
 			.eq(AuditPathsActs::getTenantId,AuthUtil.getTenantId())
 			.eq(AuditPathsActs::getActId,actId);

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

@@ -75,5 +75,8 @@ public class AuditPathsActs implements Serializable {
 	@TableField(exist = false)
 		private String pathName;
 
+	@ApiModelProperty(value = "是否启用此审批流(1启动 2不启动)")
+	private Integer isEnable;
+
 
 }

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

@@ -95,7 +95,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			throw new SecurityException("取消结算失败,无主表信息");
 		}
 		//撤销后, 回归主表原来的状态
-		model.setFinanceStatus(settlementDTO.getOriginBillType());
+		model.setFinanceStatus("待结算");
 		model.setUpdateTime(new Date());
 		model.setUpdateUser(AuthUtil.getUserId());
 		model.setUpdateUserName(AuthUtil.getUser().getRoleName());
@@ -159,7 +159,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		//主表更新, 从表视情况更新新增
 		else
 		{
-
+			model.setFinanceStatus("结算完成");
 			model.setUpdateTime(new Date());
 			model.setUpdateUser(AuthUtil.getUserId());
 			model.setUpdateUserName(AuthUtil.getUser().getRoleName());
@@ -194,6 +194,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			}
 
 		}
+		model.setFinanceStatus("结算完成");
 		return model;
 		//验证结算总金额是否超限
 		/*if(settlementDTO.getBillType().equals("收费")||settlementDTO.getBillType().equals("付费"))