|
|
@@ -0,0 +1,186 @@
|
|
|
+package org.springblade.deliver.goods.controller;
|
|
|
+
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+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;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
+import io.swagger.annotations.ApiParam;
|
|
|
+import lombok.AllArgsConstructor;
|
|
|
+import org.springblade.client.entity.CorpsDesc;
|
|
|
+import org.springblade.client.entity.StorageDesc;
|
|
|
+import org.springblade.client.feign.ICorpsDescClient;
|
|
|
+import org.springblade.client.feign.IStorageClient;
|
|
|
+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.deliver.goods.entity.Delivery;
|
|
|
+import org.springblade.deliver.goods.enums.DeliveryEnum;
|
|
|
+import org.springblade.deliver.goods.enums.DeliveryStatusEnum;
|
|
|
+import org.springblade.deliver.goods.service.IDeliveryFeesService;
|
|
|
+import org.springblade.deliver.goods.service.IDeliveryFilesService;
|
|
|
+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;
|
|
|
+import org.springblade.system.user.feign.IUserClient;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+
|
|
|
+import javax.validation.Valid;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
+/**
|
|
|
+ * 国内发货通知单 控制器
|
|
|
+ *
|
|
|
+ * @author BladeX
|
|
|
+ * @since 2021-09-26
|
|
|
+ */
|
|
|
+@RestController
|
|
|
+@AllArgsConstructor
|
|
|
+@RequestMapping("/allot")
|
|
|
+@Api(value = "经销商调拨", tags = "经销商调拨")
|
|
|
+public class AllotController extends BladeController {
|
|
|
+ private final IDeliveryService deliveryService;
|
|
|
+ private ICorpsDescClient corpsDescClient;//获取客户信息
|
|
|
+ private IUserClient iUserClient;//获取用户信息
|
|
|
+ private IStorageClient iStorageClient;//库区信息
|
|
|
+ private final IDeliveryItemsService deliveryItemsService;
|
|
|
+ private final IDeliveryFeesService deliveryFeesService;
|
|
|
+ private final IDeliveryFilesService deliveryFilesService;
|
|
|
+ /**
|
|
|
+ * 详情
|
|
|
+ */
|
|
|
+ @GetMapping("/detail")
|
|
|
+ @ApiOperationSupport(order = 1)
|
|
|
+ @ApiOperation(value = "详情", notes = "传入delivery")
|
|
|
+ public R<Delivery> detail(Delivery delivery) {
|
|
|
+ Delivery detail = deliveryService.getDeliveryMessage(delivery);
|
|
|
+ return R.data(detail);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 国内发货通知单
|
|
|
+ */
|
|
|
+ @GetMapping("/list")
|
|
|
+ @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.ALLOY.getType());
|
|
|
+ lambdaQueryWrapper.eq(Delivery::getTradeType,OrderTypeEnum.DEALER.getType());
|
|
|
+ lambdaQueryWrapper.eq(delivery.getSalesCompany()!=null,Delivery::getSalesCompany,delivery.getSalesCompany());
|
|
|
+ lambdaQueryWrapper.like(StringUtils.isNotBlank(delivery.getPurchaseMode()),Delivery::getPurchaseMode,delivery.getPurchaseMode());
|
|
|
+ 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.like(Func.isNotEmpty(delivery.getOrgOrderNo()),Delivery::getOrgOrderNo,delivery.getOrgOrderNo());//销售订单号
|
|
|
+ lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCorpId()),Delivery::getCorpId,delivery.getCorpId());//客户
|
|
|
+ lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getSalesCompany()),Delivery::getSalesCompany,delivery.getSalesCompany());//所属公司
|
|
|
+ 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.like(Func.isNotEmpty(delivery.getDeliveryRemarks()),Delivery::getDeliveryRemarks,delivery.getDeliveryRemarks());//备注
|
|
|
+ lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getCreateUser()),Delivery::getCreateUser,delivery.getCreateUser());//制单人
|
|
|
+ lambdaQueryWrapper.eq(Func.isNotEmpty(delivery.getStorageId()),Delivery::getStorageId,delivery.getStorageId());//仓库
|
|
|
+ lambdaQueryWrapper.orderByDesc(Delivery::getId);
|
|
|
+ IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), lambdaQueryWrapper);
|
|
|
+ if (CollectionUtils.isNotEmpty(pages.getRecords())){
|
|
|
+ pages.getRecords().forEach(item ->{
|
|
|
+ if (item.getCorpId() != null){
|
|
|
+ R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
|
|
|
+ if (corpMessage.isSuccess() && corpMessage.getData() != null){
|
|
|
+ item.setCorpsName(corpMessage.getData().getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (item.getSalesCompany() != null){
|
|
|
+ R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getSalesCompany());
|
|
|
+ if (corpMessage.isSuccess() && corpMessage.getData() != null){
|
|
|
+ item.setSalesCompanyName(corpMessage.getData().getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ R<User> user = iUserClient.userInfoById(item.getCreateUser());
|
|
|
+ if (user.isSuccess() && user.getData() != null){
|
|
|
+ item.setCreateUserName(user.getData().getName());
|
|
|
+ }
|
|
|
+
|
|
|
+ R<User> user1 = iUserClient.userInfoById(item.getUpdateUser());
|
|
|
+ if (user1.isSuccess() && user1.getData() != null){
|
|
|
+ item.setCreateUserName(user1.getData().getName());
|
|
|
+ }
|
|
|
+ //仓库信息
|
|
|
+ if (item.getStorageId() != null){
|
|
|
+ StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
|
|
|
+ if(storageDesc!=null)
|
|
|
+ {
|
|
|
+ item.setStorageName(storageDesc.getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //调拨仓库信息
|
|
|
+ if (item.getAllotStorageId() != null){
|
|
|
+ StorageDesc allotStorageId = iStorageClient.findById(item.getAllotStorageId());
|
|
|
+ if(allotStorageId!=null)
|
|
|
+ {
|
|
|
+ item.setAllotStorageName(allotStorageId.getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ return R.data(pages);
|
|
|
+ }
|
|
|
+ /**
|
|
|
+ * 自定义分页 国内发货通知单
|
|
|
+ */
|
|
|
+ @GetMapping("/page")
|
|
|
+ @ApiOperationSupport(order = 3)
|
|
|
+ @ApiOperation(value = "分页", notes = "传入delivery")
|
|
|
+ public R<IPage<DeliveryVO>> page(DeliveryVO delivery, Query query) {
|
|
|
+ delivery.setIsDeleted(0);
|
|
|
+ delivery.setTenantId(SecureUtil.getTenantId());
|
|
|
+ delivery.setBillType(OrderTypeEnum.ALLOY.getType());
|
|
|
+ delivery.setTradeType(OrderTypeEnum.DEALER.getType());
|
|
|
+ IPage<DeliveryVO> pages = deliveryService.selectDeliveryPage(Condition.getPage(query), delivery);
|
|
|
+ return R.data(pages);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 修改 国内发货通知单
|
|
|
+ */
|
|
|
+ @PostMapping("/update")
|
|
|
+ @ApiOperationSupport(order = 5)
|
|
|
+ @ApiOperation(value = "修改", notes = "传入delivery")
|
|
|
+ public R update(@Valid @RequestBody Delivery delivery) {
|
|
|
+ if (delivery.getId() == null){
|
|
|
+ throw new SecurityException("请选择要删除的数据");
|
|
|
+ }
|
|
|
+ delivery.setIsDeleted(1);
|
|
|
+ deliveryService.updateById(delivery);
|
|
|
+ deliveryFeesService.updateByPid(delivery.getId());
|
|
|
+ deliveryFilesService.updateByPid(delivery.getId());
|
|
|
+ deliveryItemsService.updateByPid(delivery.getId());
|
|
|
+ return R.success("操作成功");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增或修改 国内发货通知单
|
|
|
+ * billType FH 发货通知 SH 收货通知
|
|
|
+ */
|
|
|
+ @PostMapping("/submit")
|
|
|
+ @ApiOperationSupport(order = 6)
|
|
|
+ @ApiOperation(value = "新增或修改", notes = "传入delivery")
|
|
|
+ public R submit(@Valid @RequestBody Delivery delivery) {
|
|
|
+ delivery.setBillType(OrderTypeEnum.ALLOY.getType());
|
|
|
+ delivery.setTradeType(OrderTypeEnum.DEALER.getType());
|
|
|
+ return deliveryService.submitDelivery(delivery);
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
lazhaoqian