禅道修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

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

@@ -939,4 +939,9 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否生成平台订单/是否从代理订单生成销售订单 默认 0 未生成 1 已生成")
 	private int generate;
+	/**
+	 * 日期说明
+	 */
+	@ApiModelProperty(value = "日期说明")
+	private String dateDesc;
 }

blade-service/blade-client/src/main/java/org/springblade/client/fees/controller/FeesDescController.java

@@ -16,25 +16,28 @@
  */
 package org.springblade.client.fees.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
 import org.springblade.client.entity.FeesDesc;
+import org.springblade.client.fees.service.IFeesDescService;
+import org.springblade.client.vo.FeesDescVO;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.client.vo.FeesDescVO;
-import org.springblade.client.fees.service.IFeesDescService;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 费用详情 控制器
@@ -75,6 +78,15 @@ public class FeesDescController extends BladeController {
 	}
 
 	/**
+	 * 费用列表
+	 */
+	@GetMapping("/list-not-page")
+	public R<List<FeesDescVO>> listNotPage(FeesDescVO feesDesc) {
+		feesDesc.setTenantId(SecureUtil.getTenantId());
+		return R.data(feesDescService.selectFeesDescList(feesDesc));
+	}
+
+	/**
 	 * 自定义分页 费用详情
 	 */
 	@GetMapping("/page")

blade-service/blade-client/src/main/java/org/springblade/client/fees/service/IFeesDescService.java

@@ -21,6 +21,8 @@ import org.springblade.client.vo.FeesDescVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 费用详情 服务类
  *
