20230308 17:06

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/BusinessOverpaymentItem.java

@@ -154,4 +154,10 @@ public class BusinessOverpaymentItem implements Serializable {
 	@TableField(exist = false)
 	private Long corpId;
 
+	/**
+	 * 生成标识（0 系统生成  1手动添加）
+	 */
+	@ApiModelProperty(value = "生成标识（0 系统生成  1 手动添加）")
+	private Integer identifier;
+
 }

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

@@ -428,8 +428,9 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			}
 
 			auditProecessDTO.setCorpsName(declare.getAbroadName());
-			auditProecessDTO.setCorpId(Long.valueOf(declare.getAbroadNo()));
-
+			if (ObjectUtil.isNotEmpty(declare.getAbroadNo())){
+				auditProecessDTO.setCorpId(Long.valueOf(declare.getAbroadNo()));
+			}
 		} else if ("BGCK".equals(declareCustoms.getImportExportSigns())) {//报关出口审批流程
 			if (declare.getStatus() == 0) {
 				//是否开启流程
@@ -448,7 +449,9 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			}
 
 			auditProecessDTO.setCorpsName(declare.getDomesticName());
-			auditProecessDTO.setCorpId(Long.valueOf(declare.getDomesticNo()));
+			if (ObjectUtil.isNotEmpty(declare.getDomesticNo())){
+				auditProecessDTO.setCorpId(Long.valueOf(declare.getDomesticNo()));
+			}
 		} else {
 			throw new SecurityException("缺少必要参数，审批失败");
 		}
@@ -654,7 +657,7 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 			if (customs.getStatus() == 0){
 				throw new SecurityException("撤销失败,订单未提交审核");
 			}
-			if (role.contains("admin")){
+			if (role.contains("admin")){//管理员初审通过也可以撤销
 				if (customs.getStatus() > 4){
 					throw new SecurityException("撤销失败,订单已进入复审流程");
 				}

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

@@ -35,6 +35,7 @@ import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -62,8 +63,9 @@ public class CorpsDescController extends BladeController {
 	private final IFinanceClient financeClient;
 	private final ICorpsTypeDescService corpsTypeDescService;
 	private final IRedisClient redisClient;//redis缓存处理
-	private CorpsAddrServiceImpl corpsAddrService;
-	private CorpsAttnServiceImpl corpsAttnService;
+	private final RedisTemplate<String, Object> redisTemplate;
+	private final CorpsAddrServiceImpl corpsAddrService;
+	private final CorpsAttnServiceImpl corpsAttnService;
 
 	/**
 	 * 详情
@@ -536,6 +538,7 @@ public class CorpsDescController extends BladeController {
 			throw new SecurityException("缺少必要的参数，客户类型");
 		}
 		redisClient.basicData("corps");
+		List<CorpsDesc> corpsDescAll = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
 		//获取客户类别及其子类别
 		List<Long> corpsTypeIdList = new ArrayList<>();
 		if (StringUtils.isNotBlank(corpsDesc.getCorpsTypeName())) {
@@ -594,7 +597,7 @@ public class CorpsDescController extends BladeController {
 		List<CorpListVo> voList = BeanUtil.copy(corpsDescList, CorpListVo.class);
 		voList.forEach(desc -> {
 			if (StringUtils.isNotBlank(desc.getBelongtocompany())) {
-				CorpsDesc company = corpsDescService.getById(desc.getBelongtocompany());
+				CorpsDesc company = corpsDescAll.stream().filter(e -> e.getId().equals(desc.getBelongtocompany())).findFirst().orElse(null);
 				if (company != null) {
 					desc.setBelongCompany(company.getCname());
 				}
@@ -944,4 +947,26 @@ public class CorpsDescController extends BladeController {
 		return R.data(mapList);
 	}
 
+
+	/**
+	 * 将Object转换成List类型
+	 *
+	 * @param obj   Object对象
+	 * @param clazz 数据类型
+	 * @param <T>   泛型类型
+	 * @return List类型
+	 */
+	public static <T> List<T> castToList(Object obj, Class<T> clazz) {
+		List<T> resList = new ArrayList<>();
+		// 如果不是List<?>对象，是没有办法转换的
+		if (obj instanceof List<?>) {
+			for (Object o : (List<?>) obj) {
+				// 将对应的元素进行类型转换
+				resList.add(clazz.cast(o));
+			}
+			return resList;
+		}
+		return resList;
+	}
+
 }

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

@@ -121,6 +121,7 @@ public class ReCeVingController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()), Delivery::getBusinessDate, delivery.getBusinessEndDate());//收货日期结束
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()), Delivery::getCreateUser, delivery.getCreateUser());//制单人
 		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()), Delivery::getStorageId, delivery.getStorageId());//仓库
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getDeliveryStatus()), Delivery::getDeliveryStatus, delivery.getDeliveryStatus());//状态
 		lambdaQueryWrapper.orderByDesc(Delivery::getCreateTime);
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/BusinessOverpaymentItemServiceImpl.java

@@ -60,6 +60,7 @@ public class BusinessOverpaymentItemServiceImpl extends ServiceImpl<BusinessOver
 			businessOverpaymentItem.setCreateTime(new Date());
 			businessOverpaymentItem.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 			businessOverpaymentItem.setTenantId(AuthUtil.getTenantId());
