2024年7月4日17:19:02

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

@@ -1489,6 +1489,18 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private String date;
 
+	/**
+	 * 船务员（福达）
+	 */
+	@ApiModelProperty(value = "船务员")
+	private Long shipkeeperId;
+
+	/**
+	 * 船务员（福达）
+	 */
+	@ApiModelProperty(value = "船务员")
+	private String shipkeeperName;
+
 	public String get$buyerId() {
 		return $buyerId;
 	}

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -996,6 +996,18 @@ public class Order extends OrderBase {
 	@TableField(exist = false)
 	private List<String> dateList;
 
+	/**
+	 * 船务员（福达）
+	 */
+	@ApiModelProperty(value = "船务员")
+	private Long shipkeeperId;
+
+	/**
+	 * 船务员（福达）
+	 */
+	@ApiModelProperty(value = "船务员")
+	private String shipkeeperName;
+
 	public String get$buyerId() {
 		return $buyerId;
 	}

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -104,7 +104,7 @@ public class CorpsDescController extends BladeController {
 			corpIds.add(descVO.getId());
 		}
 		List<CorpsAddr> corpsAddrList = new ArrayList<>();
-		if (corpIds.size() > 0) {
+		if (!corpIds.isEmpty()) {
 			corpsAddrList = corpsAddrService.list(new LambdaQueryWrapper<CorpsAddr>()
 				.in(CorpsAddr::getPid, corpIds)
 				.eq(CorpsAddr::getIsDeleted, 0)
@@ -119,7 +119,7 @@ public class CorpsDescController extends BladeController {
 			updateUserList = userClient.selectUserIds(lists);
 		}
 		List<CorpsTypeDesc> corpsTypeDescList = new ArrayList<>();
-		if (corpIds.size() > 0) {
+		if (!corpIds.isEmpty()) {
 			corpsTypeDescList = corpsTypeDescService.list(new LambdaQueryWrapper<CorpsTypeDesc>()
 				.in(CorpsTypeDesc::getCorpId, corpIds));
 		}
@@ -149,21 +149,24 @@ public class CorpsDescController extends BladeController {
 				}
 				if (item.getBelongtocompany() != null) {
 					if (ObjectUtil.isNotEmpty(corpsDescList)) {
-						item.setBelongCompany(corpsDescList.stream().filter(e -> e.getId().toString().equals(item.getBelongtocompany())).findFirst().get().getCname());
+						CorpsDesc corpsDesc1 = corpsDescList.stream().filter(e -> e.getId().toString().equals(item.getBelongtocompany())).findFirst().orElse(null);
+						if (corpsDesc1 !=null){
+							item.setBelongCompany(corpsDesc1.getCname());
+						}
 					}
 				}
 				List<Long> corpsTypeDescList1 = finalCorpsTypeDescList.stream().filter(e -> e.getCorpId().equals(item.getId()))
 					.distinct().map(CorpsTypeDesc::getCorpTypeId).collect(Collectors.toList());
-				if (finalCorpsTypeList.size() > 0 && corpsTypeDescList1.size() > 0) {
+				if (!finalCorpsTypeList.isEmpty() && !corpsTypeDescList1.isEmpty()) {
 					String corpTypeName = finalCorpsTypeList.stream().filter(e -> corpsTypeDescList1.contains(e.getId()))
 						.map(CorpsType::getCname).collect(Collectors.joining(","));
 					item.setCorpsTypeName(corpTypeName);
 				}
 				if (!"577435".equals(AuthUtil.getTenantId())) {
 					//获取客户地址
-					if (finalCorpsAddrList.size() > 0) {
+					if (!finalCorpsAddrList.isEmpty()) {
 						List<CorpsAddr> corpsAddrs = finalCorpsAddrList.stream().filter(e -> e.getPid().equals(item.getId())).collect(Collectors.toList());
-						if (corpsAddrs.size() > 0) {
+						if (!corpsAddrs.isEmpty()) {
 							item.setAddr(corpsAddrs.get(0).getDetailedAddress());
 						}
 					}
@@ -249,7 +252,7 @@ public class CorpsDescController extends BladeController {
 				}
 				//获取客户地址
 				List<CorpsAddr> corpsAddrList = corpsAddrService.list(new QueryWrapper<CorpsAddr>().eq("pid", item.getId()).eq("is_deleted", 0));
-				if (corpsAddrList != null && corpsAddrList.size() > 0) {
+				if (corpsAddrList != null && !corpsAddrList.isEmpty()) {
 					item.setAddr(corpsAddrList.stream().map(CorpsAddr::getAddr).collect(Collectors.joining("-")));
 				}
 			});
@@ -324,7 +327,7 @@ public class CorpsDescController extends BladeController {
 		order.setCorpId(corpsDesc.getId());
 		order.setTenantId(AuthUtil.getTenantId());
 		R<List<Order>> byConditions = orderDescClient.getByConditions(order);
-		if (byConditions.isSuccess() && byConditions.getData().size() > 0) {
+		if (byConditions.isSuccess() && !byConditions.getData().isEmpty()) {
 			throw new SecurityException("存在绑定的订单信息,禁止删除");
 		}
 		//财务校验
@@ -332,7 +335,7 @@ public class CorpsDescController extends BladeController {
 		acc.setCorpId(corpsDesc.getId());
 		acc.setTenantId(AuthUtil.getTenantId());
 		R<List<Acc>> accListByCondition = financeClient.getAccListByCondition(acc);
-		if (accListByCondition.isSuccess() && accListByCondition.getData().size() > 0) {
+		if (accListByCondition.isSuccess() && !accListByCondition.getData().isEmpty()) {
 			throw new SecurityException("存在绑定的财务信息,禁止删除");
 		}
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescPartsController.java

@@ -334,7 +334,7 @@ public class CorpsDescPartsController extends BladeController {
 				}
 				//获取客户地址
 				List<CorpsAddr> corpsAddrList = corpsAddrService.list(new QueryWrapper<CorpsAddr>().eq("pid", item.getId()).eq("is_deleted", 0).eq("status", 0).eq("type", 0));
-				if (corpsAddrList != null && corpsAddrList.size() > 0) {
+				if (corpsAddrList != null && !corpsAddrList.isEmpty()) {
 					item.setAddr(corpsAddrList.get(0).getDetailedAddress());
 				}
 			});

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -193,7 +193,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 			.eq(CorpsAttn::getPid, corpId)
 			.eq(CorpsAttn::getIsDeleted, 0)
 		);
-		if (corpsAttnList.size() > 0) {
+		if (!corpsAttnList.isEmpty()) {
 			return corpsAttnList.stream().map(CorpsAttn::getUserId).collect(Collectors.toList());
 		} else {
 			return new ArrayList<>();
@@ -260,7 +260,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 	@Override
 	public R updateIntegral(Order order) {
 		List<OrderItems> orderItemsList = new ArrayList<>();
-		if (ObjectUtils.isNotNull(order.getOrderItemsList()) && order.getOrderItemsList().size() > 0) {
+		if (ObjectUtils.isNotNull(order.getOrderItemsList()) && !order.getOrderItemsList().isEmpty()) {
 			orderItemsList = order.getOrderItemsList();
 		} else {
 			R<List<OrderItems>> res = orderItemsClient.selectListYCP(order.getId(), AuthUtil.getTenantId());
@@ -276,7 +276,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 		StringBuilder goodsName = new StringBuilder();
 		StringBuilder goodsIds = new StringBuilder();
 
-		if (orderItemsList.size() > 0) {
+		if (!orderItemsList.isEmpty()) {
 			integralDetail.setSrcId(orderItemsList.get(0).getPid());
 			integralDetail.setSrcNo(order.getSysNo());
 			if (ObjectUtils.isNotNull(order.getCorpId()) && ObjectUtils.isNotNull(order.getStorageId())) {
@@ -286,7 +286,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 				if (ObjectUtils.isNull(storageDesc)) {
 					throw new RuntimeException("未找到仓库信息");
 				}
-				if (ObjectUtils.isNotNull(corpsDesc) && goodsId.size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc) && !goodsId.isEmpty()) {
 					List<GoodsDesc> goodsDescList = goodsDescService.list(new LambdaQueryWrapper<GoodsDesc>()
 						.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
 						.eq(GoodsDesc::getIsDeleted, 0)
@@ -348,7 +348,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 	@Override
 	public R revokeUpdateIntegral(Order order) {
 		List<OrderItems> orderItemsList = new ArrayList<>();
-		if (ObjectUtils.isNotNull(order.getOrderItemsList()) && order.getOrderItemsList().size() > 0) {
+		if (ObjectUtils.isNotNull(order.getOrderItemsList()) && !order.getOrderItemsList().isEmpty()) {
 			orderItemsList = order.getOrderItemsList();
 		} else {
 			R<List<OrderItems>> res = orderItemsClient.selectListYCP(order.getId(), AuthUtil.getTenantId());
@@ -363,7 +363,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 		integralDetail.setType("退款退货");
 		StringBuilder goodsName = new StringBuilder();
 		StringBuilder goodsIds = new StringBuilder();
-		if (orderItemsList.size() > 0) {
+		if (!orderItemsList.isEmpty()) {
 			integralDetail.setSrcId(orderItemsList.get(0).getPid());
 			integralDetail.setSrcNo(order.getSysNo());
 			if (ObjectUtils.isNotNull(order.getCorpId()) && ObjectUtils.isNotNull(order.getStorageId())) {
@@ -373,7 +373,7 @@ public class CorpsDescClient implements ICorpsDescClient {
 				if (ObjectUtils.isNull(storageDesc)) {
 					throw new RuntimeException("未找到仓库信息");
 				}
-				if (ObjectUtils.isNotNull(corpsDesc) && goodsId.size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc) && !goodsId.isEmpty()) {
 					List<GoodsDesc> goodsDescList = goodsDescService.list(new LambdaQueryWrapper<GoodsDesc>()
 						.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
 						.eq(GoodsDesc::getIsDeleted, 0)

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -757,12 +757,19 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 	 */
 	@Override
 	public List<CorpsDesc> selectByCorpIds(String ids) {
-		if (ids == null || ids.equals("") || ids.equals("null")) {
+		if (ids == null || ids.isEmpty() || ids.equals("null")) {
+			return new ArrayList<>();
+		}
+		List<Long> collect = new ArrayList<>();
+		List<String> str = Arrays.stream(ids.split(",")).collect(Collectors.toList());
+		for (String item : str){
+			if (ObjectUtils.isNotNull(item) && !item.equals("null")){
+				collect.add(Long.parseLong(item));
+			}
+		}
+		if (collect.isEmpty()){
 			return new ArrayList<>();
 		}
-		List<Long> collect = Arrays.stream(ids.split(","))
-			.map(s -> Long.parseLong(s.trim()))
-			.collect(Collectors.toList());
 		return baseMapper.selectByCorpIds(collect);
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/equipment/service/impl/CorpEquipmentArchivesServiceImpl.java

@@ -148,7 +148,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 					item.setUpdateTime(new Date());
 					item.setUpdateUser(AuthUtil.getUserId());
 				}
-				if (ObjectUtils.isNotNull(item.getFilesList()) && item.getFilesList().size() > 0) {
+				if (ObjectUtils.isNotNull(item.getFilesList()) && !item.getFilesList().isEmpty()) {
 					for (CorpEquipmentArchivesFiles filesItem : item.getFilesList()) {
 						if (filesItem.getId() == null) {
 							filesItem.setCreateTime(new Date());
@@ -196,7 +196,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 			}
 			corpEquipmentArchivesItemService.saveOrUpdateBatch(corpEquipmentArchives.getCorpEquipmentArchivesItemList());
 		}
-		if (ObjectUtils.isNotNull(corpEquipmentArchives.getFilesList()) && corpEquipmentArchives.getFilesList().size() > 0) {
+		if (ObjectUtils.isNotNull(corpEquipmentArchives.getFilesList()) && !corpEquipmentArchives.getFilesList().isEmpty()) {
 			for (CorpEquipmentArchivesFiles filesItem : corpEquipmentArchives.getFilesList()) {
 				if (filesItem.getId() == null) {
 					filesItem.setCreateTime(new Date());
@@ -211,7 +211,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 				filesList.add(filesItem);
 			}
 		}
-		if (filesList.size() > 0) {
+		if (!filesList.isEmpty()) {
 			long count = filesList.stream().filter(e -> "0".equals(e.getVersion())).count();
 			if (count > 1) {
 				throw new RuntimeException("存在多个主图，操作失败");

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -255,7 +255,7 @@ public class GoodsDescController extends BladeController {
 				}
 				e.setShoppingMall(finalShoppingMall);
 				List<StockGoods> list1 = stockGoodsList.stream().filter(i -> i.getGoodsId().equals(e.getId())).collect(Collectors.toList());
-				if (ObjectUtils.isNotNull(list1) && list1.size() > 0) {
+				if (ObjectUtils.isNotNull(list1) && !list1.isEmpty()) {
 					e.setStockGoodsNumber(list1.stream().map(StockGoods::getBalanceQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				}
 			});
@@ -526,7 +526,7 @@ public class GoodsDescController extends BladeController {
 
 
 		R<List<OrderItems>> listR = orderItemsClient.listByItemId(goodsDesc.getId(), null);
-		if (listR.isSuccess() && listR.getData().size() > 0) {
+		if (listR.isSuccess() && !listR.getData().isEmpty()) {
 			throw new SecurityException("存在绑定明细信息,禁止删除");
 		}
 		boolean status = goodsDescService.updateById(goodsDesc);
@@ -911,7 +911,7 @@ public class GoodsDescController extends BladeController {
 			StockGoods stockGoods = new StockGoods();
 			stockGoods.setGoodsId(good.getId());
 			List<StockGoods> stockGoodsList = stockGoodsClient.postListStockByCondition(stockGoods);
-			if (stockGoodsList.size() > 0) {
+			if (!stockGoodsList.isEmpty()) {
 				good.setStockGoodsList(stockGoodsList);
 			} else {
 				good.setStockGoodsList(new ArrayList<>());

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescPartsController.java

@@ -152,7 +152,7 @@ public class GoodsDescPartsController extends BladeController {
 			.eq(GoodsFiles::getPid, goodsId)
 			.eq(GoodsFiles::getIsDeleted, 0)
 		);
-		if (filesList.size() > 0) {
+		if (!filesList.isEmpty()) {
 			goodsDescDto.setUrl(filesList.get(0).getUrl());
 		}
 		goodsDescDto.setFilesList(filesList);
@@ -160,7 +160,7 @@ public class GoodsDescPartsController extends BladeController {
 		StockGoods stockGoods = new StockGoods();
 		stockGoods.setGoodsId(goodsId);
 		List<StockGoods> stockGoodsList = stockGoodsClient.postListStockByCondition(stockGoods);
-		if (stockGoodsList.size() > 0) {
+		if (!stockGoodsList.isEmpty()) {
 			goodsDescDto.setStockGoodsList(stockGoodsList);
 		} else {
 			goodsDescDto.setStockGoodsList(new ArrayList<>());
@@ -171,7 +171,7 @@ public class GoodsDescPartsController extends BladeController {
 		}
 		//获取本商品总共送货数量
 		R<List<OrderItems>> listR = orderItemsClient.listByItemId(goodsId, storageId);
-		if (listR.isSuccess() && listR.getData().size() > 0) {
+		if (listR.isSuccess() && !listR.getData().isEmpty()) {
 			BigDecimal actualQuantity = listR.getData().stream().map(OrderItems::getActualQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			goodsDescDto.setActualQuantity(actualQuantity.intValue());
 		}
@@ -241,7 +241,7 @@ public class GoodsDescPartsController extends BladeController {
 			return R.fail(500, "缺少参数");
 		}
 		R<List<OrderItems>> r = orderItemsClient.listByItemId(goodsDesc.getId(), null);
-		if (r.isSuccess() && r.getData().size() > 0) {
+		if (r.isSuccess() && !r.getData().isEmpty()) {
 			return R.fail(500, "该产品已有订单禁用失败");
 		}
 		if (ObjectUtils.isNotNull(goodsDesc.getStatus()) && 1 == goodsDesc.getStatus()) {

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -230,7 +230,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				.eq(GoodsFiles::getPid, id)
 				.eq(GoodsFiles::getIsDeleted, 0)
 			);
-			if (filesList.size() > 0) {
+			if (!filesList.isEmpty()) {
 				goodsDescVO.setUrl(filesList.get(0).getUrl());
 				goodsDescVO.setFilesList(filesList);
 			}
@@ -252,7 +252,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				.eq(GoodsFiles::getPid, id)
 				.eq(GoodsFiles::getIsDeleted, 0)
 			);
-			if (filesList.size() > 0) {
+			if (!filesList.isEmpty()) {
 				goodsDescVO.setUrl(filesList.get(0).getUrl());
 			}
 		}
@@ -832,7 +832,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 					brandDesc.setCname(e.getCategoryitem());
 					List<PjBrandDesc> pjBrandDescList = brandClient.getBrandList(brandDesc);
 					goodsDesc.setCategoryitem(e.getCategoryitem());
-					if (ObjectUtils.isNotNull(pjBrandDescList) && pjBrandDescList.size() > 0) {
+					if (ObjectUtils.isNotNull(pjBrandDescList) && !pjBrandDescList.isEmpty()) {
 						StringBuilder ids = new StringBuilder();
 						for (PjBrandDesc item : pjBrandDescList) {
 							ids.append(item.getId()).append(",");

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/StorageDescServiceImpl.java

@@ -19,6 +19,7 @@ package org.springblade.client.serial.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.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -131,13 +132,20 @@ public class StorageDescServiceImpl extends ServiceImpl<StorageDescMapper, Stora
 	}
 
 	@Override
-	public List<StorageDesc> selectStorageIds(String ids){
-		if (ids == null || ids.equals("")){
+	public List<StorageDesc> selectStorageIds(String ids) {
+		if (ids == null || ids.isEmpty() || ids.equals("null")) {
+			return new ArrayList<>();
+		}
+		List<Long> collect = new ArrayList<>();
+		List<String> str = Arrays.stream(ids.split(",")).collect(Collectors.toList());
+		for (String item : str){
+			if (ObjectUtils.isNotNull(item) && !item.equals("null")){
+				collect.add(Long.parseLong(item));
+			}
+		}
+		if (collect.isEmpty()){
 			return new ArrayList<>();
 		}
-		List<Long> collect = Arrays.stream(ids.split(","))
-			.map(s -> Long.parseLong(s.trim()))
-			.collect(Collectors.toList());
 		return baseMapper.selectStorageIds(collect);
 	}
 
@@ -177,7 +185,7 @@ public class StorageDescServiceImpl extends ServiceImpl<StorageDescMapper, Stora
 			storageType.setUpdateUser(SecureUtil.getUserId());
 			storageTypeService.updateById(storageType);
 			LambdaQueryWrapper<StorageTypeDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(StorageTypeDesc::getStorageTypeId,storageType.getId())
+			lambdaQueryWrapper.eq(StorageTypeDesc::getStorageTypeId, storageType.getId())
 				.eq(StorageTypeDesc::getTenantId, AuthUtil.getTenantId());
 			List<StorageTypeDesc> storageTypeDescList = storageTypeDescService.list(lambdaQueryWrapper);
 //			List<StorageDesc> storageDescList = baseMapper.selectList(new LambdaQueryWrapper<StorageDesc>().eq(StorageDesc::getStorageTypeId, storageType.getId()).eq(StorageDesc::getIsDeleted, 0).eq(StorageDesc::getTenantId, AuthUtil.getTenantId()));

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

@@ -204,13 +204,13 @@ public class DeliveryClient implements IDeliveryClient {
 			deliveryService.save(delivery);
 			deliveryNew = delivery;
 		}
-		if (ObjectUtils.isNotNull(order.getOrderItemsList()) && order.getOrderItemsList().size() > 0) {
+		if (ObjectUtils.isNotNull(order.getOrderItemsList()) && !order.getOrderItemsList().isEmpty()) {
 			LambdaQueryWrapper<DeliveryItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			itemsLambdaQueryWrapper.eq(DeliveryItems::getIsDeleted, 0)
 				.eq(DeliveryItems::getTenantId, AuthUtil.getTenantId())
 				.eq(DeliveryItems::getPid, deliveryNew.getId());
 			List<DeliveryItems> deliveryItemsList1 = deliveryItemsService.list(itemsLambdaQueryWrapper);
-			if (deliveryItemsList1.size() > 0) {
+			if (!deliveryItemsList1.isEmpty()) {
 				deliveryItemsService.removeByIds(deliveryItemsList1.stream().map(DeliveryItems::getId).collect(Collectors.toList()));
 			}
 			for (OrderItems orderItems : order.getOrderItemsList()) {
@@ -245,16 +245,16 @@ public class DeliveryClient implements IDeliveryClient {
 				deliveryItems.setRemarks(orderItems.getRemarks());
 				deliveryItemsList.add(deliveryItems);
 			}
-			if (deliveryItemsList.size() > 0) {
+			if (!deliveryItemsList.isEmpty()) {
 				deliveryItemsService.saveOrUpdateBatch(deliveryItemsList);
 			}
-			if (ObjectUtils.isNotNull(order.getOrderFeesList()) && order.getOrderFeesList().size() > 0) {
+			if (ObjectUtils.isNotNull(order.getOrderFeesList()) && !order.getOrderFeesList().isEmpty()) {
 				LambdaQueryWrapper<DeliveryFees> feesLambdaQueryWrapper = new LambdaQueryWrapper<>();
 				feesLambdaQueryWrapper.eq(DeliveryFees::getIsDeleted, 0)
 					.eq(DeliveryFees::getTenantId, AuthUtil.getTenantId())
 					.eq(DeliveryFees::getPid, deliveryNew.getId());
 				List<DeliveryFees> deliveryFees1 = feesService.list(feesLambdaQueryWrapper);
-				if (deliveryFees1.size() > 0) {
+				if (!deliveryFees1.isEmpty()) {
 					feesService.removeByIds(deliveryFees1.stream().map(DeliveryFees::getId).collect(Collectors.toList()));
 				}
 				for (OrderFees orderFees : order.getOrderFeesList()) {
@@ -281,7 +281,7 @@ public class DeliveryClient implements IDeliveryClient {
 					deliveryFeesList.add(deliveryFees);
 				}
 			}
-			if (deliveryFeesList.size() > 0) {
+			if (!deliveryFeesList.isEmpty()) {
 				feesService.saveOrUpdateBatch(deliveryFeesList);
 			}
 			deliveryNew.setDeliveryItemsList(deliveryItemsList);

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

@@ -969,10 +969,10 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				.eq(DeliveryFees::getIsDeleted, 0));
 			BigDecimal orderFeesAmount = new BigDecimal("0.00");
 			BigDecimal deliveryFeesAmount = new BigDecimal("0.00");
-			if (ObjectUtils.isNotNull(orderFees) && orderFees.size() > 0) {
+			if (ObjectUtils.isNotNull(orderFees) && !orderFees.isEmpty()) {
 				orderFeesAmount = orderFees.stream().map(OrderFees::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			}
-			if (ObjectUtils.isNotNull(deliveryFees) && deliveryFees.size() > 0) {
+			if (ObjectUtils.isNotNull(deliveryFees) && !deliveryFees.isEmpty()) {
 				deliveryFeesAmount = deliveryFees.stream().map(DeliveryFees::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			}
 			packageAmount = orderFeesAmount.subtract(deliveryFeesAmount);
@@ -1194,7 +1194,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	public List<CorpNumberVO> corpNumberV1(DeliveryVO delivery) {
 		List<CorpNumberVO> list = new ArrayList<>();
 		List<CorpNumberVOV1> mapList = baseMapper.corpNumberV1(delivery);
-		if (mapList.size() > 0) {
+		if (!mapList.isEmpty()) {
 			List<String> brandList = mapList.stream().map(CorpNumberVOV1::getBrand).distinct().collect(Collectors.toList());
 			for (String item : brandList) {
 				CorpNumberVO corpNumberVO = new CorpNumberVO();

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

@@ -1761,7 +1761,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		if (status > 0) {
 			throw new RuntimeException("已选数据存在未确认到货数据，生成凭证失败");
 		}
-		if (corpIds.size() > 0) {
+		if (!corpIds.isEmpty()) {
 			//客户信息
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(corpIds.get(0));
 			if (corpMessage.isSuccess() && corpMessage.getData() != null) {
@@ -1839,7 +1839,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 
 		//=============生成凭证所需信息==============
 		String accountName = "暂无";
-		if (belongCompany.size() > 0) {
+		if (!belongCompany.isEmpty()) {
 			accountName = belongCompany.get(0);
 		}
 		if ("A青岛达沃特轮胎有限公司".equals(accountName)) {
@@ -1852,7 +1852,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				String saleOrderNoNew = "";
 				if (index > 0) {
 					saleOrderNoNew = saleOrderNo.substring(0, index);
-					if (deliveryList.size() > 0) {
+					if (!deliveryList.isEmpty()) {
 						saleOrderNoNew = saleOrderNoNew + "...";
 					}
 				}
@@ -1860,7 +1860,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				String purchaseOrderNoNew = "";
 				if (index1 > 0) {
 					purchaseOrderNoNew = saleOrderNo.substring(0, index1);
-					if (deliveryList.size() > 0) {
+					if (!deliveryList.isEmpty()) {
 						purchaseOrderNoNew = purchaseOrderNoNew + "...";
 					}
 				}
@@ -2839,7 +2839,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			List<DeliveryFees> deliveryFeesList = delivery.getDeliveryFeesList();
 			BigDecimal amount = new BigDecimal("0.00");
 			//逐条计算费用税
-			if(ObjectUtils.isNotNull(deliveryFeesList) && deliveryFeesList.size()>0){
+			if(ObjectUtils.isNotNull(deliveryFeesList) && !deliveryFeesList.isEmpty()){
 				for (DeliveryFees item : deliveryFeesList) {
 					if (ObjectUtils.isNotNull(item.getAmount()) && !new BigDecimal("0.00").equals(item.getAmount())) {
 						costAmount = costAmount.add(item.getAmount().divide(new BigDecimal("1.13"), MathContext.DECIMAL32)

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

@@ -67,7 +67,7 @@ public class DataAnalysisController {
 		order.setBillType("XS");
 		order.setTradeType("GN");
 		List<Order> orderList = orderService.turnoverAnalysisDWTList("XS", null, statusDate, endDate);
-		if (orderList.size() > 0 && !income.equals(new BigDecimal("0.00"))) {
+		if (!orderList.isEmpty() && !income.equals(new BigDecimal("0.00"))) {
 			averageAmount = averageAmount.add(income.divide(new BigDecimal(orderList.size()), MathContext.DECIMAL32).setScale(2, BigDecimal.ROUND_HALF_UP));
 		}
 		if (!new BigDecimal("0.00").equals(income)){

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

@@ -96,7 +96,6 @@ public class ExportEnquiryController extends BladeController {
 		lambdaQueryWrapper.eq(Order::getTenantId, SecureUtil.getTenantId());//租户id
 		lambdaQueryWrapper.eq(Order::getIsDeleted, 0);//订单是否有效
 		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.ENQUIRY.getType());//订单类型
-//		lambdaQueryWrapper.apply("find_in_set(bill_type,'BJ,XS')");//订单类型
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType());//贸易类型
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderNo()), Order::getOrderNo, order.getOrderNo());//订单号
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId());//客户id

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

@@ -394,7 +394,7 @@ public class OrderDescClient implements IOrderDescClient {
 		if (ObjectUtils.isNotNull(order.getCorpId())) {
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(order.getCorpId());
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && corpsDesc.getCorpsAddrList().size() > 0) {
+				if (ObjectUtils.isNotNull(corpsDesc.getCorpsAddrList()) && !corpsDesc.getCorpsAddrList().isEmpty()) {
 					order.setArrivalAddress(corpsDesc.getCorpsAddrList().get(0).getDetailedAddress());
 				}
 				corpsDesc.setBalanceAmount(corpsDesc.getBalanceAmount().add(order.getMemberBalance()));

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

@@ -139,7 +139,7 @@ public class AppPartsController extends BladeController {
 			if (ObjectUtils.isNotNull(order.getCorpsName())) {
 				String corpsName = order.getCorpsName().replaceAll(" ", "");
 				List<Long> ids = corpsDescClient.listCorpIdByName(corpsName);
-				if (ObjectUtils.isNotNull(ids) && ids.size() > 0) {
+				if (ObjectUtils.isNotNull(ids) && !ids.isEmpty()) {
 					lambdaQueryWrapper.in(Order::getCorpId, ids);//客户id
 				} else {
 					lambdaQueryWrapper.isNull(Order::getCorpId);
@@ -476,7 +476,7 @@ public class AppPartsController extends BladeController {
 		order.setBillType("XS");
 		order.setTradeType("YPJ");
 		List<Order> orderList = orderService.turnoverAnalysisList("XS", null, statusDate, endDate);
-		if (orderList.size() > 0 && !income.equals(new BigDecimal("0.00"))) {
+		if (!orderList.isEmpty() && !income.equals(new BigDecimal("0.00"))) {
 			averageAmount = averageAmount.add(income.divide(new BigDecimal(orderList.size()), MathContext.DECIMAL32).setScale(2, BigDecimal.ROUND_HALF_UP));
 		}
 		map.put("income", income);
@@ -500,7 +500,7 @@ public class AppPartsController extends BladeController {
 		if (ObjectUtils.isNotNull(order.getCorpsName())) {
 			String corpsName = order.getCorpsName().replaceAll(" ", "");
 			List<Long> ids = corpsDescClient.listCorpIdByName(corpsName);
-			if (ObjectUtils.isNotNull(ids) && ids.size() > 0) {
+			if (ObjectUtils.isNotNull(ids) && !ids.isEmpty()) {
 				lambdaQueryWrapper.in(Order::getCorpId, ids);//客户id
 			} else {
 				lambdaQueryWrapper.isNull(Order::getCorpId);
@@ -550,7 +550,7 @@ public class AppPartsController extends BladeController {
 		if (ObjectUtils.isNotNull(order.getCorpsName())) {
 			String corpsName = order.getCorpsName().replaceAll(" ", "");
 			List<Long> ids = corpsDescClient.listCorpIdByName(corpsName);
-			if (ObjectUtils.isNotNull(ids) && ids.size() > 0) {
+			if (ObjectUtils.isNotNull(ids) && !ids.isEmpty()) {
 				lambdaQueryWrapper.in(Order::getCorpId, ids);//客户id
 			} else {
 				lambdaQueryWrapper.isNull(Order::getCorpId);

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

@@ -95,7 +95,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 				bidingAgentMapper.updateById(bidingAgent);
 			}
 		}
-		if (ObjectUtils.isNull(list) || list.size() == 0) {
+		if (ObjectUtils.isNull(list) || list.isEmpty()) {
 			return list;
 		}
 

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

@@ -143,7 +143,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 				stockGoods.setItemType(goods.getData().getTypeno());
 				stockGoods.setWarehouseId(warehouseId);
 				List<StockGoods> stock = stockGoodsClient.selectStockList(stockGoods);
-				if (stock != null && stock.size() > 0) {
+				if (stock != null && !stock.isEmpty()) {
 					orderItems.setStorageQuantity(stock.get(0).getSurplusRouteQuantity());
 					orderItems.setStorageId(stock.get(0).getStorageId());
 					orderItems.setStorageName(stock.get(0).getStockName());
@@ -292,7 +292,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	public List<OrderItems> getOrderItems(Order order) {
 		//判断订单明细的ids是否有值，有则查对应的订单明细 无则查所有的明细
 		List<OrderItems> orderItemsList = new ArrayList<>();
-		if (ObjectUtils.isNull(order.getOrderItemIds()) || order.getOrderItemIds().size() == 0) {
+		if (ObjectUtils.isNull(order.getOrderItemIds()) || order.getOrderItemIds().isEmpty()) {
 			orderItemsList = baseMapper.selectList(new QueryWrapper<OrderItems>().eq("pid", order.getId())
 				.eq("tenant_id", AuthUtil.getTenantId()).eq("is_deleted", 0));
 		} else {

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

@@ -1561,11 +1561,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw new SecurityException("订单已审批通过请勿重复审批");
 		}
 		order.setStatus(3);
-		order.setOrderStatus(OrderStatusEnum.PASS.getType());
-		//福达审核通过更改状态为审核通过
-		order.setFudaPurchaseStatus(OrderStatusEnum.PASS.getType());
-		order.setFudaPurchaseDate(new Date());
-		baseMapper.updateById(order);
 		// ===========================end 审核通过修改销售订单信息==========================
 
 		if (OrderTypeEnum.DOMESTIC.getType().equals(order.getTradeType()) || OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType().equals(order.getTradeType())) {
@@ -1642,28 +1637,44 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			if (OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
 				this.paymentApply(order, "收费", "销售");
 			}
+			order.setOrderStatus(OrderStatusEnum.PASS.getType());
 		} else if (OrderTypeEnum.EXPORT.getType().equals(order.getTradeType())) {
 			if (OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
 				this.paymentApplyFD(order, "收费", "销售");
-				//发送消息跟单
-				Message sendMessage = new Message();
-				sendMessage.setParameter(String.valueOf(order.getId()));
-				sendMessage.setUserName(AuthUtil.getUserName());
-				sendMessage.setUserId(AuthUtil.getUserId());
-				sendMessage.setToUserId(order.getDocumenterId());
-				sendMessage.setToUserName(order.getDocumenterName());
-				sendMessage.setMessageType(1);
-				sendMessage.setTenantId(AuthUtil.getTenantId());
-				sendMessage.setCreateUser(AuthUtil.getUserId());
-				sendMessage.setCreateTime(new Date());
-				sendMessage.setUrl("/exportTrade/invoice/index");
-				sendMessage.setPageLabel(order.getPageLabel());
-				sendMessage.setPageStatus(order.getPageStatus());
-				sendMessage.setMessageBody("销售订单" + order.getOrderNo() + "已审核通过");
-				R save = messageClient.save(sendMessage);
-				if (!save.isSuccess()) {
-					throw new SecurityException("发送消息失败");
+				LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.eq(OrderItems::getPid, order.getId()).eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getTenantId, AuthUtil.getTenantId());
+				// 获取销售单明细数据
+				List<OrderItems> orderItemsList = orderItemsMapper.selectList(lambdaQueryWrapper);
+				BigDecimal sum = new BigDecimal("0.00");
+				for (OrderItems orderItems : orderItemsList) {
+					orderItems.setFudaPurchaseStatus("待采购");
+					//瓶帽配件
+					orderPartsService.remove(new LambdaQueryWrapper<OrderParts>().eq(OrderParts::getTenantId, AuthUtil.getTenantId()).eq(OrderParts::getPid, orderItems.getId()));
+					if (ObjectUtils.isNotNull(orderItems.getPartsCapValue())) {
+						JSONArray objects = JSONArray.parseArray(orderItems.getPartsCapValue());
+						List<OrderParts> categoryConstantInfos = objects.toJavaList(OrderParts.class);
+						if (ObjectUtils.isNotNull(categoryConstantInfos) && !categoryConstantInfos.isEmpty()) {
+							sum = sum.add(categoryConstantInfos.stream().map(OrderParts::getGoodNumber).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						}
+						saveOrderParts(categoryConstantInfos, orderItems.getId(), "3", order.getId(), orderItems.getOrderQuantity());
+					}
+					//阀门配件
+					if (ObjectUtils.isNotNull(orderItems.getPartsValveValue())) {
+						JSONArray objects = JSONArray.parseArray(orderItems.getPartsValveValue());
+						List<OrderParts> categoryConstantInfos = objects.toJavaList(OrderParts.class);
+						if (ObjectUtils.isNotNull(categoryConstantInfos) && !categoryConstantInfos.isEmpty()) {
+							sum = sum.add(categoryConstantInfos.stream().map(OrderParts::getGoodNumber).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+						}
+						saveOrderParts(categoryConstantInfos, orderItems.getId(), "4", order.getId(), orderItems.getOrderQuantity());
+					}
 				}
+				orderItemsService.updateBatchById(orderItemsList);
+				//福达审核通过更改状态为审核通过
+				order.setProductionScheduling("待采购");
+				order.setOrderStatus("待采购");
+				order.setFudaPurchaseDate(new Date());
+				order.setProductionSchedulingDate(new Date());
+				order.setStorageQuantityPj(sum);
 				//发送消息采购
 				Message message = new Message();
 				message.setParameter(String.valueOf(order.getId()));
@@ -1683,10 +1694,37 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (!save1.isSuccess()) {
 					throw new SecurityException("发送消息失败");
 				}
+				//跟单生成
+				order.setOrderItemsList(orderItemsList);
+				order.setDeliverQuantity(orderItemsList.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
+				order.setDocumentaryDate(order.getDocumentaryDate());
+				// 获取订单费用信息
+				List<OrderFees> orderFeesList = orderFeesService.getOrderFees(order);
+				order.setOrderFeesList(orderFeesList);
+				deliveryClient.saveAddDelivery(order);
+				//发送消息跟单
+				Message sendMessage = new Message();
+				sendMessage.setParameter(String.valueOf(order.getId()));
+				sendMessage.setUserName(AuthUtil.getUserName());
+				sendMessage.setUserId(AuthUtil.getUserId());
+				sendMessage.setToUserId(order.getDocumenterId());
+				sendMessage.setToUserName(order.getDocumenterName());
+				sendMessage.setMessageType(1);
+				sendMessage.setTenantId(AuthUtil.getTenantId());
+				sendMessage.setCreateUser(AuthUtil.getUserId());
+				sendMessage.setCreateTime(new Date());
+				sendMessage.setUrl("/exportTrade/invoice/index");
+				sendMessage.setPageLabel(order.getPageLabel());
+				sendMessage.setPageStatus(order.getPageStatus());
+				sendMessage.setMessageBody("销售订单" + order.getOrderNo() + "已审核通过");
+				R save = messageClient.save(sendMessage);
+				if (!save.isSuccess()) {
+					throw new SecurityException("发送消息失败");
+				}
+
 			}
 		}
-
-
+		baseMapper.updateById(order);
 	}
 
 	@Override
@@ -8583,7 +8621,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		price = amount;
 		Items items = new Items();
 		items.setBelongToCorpId(order.getBelongToCorpId());
-		items.setSrcOrderno(order.getOrgOrderNo());
+		if(ObjectUtils.isNotNull(order.getOrgOrderNo())){
+			items.setSrcOrderno(order.getOrgOrderNo());
+		}else{
+			items.setSrcOrderno(order.getOrderNo());
+		}
 		items.setItemType(itemType);
 		items.setCorpId(order.getCorpId());
 		items.setSrcParentId(order.getId());

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/wing/accessories/WebpageController.java

@@ -115,7 +115,7 @@ public class WebpageController {
 			if (ObjectUtils.isNotNull(order.getCorpsName())) {
 				String corpsName = order.getCorpsName().replaceAll(" ", "");
 				List<Long> ids = corpsDescClient.listCorpIdByName(corpsName);
-				if (ObjectUtils.isNotNull(ids) && ids.size() > 0) {
+				if (ObjectUtils.isNotNull(ids) && !ids.isEmpty()) {
 					//客户id
 					lambdaQueryWrapper.in(Order::getCorpId, ids);
 				}/* else {

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -98,7 +98,9 @@ public class ShippingEnquiry extends BladeController {
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Order::getTenantId, SecureUtil.getTenantId());//租户id
 		lambdaQueryWrapper.eq(Order::getIsDeleted, 0);//订单是否有效
-		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.ENQUIRY.getType());//订单类型
+//		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.ENQUIRY.getType());//订单类型
+		lambdaQueryWrapper.apply("find_in_set(bill_type,'BJ,XS')");//订单类型
+		lambdaQueryWrapper.apply("if_shipping is not null");//订单类型
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType());//贸易类型
 		lambdaQueryWrapper.and(i ->i.eq(Order::getIfShipping,"已提交").or().eq(Order::getIfShipping,"船务确认"));//船务询价
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderNo()), Order::getOrderNo, order.getOrderNo());//订单号
@@ -202,8 +204,13 @@ public class ShippingEnquiry extends BladeController {
 		sendMessage.setParameter(String.valueOf(orderMessage.getId()));
 		sendMessage.setUserName(AuthUtil.getUserName());
 		sendMessage.setUserId(AuthUtil.getUserId());
-		sendMessage.setToUserId(orderMessage.getDocumenterId());
-		sendMessage.setToUserName(orderMessage.getDocumenterName());
+		if("XS".equals(order.getSrcBillType())){
+			sendMessage.setToUserId(orderMessage.getShipkeeperId());
+			sendMessage.setToUserName(orderMessage.getShipkeeperName());
+		}else{
+			sendMessage.setToUserId(orderMessage.getDocumenterId());
+			sendMessage.setToUserName(orderMessage.getDocumenterName());
+		}
 		sendMessage.setMessageType(1);
 		sendMessage.setTenantId(AuthUtil.getTenantId());
 		sendMessage.setCreateUser(AuthUtil.getUserId());
@@ -307,7 +314,7 @@ public class ShippingEnquiry extends BladeController {
 		if (StringUtils.isNotBlank(submitDto.getIfShipping()) && submitDto.getIfShipping().equals("船务确认")){
 			throw new RuntimeException("请勿重复提交");
 		}
-		submitDto.setBillType(OrderTypeEnum.ENQUIRY.getType());
+//		submitDto.setBillType(OrderTypeEnum.ENQUIRY.getType());
 		submitDto.setTradeTypeEnum(OrderTypeEnum.EXPORT);
 		return orderService.commit(submitDto);
 	}

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

@@ -173,7 +173,7 @@ public class WoodHarvestingCloudController {
 		queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
 		queryWrapper.eq("is_deleted", 0);
 		List<OrderItems> orderItemsList = orderItemsService.list(queryWrapper);
-		if (orderItemsList.size() > 0) {
+		if (!orderItemsList.isEmpty()) {
 			return R.fail("该单据存在明细不能删除");
 		}
 		return R.status(orderService.removeById(id));

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

@@ -1273,7 +1273,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							throw new Error("捆包号：" + orderItems.getBillNo() + "不允许重复");
 						}
 					} else {
-						if (orderItemsBillNo.size() > 0) {
+						if (!orderItemsBillNo.isEmpty()) {
 							throw new Error("捆包号：" + orderItems.getBillNo() + "不允许重复");
 						}
 					}
@@ -1398,7 +1398,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							throw new Error("捆包号：" + orderItems.getBillNo() + "不允许重复");
 						}
 					} else {
-						if (orderItemsBillNo.size() > 0) {
+						if (!orderItemsBillNo.isEmpty()) {
 							throw new Error("捆包号：" + orderItems.getBillNo() + "不允许重复");
 						}
 					}