@@ -39,6 +41,14 @@ public interface IFeesDescService extends IService<FeesDesc> {
 	IPage<FeesDescVO> selectFeesDescPage(IPage<FeesDescVO> page, FeesDescVO feesDesc);
 
 	/**
+	 * 列表
+	 *
+	 * @param feesDesc
+	 * @return
+	 */
+	List<FeesDescVO> selectFeesDescList(FeesDescVO feesDesc);
+
+	/**
 	 * 保存费用信息
 	 * @param feesDesc
 	 * @return

blade-service/blade-client/src/main/java/org/springblade/client/fees/service/impl/FeesDescServiceImpl.java

@@ -62,6 +62,18 @@ public class FeesDescServiceImpl extends ServiceImpl<FeesDescMapper, FeesDesc> i
 	}
 
 	@Override
+	public List<FeesDescVO> selectFeesDescList(FeesDescVO feesDesc) {
+		if (StringUtils.isNotBlank(feesDesc.getFeesTypeId())) {
+			Long corpsTypeId = Long.parseLong(feesDesc.getFeesTypeId());
+			List<Long> feesTypeIdList = new ArrayList<>();
+			feesTypeService.selectChildById(corpsTypeId, feesTypeIdList);
+			feesTypeIdList.add(corpsTypeId);
+			feesDesc.setTypeIdList(feesTypeIdList);
+		}
+		return baseMapper.selectFeesDescPage(null, feesDesc);
+	}
+
+	@Override
 	@Transactional
 	public FeesDesc saveMessage(FeesDesc feesDesc) {
 		//保存费用信息

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

@@ -17,10 +17,8 @@
 package org.springblade.deliver.goods.receiving;
 
 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.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
@@ -39,6 +37,8 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.Delivery;
+import org.springblade.deliver.goods.entity.DeliveryItems;
+import org.springblade.deliver.goods.service.IDeliveryItemsService;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
 import org.springblade.system.user.entity.User;
@@ -62,11 +62,20 @@ public class ReCeVingController extends BladeController {
 
 	private final IDeliveryService deliveryService;
 
-	private ICorpsDescClient corpsDescClient;//获取客户信息
+	private final IDeliveryItemsService deliveryItemsService;
 
-	private IStorageClient iStorageClient;//库存信息
-
-	private IUserClient iUserClient;//获取用户信息
+	/**
+	 * 获取客户信息
+	 */
+	private final ICorpsDescClient corpsDescClient;
+	/**
+	 * 库存信息
+	 */
+	private final IStorageClient iStorageClient;
+	/**
+	 * 获取用户信息
+	 */
+	private final IUserClient iUserClient;
 
 
 	/**
@@ -87,53 +96,49 @@ public class ReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		LambdaQueryWrapper<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper();
-		lambdaQueryWrapper.eq(Delivery::getIsDeleted,0);
-		lambdaQueryWrapper.eq(Delivery::getTenantId,SecureUtil.getTenantId());
-		lambdaQueryWrapper.eq(Delivery::getBillType,OrderTypeEnum.RECEIPT.getType());
-		lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DOMESTIC.getType());
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()),Delivery::getBillNo,delivery.getBillNo());//提单号
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()),Delivery::getOrderNo,delivery.getOrderNo());//合同号
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrgOrderNo()),Delivery::getOrgOrderNo,delivery.getOrgOrderNo());//销售订单号
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getSrcOrderNo()),Delivery::getSrcOrderNo,delivery.getSrcOrderNo());//采购订单号
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
-		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCorpId()),Delivery::getCorpId,delivery.getCorpId());//客户
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalAddress()),Delivery::getArrivalAddress,delivery.getArrivalAddress());//收货地址
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalContact()),Delivery::getArrivalContact,delivery.getArrivalContact());//收货人
-		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()),Delivery::getArrivalTel,delivery.getArrivalTel());//收货电话
-		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getCreateStartTime()),Delivery::getCreateTime,delivery.getCreateStartTime());//制单日期开始
-		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getCreateEndTime()),Delivery::getCreateTime,delivery.getCreateEndTime());//制单日期结束
-		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//收货日期开始
-		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<Delivery> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Delivery::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(Delivery::getTenantId, SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(Delivery::getBillType, OrderTypeEnum.RECEIPT.getType());
+		lambdaQueryWrapper.eq(Delivery::getTradeType, OrderTypeEnum.DOMESTIC.getType());
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()), Delivery::getBillNo, delivery.getBillNo());//提单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()), Delivery::getOrderNo, delivery.getOrderNo());//合同号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrgOrderNo()), Delivery::getOrgOrderNo, delivery.getOrgOrderNo());//销售订单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getSrcOrderNo()), Delivery::getSrcOrderNo, delivery.getSrcOrderNo());//采购订单号
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getDeliveryRemarks()), Delivery::getDeliveryRemarks, delivery.getDeliveryRemarks());//备注
+		lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCorpId()), Delivery::getCorpId, delivery.getCorpId());//客户
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalAddress()), Delivery::getArrivalAddress, delivery.getArrivalAddress());//收货地址
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalContact()), Delivery::getArrivalContact, delivery.getArrivalContact());//收货人
+		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getArrivalTel()), Delivery::getArrivalTel, delivery.getArrivalTel());//收货电话
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getCreateStartTime()), Delivery::getCreateTime, delivery.getCreateStartTime());//制单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getCreateEndTime()), Delivery::getCreateTime, delivery.getCreateEndTime());//制单日期结束
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()), Delivery::getBusinessDate, delivery.getBusinessStartDate());//收货日期开始
+		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.orderByDesc(Delivery::getCreateTime);
 		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		//解决回显字段问题
 		List<Delivery> records = pages.getRecords();
-		if(CollectionUtils.isNotEmpty(records))
-		{
-			records.forEach(e->{
+		if (CollectionUtils.isNotEmpty(records)) {
+			records.forEach(e -> {
 				//供应商信息
 				R<CorpsDesc> corps = corpsDescClient.getCorpMessage(e.getCorpId());
-				if(corps.getData()!=null)
-				{
+				if (corps.getData() != null) {
 					e.setCorpsName(corps.getData().getCname());
 				}
-                //所属公司信息
+				//所属公司信息
 				R<CorpsDesc> company = corpsDescClient.getCorpMessage(e.getSalesCompany());
-				if(company.getData()!=null)
-				{
+				if (company.getData() != null) {
 					e.setSalesCompanyName(company.getData().getCname());
 				}
 				//仓库信息
 				StorageDesc storageDesc = iStorageClient.findById(e.getStorageId());
-				if(storageDesc!=null)
-				{
+				if (storageDesc != null) {
 					e.setStorageName(storageDesc.getCname());
 				}
 				R<User> user = iUserClient.userInfoById(e.getCreateUser());
-				if (user.isSuccess() && user.getData() != null){
+				if (user.isSuccess() && user.getData() != null) {
 					e.setCreateUserName(user.getData().getName());
 				}
 
@@ -142,6 +147,7 @@ public class ReCeVingController extends BladeController {
 		pages.setRecords(records);
 		return R.data(pages);
 	}
+
 	/**
 	 * 自定义分页 国内收货通知单
 	 */
@@ -174,9 +180,19 @@ public class ReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入delivery")
 	public R update(@Valid @RequestBody Delivery delivery) {
-		if (delivery.getId() == null){
-			return R.fail(500,"请选择要删除的数据");
+		if (delivery.getId() == null) {
+			return R.fail(500, "请选择要删除的数据");
+		}
+
+		int itemCount = deliveryItemsService.count(new LambdaQueryWrapper<DeliveryItems>()
+			.eq(DeliveryItems::getPid, delivery.getId())
+			.eq(DeliveryItems::getTenantId, AuthUtil.getTenantId())
+			.eq(DeliveryItems::getIsDeleted, 0)
+		);
+		if (itemCount > 0) {
+			throw new SecurityException("存在明细禁止删除");
 		}
+
 		delivery.setIsDeleted(1);
 		return R.status(deliveryService.updateById(delivery));
 	}
@@ -193,6 +209,7 @@ public class ReCeVingController extends BladeController {
 		delivery.setTradeType(OrderTypeEnum.DOMESTIC.getType());
 		return deliveryService.submitDelivery(delivery);
 	}
+
 	/**
 	 * 删除 国内收货通知单
 	 */

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

@@ -162,7 +162,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			delivery.setDeliveryStatus(status);
 			baseMapper.insert(delivery);
 
-			if (ObjectUtil.isNotEmpty(delivery.getOrgId()) && ObjectUtil.isNotEmpty(delivery.getSrcId())) {
+			if (ObjectUtil.isNotEmpty(delivery.getOrgId())) {
 				if (delivery.getBillType().equals(OrderTypeEnum.SHIP.getType())) {
 					Order temp = new Order();
 					temp.setId(delivery.getOrgId());
@@ -173,7 +173,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					orderDescClient.updateOrder(temp);
 				} else {
 					Order orderTemp = new Order();
-					orderTemp.setId(delivery.getSrcId());
+					orderTemp.setId(delivery.getOrgId());
 					orderTemp.setCreateFreight(1);
 					orderTemp.setCreateFreightUser(AuthUtil.getUserName());
 					orderTemp.setCreateFreightTime(new Date());

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

@@ -114,6 +114,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
 			.eq(OrderAddress::getOrderId, order.getId())
 			.eq(OrderAddress::getIsDeleted, 0)
+			.orderByAsc(OrderAddress::getSort)
 		);
 		detail.setOrderAddressList(orderAddressList);