+			businessOverpaymentItem.setIdentifier(1);
 			baseMapper.insert(businessOverpaymentItem);
 		} else {
 			businessOverpaymentItem.setUpdateUser(AuthUtil.getUserId());

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/BusinessOverpaymentServiceImpl.java

@@ -125,6 +125,7 @@ public class BusinessOverpaymentServiceImpl extends ServiceImpl<BusinessOverpaym
 					businessOverpaymentItem.setCreateTime(new Date());
 					businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
 					businessOverpaymentItem.setOverpaymentType(0);
+					businessOverpaymentItem.setIdentifier(0);
 					businessOverpaymentItemMapper.insert(businessOverpaymentItem);
 				}else {
 					businessOverpaymentItem.setPid(pid);
@@ -132,6 +133,7 @@ public class BusinessOverpaymentServiceImpl extends ServiceImpl<BusinessOverpaym
 					businessOverpaymentItem.setUpdateTime(new Date());
 					businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
 					businessOverpaymentItem.setOverpaymentType(0);
+					businessOverpaymentItem.setIdentifier(0);
 					businessOverpaymentItemMapper.updateById(businessOverpaymentItem);
 				}
 			}
@@ -144,6 +146,7 @@ public class BusinessOverpaymentServiceImpl extends ServiceImpl<BusinessOverpaym
 						businessOverpaymentItem.setCreateTime(new Date());
 						businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
 						businessOverpaymentItem.setOverpaymentType(1);
+						businessOverpaymentItem.setIdentifier(0);
 						businessOverpaymentItemMapper.insert(businessOverpaymentItem);
 					}else {
 						businessOverpaymentItem.setPid(pid);
@@ -151,6 +154,7 @@ public class BusinessOverpaymentServiceImpl extends ServiceImpl<BusinessOverpaym
 						businessOverpaymentItem.setUpdateTime(new Date());
 						businessOverpaymentItem.setTenantId(SecureUtil.getTenantId());
 						businessOverpaymentItem.setOverpaymentType(1);
+						businessOverpaymentItem.setIdentifier(0);
 						businessOverpaymentItemMapper.updateById(businessOverpaymentItem);
 					}
 				}

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

@@ -161,28 +161,23 @@ public class PurchaseOrderController extends BladeController {
 					 @RequestParam(value = "paymentType", required = false) String paymentType,//付款方式
 					 @RequestParam(value = "createStartTime", required = false) String createStartTime,//制单日期
 					 @RequestParam(value = "createEndTime", required = false) String createEndTime,//制单日期
-
-
 					 @RequestParam(value = "businesStartDate", required = false) String businesStartDate,//订单开始时间  busines_date
 					 @RequestParam(value = "businesEndDate", required = false) String businesEndDate,//订单结束时间
 					 @RequestParam(value = "accountsCollectionStartDate", required = false) String accountsCollectionStartDate,//应收(付)款开始时间  accounts_collection_date
 					 @RequestParam(value = "accountsCollectionEndDate", required = false) String accountsCollectionEndDate,//应收(付)款结束时间
-
 					 @RequestParam(value = "dateOfStartArrival", required = false) String dateOfStartArrival,//实际到港开始日期 date_of_arrival
 					 @RequestParam(value = "dateOfEndArrival", required = false) String dateOfEndArrival,//实际到港结束时间,
-
 					 @RequestParam(value = "requiredDeliveryStartDate", required = false) String requiredDeliveryStartDate,//要求发货开始日期  required_delivery_date
 					 @RequestParam(value = "requiredDeliveryEndDate", required = false) String requiredDeliveryEndDate,//要求发货结束时间
-
 					 @RequestParam(value = "requiredArrivalStartDate", required = false) String requiredArrivalStartDate,//要求到货开始日期  required_arrival_date
 					 @RequestParam(value = "requiredArrivalEndDate", required = false) String requiredArrivalEndDate,//要求到货结束日期
-
 					 @RequestParam(value = "creditStartDate", required = false) String creditStartDate,//信用证到期日-开始日期  credit_date
 					 @RequestParam(value = "creditEndDate", required = false) String creditEndDate,//信用证到期日-结束时间
 					 @RequestParam(value = "gathering", required = false) Integer gathering,//是否付款 0 已付款 1 未付款
 					 @RequestParam(value = "createFreight", required = false) Integer createFreight,//是否生成发货 0 否 1 是
 					 @RequestParam(value = "orderType", required = false) String orderType,//是否生成发货 0 否 1 是
 					 @RequestParam(value = "srcOrderNo", required = false) String srcOrderNo,//是否生成发货 0 否 1 是
+					 @RequestParam(value = "orderAmount", required = false) String orderAmount,//采购金额
 					 Order order
 	) {
 
@@ -231,6 +226,7 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.between(StringUtils.isNotBlank(requiredArrivalStartDate) && StringUtils.isNotBlank(requiredArrivalEndDate), "required_arrival_date", requiredArrivalStartDate, requiredArrivalEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(creditStartDate) && StringUtils.isNotBlank(creditEndDate), "credit_date", creditStartDate, creditEndDate);
 		queryWrapper.eq(StringUtils.isNotBlank(orderType), "order_type", orderType);
+		queryWrapper.like(StringUtils.isNotBlank(orderAmount), "order_amount", orderAmount);
 		if (gathering != null && gathering == 0) {//已付款
 			queryWrapper.le("balance_amount", BigDecimal.ZERO);//未付<=0
 			queryWrapper.gt("settlment_amount", BigDecimal.ZERO);//已付>0