2023年8月3日17:48:42

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderAcctVO.java

@@ -116,4 +116,6 @@ public class OrderAcctVO {
 	//角色权限控制
 	private String userRoleControl;
 
+	private String goods;
+
 }

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

@@ -488,7 +488,7 @@ public class DeliveryController extends BladeController {
 	public R revokeWagonNumber(@Valid @RequestBody Delivery delivery) {
 		delivery.setBillType(OrderTypeEnum.SHIP.getType());
 		delivery.setTradeType(OrderTypeEnum.DOMESTIC.getType());
-		return deliveryService.submitWagonNumber(delivery);
+		return deliveryService.revokeWagonNumber(delivery);
 	}
 
 	/**

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

@@ -107,4 +107,6 @@ public interface IDeliveryService extends IService<Delivery> {
 	R voucher(Delivery delivery);
 
     R submitWagonNumber(Delivery delivery);
+
+	R revokeWagonNumber(Delivery delivery);
 }

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

@@ -1944,6 +1944,36 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 
 		if ("681169".equals(AuthUtil.getTenantId())) {
+			select.setWagonNumberStatus("1");
+			select.setWagonNumberOne(delivery.getWagonNumberOne());
+			select.setWagonNumberTwo(delivery.getWagonNumberTwo());
+			baseMapper.updateById(select);
+			Order temp = new Order();
+			temp.setId(select.getSrcId());//销售主表id
+			temp.setWagonNumberOne(select.getWagonNumberOne());
+			temp.setWagonNumberTwo(select.getWagonNumberTwo());
+			orderDescClient.updateOrder(temp);
+
+			Order orderTemp = new Order();
+			orderTemp.setId(select.getOrgId());//采购主表id
+			orderTemp.setWagonNumberOne(select.getWagonNumberOne());
+			orderTemp.setWagonNumberTwo(select.getWagonNumberTwo());
+			orderDescClient.updateOrder(orderTemp);
+
+		}
+		return R.data(select);
+	}
+
+	@Override
+	public R revokeWagonNumber(Delivery delivery) {
+		//防重校验
+		Long deliveryId = delivery.getId();
+		Delivery select = baseMapper.selectById(deliveryId);
+		if (select == null) {
+			throw new SecurityException("未查到相关数据,操作失败");
+		}
+
+		if ("681169".equals(AuthUtil.getTenantId())) {
 			delivery.setWagonNumberStatus("0");
 			delivery.setWagonNumberOne(" ");
 			delivery.setWagonNumberTwo(" ");

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -40,6 +40,7 @@
             t7.name as dispatcherName,
             t1.dispatch_dept as dispatchDept,
             t6.dept_name as dispatchDeptName,
+            t1.goods as goods,
             (CASE WHEN
             t1.shipping_mode != '散货'
             THEN

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -734,7 +734,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		item.setStation(order.getStation());
 		item.setFactory(order.getFactory());
 		item.setAddressDetail(order.getAddressDetail());
-
+		item.setGoods(order.getGoods());
 		if (ObjectUtil.isNotEmpty(order.getDispatcher())) {
 			R<User> user = userClient.userInfoById(order.getDispatcher());
 			if (user.isSuccess() && user.getData() != null) {

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

@@ -701,7 +701,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 		} else if (order.getShippingMode().equals("大件")) {
 			BigDecimal landAmountD = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(itemList)) {
-				landAmountD = itemList.stream().map(OrderItem::getLandAmountD).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+				for (OrderItem item:itemList) {
+					landAmountD = landAmountD.add(item.getLandAmountD().multiply(new BigDecimal(item.getCtnQuantity())));
+				}
 				List<OrderEstimate> orderEstimates = new ArrayList<>();
 				if (ObjectUtils.isNotNull(order.getOrderEstimateList())) {
 					for (OrderEstimate orderEstimate : order.getOrderEstimateList()) {

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

@@ -1286,8 +1286,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		} else {
 			throw new SecurityException("请核失败:请核标识设置不正确");
 		}
-
-
 		// 没开启审批流直接走 通过流程
 		if (pathsActs == null || pathsActs.getIsEnable() == 2) {
 			throw new SecurityException("当前租户未查询到审批流配置");
@@ -1297,20 +1295,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				salesOrder.setSpecialCheckUser(AuthUtil.getUserName());
 				salesOrder.setSpecialCheckTime(new Date());
 			} else {
-				if (ObjectUtils.isNotNull(value) && value.equals("1")) {
-					salesOrder.setStatus(3);
-					salesOrder.setOrderStatus(OrderStatusEnum.PASS.getType());
-					salesOrder.setFudaPurchaseStatus(OrderStatusEnum.PASS.getType());
-				} else {
-					salesOrder.setStatus(1);
-					salesOrder.setOrderStatus(OrderStatusEnum.SUBMIT.getType());
-					salesOrder.setCheckDate(new Date());
-					salesOrder.setFudaPurchaseStatus(OrderStatusEnum.SUBMIT.getType());
-					salesOrder.setFudaPurchaseDate(new Date());
-				}
+				salesOrder.setStatus(1);
+				salesOrder.setOrderStatus(OrderStatusEnum.SUBMIT.getType());
+				salesOrder.setCheckDate(new Date());
+				salesOrder.setFudaPurchaseStatus(OrderStatusEnum.SUBMIT.getType());
+				salesOrder.setFudaPurchaseDate(new Date());
 			}
 			baseMapper.updateById(salesOrder);
-
 			//获取审批级次
 			List<AuditPathsLevels> auditPathsLevels;
 			if (checkFlag == 1) {
@@ -1327,16 +1318,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			if (CollectionUtils.isEmpty(auditPathsLevels)) {
 				throw new SecurityException("开启审批失败:未查询到审批信息");
 			}
-
-
 			AuditProecessDTO auditProecessDTO = new AuditProecessDTO();
-			// 追加跳转路由url
-			/*auditProecessDTO.setUrl(settlement.getUrl());
-			auditProecessDTO.setPageStatus(settlement.getPageStatus());
-			auditProecessDTO.setPageLabel(settlement.getPageLabel());*/
-			//增加审批类型
-
-
 			// 绑定审核类型
 			auditProecessDTO.setCheckType(order.getCheckType());
 			// 追加跳转路由url
@@ -1344,7 +1326,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			auditProecessDTO.setPageStatus(order.getPageStatus());
 			auditProecessDTO.setPageLabel(order.getPageLabel());
 			//增加审批类型
-
 			if (checkFlag == 1) {
 				auditProecessDTO.setProcessType("采购审批");
 			} else if (checkFlag == 2) {
@@ -1382,7 +1363,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");
 			}
-			if(checkFlag == 2 && ObjectUtils.isNotNull(value) && value.equals("1")){
+			if (checkFlag == 2 && ObjectUtils.isNotNull(value) && value.equals("1")) {
 				this.passCheck(order.getId());
 			}
 		}
@@ -1530,56 +1511,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (OrderTypeEnum.DOMESTIC.getType().equals(order.getTradeType()) || OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType().equals(order.getTradeType())) {
 			// 销售的逻辑
 			if (OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
-				// ===========================Start 审核通过锁定库存=============================
-				//获取此销售订单下,所有明细的库存
-				/*LambdaQueryWrapper<OrderItems> orderItemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-				orderItemsLambdaQueryWrapper
-					.eq(OrderItems::getGoodType, 0)
-					.eq(OrderItems::getPid, id)
-					.eq(OrderItems::getIsDeleted, 0);
-				List<OrderItems> orderItems = orderItemsMapper.selectList(orderItemsLambdaQueryWrapper);
-				if (CollectionUtils.isNotEmpty(orderItems)) {
-					orderItems.forEach(e -> {
-						StockGoods stockGoods = new StockGoods();
-						stockGoods.setCorpId(e.getCorpId());
-						stockGoods.setGoodsId(e.getItemId());
-						stockGoods.setTenantId(SecureUtil.getTenantId());
-						List<StockGoods> listStockGoods = stockGoodsClient.postListStockByCondition(stockGoods);
-						if (listStockGoods.size() > 1 || CollectionUtils.isEmpty(listStockGoods)) {
-							throw new SecurityException("锁定库存失败:未查询到库存 或者 存在多条库存记录");
-						}
-						//开始锁定库存,减少可用
-						StockGoods oneStock = stockGoodsClient.getOneStock(stockGoods);
-						if (oneStock == null) {
-							throw new SecurityException("锁定库存失败:未查询到库存信息");
-						}
-						//原单据的订货数量
-						BigDecimal orderQuantity = e.getOrderQuantity();
-						//可用库存
-						BigDecimal surplusRouteQuantity = oneStock.getSurplusRouteQuantity();
-						//锁定库存
-						BigDecimal lockingQuantity = oneStock.getLockingQuantity();
-
-						//判断比较大小
-						if (orderQuantity.compareTo(surplusRouteQuantity) == 1) {
-							throw new SecurityException("锁定库存失败:原单据的订货数量大于可用库存,无法锁定");
-						}
-						if (surplusRouteQuantity == null) {
-							throw new SecurityException("锁定库存失败:可用库存为空,禁止操作");
-						}
-						//减少可用库存
-						oneStock.setSurplusRouteQuantity(surplusRouteQuantity.subtract(orderQuantity == null ? new BigDecimal("0") : orderQuantity));
-						//增加锁定库存
-						oneStock.setLockingQuantity(lockingQuantity == null ? new BigDecimal("0").add(orderQuantity) : lockingQuantity.add(orderQuantity));
-						//更新库存
-						R r = stockGoodsClient.updateStock(oneStock);
-						if (!r.isSuccess()) {
-							throw new SecurityException("锁定库存失败: 更新失败");
-						}
-					});
-				}*/
-
-
 				/**===========================End 审核通过生成账单 发送消息=============================*/
 				//todo 国内贸易销售订单审批通过自动生成账单 同时给角色为财务的用户推送消息
 				this.paymentApply(order, "收费", "销售");
@@ -3229,7 +3160,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 		}
 		Date date = new Date();
-		if (ObjectUtils.isNull(order.getMemberBalance())){
+		if (ObjectUtils.isNull(order.getMemberBalance())) {
 			order.setMemberBalance(new BigDecimal("0.00"));
 		}
 		if (!"线上".equals(order.getOrderSource())) {
@@ -6416,7 +6347,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		order.setCostAmount(costAmount);
 		order.setGrossProfit(grossProfit);
 		order.setConfirmStatus(1);
-		if (ObjectUtils.isNull(order.getMemberBalance())){
+		if (ObjectUtils.isNull(order.getMemberBalance())) {
 			order.setMemberBalance(new BigDecimal("0.00"));
 		}
 		this.paymentApply(order, order.getBillType(), order.getTradeType());
@@ -7127,9 +7058,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		order.setActualPaymentStatus(1);
 		order.setStatus(0);
 		this.paymentApply(order, order.getBillType(), order.getTradeType());
-		if(ObjectUtils.isNotNull(order.getMemberBalance())){
+		if (ObjectUtils.isNotNull(order.getMemberBalance())) {
 			order.setDebitAmount(order.getOrderAmount().subtract(order.getMemberBalance()));
-		}else{
+		} else {
 			order.setDebitAmount(order.getOrderAmount());
 		}
 		order.setBalanceAmount(order.getOrderAmount());

blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamServiceController.java

@@ -87,16 +87,20 @@ public class ParamServiceController extends BladeController {
 	 * 获取参数值
 	 */
 	@GetMapping("/retrieveParameters")
-	public R<Boolean> retrieveParameters(String param) {
+	public R retrieveParameters(String param) {
 		ParamService paramService = paramServiceService.getOne(new LambdaQueryWrapper<ParamService>()
 			.eq(ParamService::getParamKey, param));
 		if (ObjectUtils.isNotNull(paramService)) {
 			if (!"681169".equals(paramService.getTenantId())) {
-				return R.data(!ObjectUtils.isNull(paramService.getParamValue()) && Boolean.parseBoolean(paramService.getParamValue()));
+				return R.data(paramService.getParamValue());
 			} else {
-				return R.data(true);
+				if("whether.display.member".equals(param)){
+					return R.data(paramService.getParamValue());
+				}else{
+					return R.data(true);
+				}
 			}
-		}else{
+		} else {
 			return R.data(false);
 		}
 	}

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.finance.excel;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
@@ -75,7 +76,7 @@ public class AccProfitStatisticsExcel implements Serializable {
 	/**
 	 * 日期
 	 */
-	@TableField(exist = false)
+	@ExcelIgnore
 	private List<String> dateList;
 
 	/**
@@ -111,21 +112,21 @@ public class AccProfitStatisticsExcel implements Serializable {
 	/**
 	 * 单据类型
 	 */
-	@TableField(exist = false)
+	@ExcelIgnore
 	private String billType;
 
-	@TableField(exist = false)
+	@ExcelIgnore
 	private String tenantId;
 
 	/**
 	 * 是否统计(0 = 合同号-默认、1 = 箱号)
 	 */
-	@TableField(exist = false)
+	@ExcelIgnore
 	private String whetherStatistics;
 
 	/**
 	 * 是否显示为 0
 	 */
-	@TableField(exist = false)
+	@ExcelIgnore
 	private String show;
 }