2022年9月21日 17:48

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

@@ -285,5 +285,9 @@ public class Biding implements Serializable {
 	@TableField(exist = false)
 	private String corpId;
 
-
+	/**
+	 * 不可编辑标识（0添加，1修改过一次）
+	 */
+	@TableField(exist = false)
+	private Integer nonEditable;
 }

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

@@ -139,6 +139,12 @@ public class BidingItems implements Serializable {
 	private String shippingCompany;
 
 	/**
+	 * 船公司id
+	 */
+	@ApiModelProperty(value = "船公司id")
+	private String shippingCompanyId;
+
+	/**
 	 * 船名
 	 */
 	@ApiModelProperty(value = "船名")

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

@@ -740,4 +740,19 @@ public class CorpsDescController extends BladeController {
 		return R.data(corpsDescVOList);
 	}
 
+	/**
+	 * 查询船公司详情
+	 */
+	@GetMapping("/shippingCompanyList")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "查询船公司", notes = "传入corpsDesc")
+	public R<List<CorpsDesc>> shippingCompanyList(CorpsDesc corpsDesc) {
+		// 默认查有效的
+		corpsDesc.setIsDeleted(0);
+		corpsDesc.setTenantId(SecureUtil.getTenantId());
+		List<CorpsDesc> corpsDescList = corpsDescService.selectShippingCompany(corpsDesc);
+
+		return R.data(corpsDescList);
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.java

@@ -29,6 +29,14 @@ public interface CorpsDescMapper extends BaseMapper<CorpsDesc> {
 	List<CorpsDescVO> selectCorpsDescPage(IPage page, @Param("CorpsDesc") CorpsDescVO corpsDesc);
 
 	/**
+	 * 获得船公司名
+	 *
+	 * @param corpsDesc
+	 * @return
+	 */
+	List<CorpsDesc> selectShippingCompany(@Param("CorpsDesc") CorpsDesc corpsDesc);
+
+	/**
 	 * 查询客户编码
 	 *
 	 * @return

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -191,6 +191,22 @@
             )
         </if>
     </select>
+    <select id="selectShippingCompany" resultMap="corpsDescResultMap">
+        SELECT * FROM basic_corps_desc
+        WHERE is_deleted = 0
+          and corp_type = 'KH'
+          and tenant_id = #{CorpsDesc.tenantId}
+          and id in (
+            SELECT
+                DISTINCT
+                corp_id
+            FROM
+                basic_corps_type_desc
+            WHERE
+                status = 0
+              AND corp_type_id = '1572480948329574402'
+        )
+    </select>
     <select id="selectCorpsDescCode" resultMap="corpsDescResultMap">
         select id, code
         from basic_corps_desc

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

@@ -46,6 +46,14 @@ public interface ICorpsDescService extends IService<CorpsDesc> {
 	IPage<CorpsDescVO> selectCorpsDescPage(IPage<CorpsDescVO> page, CorpsDescVO corpsDesc);
 
 	/**
+	 * 获得船公司名
+	 *
+	 * @param corpsDesc
+	 * @return
+	 */
+	List<CorpsDesc> selectShippingCompany(CorpsDesc corpsDesc);
+
+	/**
 	 * 保存客户信息
 	 * @param corpsDesc
 	 * @return

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

@@ -94,6 +94,11 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 	}
 
 	@Override
+	public List<CorpsDesc> selectShippingCompany(CorpsDesc corpsDesc){
+		return baseMapper.selectShippingCompany(corpsDesc);
+	}
+
+	@Override
 	@Transactional
 	public R submit(CorpsDesc corpsDesc) {
 		Long userId = SecureUtil.getUserId();

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

@@ -155,6 +155,7 @@ public class LandDriverServiceImpl extends ServiceImpl<LandDriverMapper, LandDri
 			LandDriver driver = new LandDriver();
 			driver.setId(id);
 			driver.setIsDeleted(1);
+			driver.setUserId(null);
 			baseMapper.updateById(driver);
 
 			CommonFile file = new CommonFile();

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -53,6 +53,9 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 	@Transactional
 	public void modify(ServiceProject serviceProject) {
 		List<ServiceProjectItem> itemList = serviceProject.getItemList();
+		BigDecimal sumAmount = itemList.stream().map(item -> item.getAmount() == null ? BigDecimal.ZERO : item.getAmount())
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+		serviceProject.setDebitAmount(sumAmount);
 
 		List<ServiceProjectFiles> filesList = serviceProject.getFilesList();
 		//新增操作,不用考虑子项问题,子项必然是新增

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

@@ -207,7 +207,7 @@ public class OrderController extends BladeController {
 	/**
 	 * 销售订单导出
 	 */
-	@GetMapping("saleOrderExport")
+	@GetMapping("/saleOrderExport")
 	@ApiOperation(value = "销售订单导出", notes = "传入order")
 	public void saleOrderExport(OrderVO order, HttpServletResponse response){
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -217,7 +217,6 @@ public class OrderController extends BladeController {
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.DOMESTIC.getType());//贸易类型
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderNo()), Order::getOrderNo, order.getOrderNo());//订单号
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId());//客户id
-		lambdaQueryWrapper.eq(Func.isNotEmpty(order.getStorageId()), Order::getStorageId, order.getStorageId());//仓库id
 		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getContractStartDate()), Order::getBusinesDate, order.getContractStartDate());//合同日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getContractEndDate()), Order::getBusinesDate, order.getContractEndDate());//合同日期结束
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getSrcOrderNo()), Order::getSrcOrderNo, order.getSrcOrderNo());//订单来源
@@ -238,20 +237,16 @@ public class OrderController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getDateValidityEnd()), Order::getDateValidity, order.getDateValidityEnd());//有效日期结束
 		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getOrderStartDate()), Order::getBusinesDate, order.getOrderStartDate());//订单日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getOrderEndDate()), Order::getBusinesDate, order.getOrderEndDate());//订单日期结束
-		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPortOfLoad()), Order::getPortOfLoad, order.getPortOfLoad());//装货港
-		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPortOfDestination()), Order::getPortOfDestination, order.getPortOfDestination());//目的港
-		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()), Order::getPlannedDeliveryDate, order.getPlannedDeliveryStart());//计划交货开始
-		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()), Order::getPlannedDeliveryDate, order.getPlannedDeliveryEnd());//计划交货结束
-		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()), Order::getOrderRemark, order.getOrderRemark());//备注
+
 		if (order.getGathering() != null && order.getGathering() == 0){
 			lambdaQueryWrapper.eq(Order::getBalanceAmount,BigDecimal.ZERO);
 		}else if (order.getGathering() != null && order.getGathering() == 1){
 			lambdaQueryWrapper.gt(Order::getBalanceAmount,BigDecimal.ZERO);
 		}
 		lambdaQueryWrapper.orderByDesc(Order::getId);
-		List<Order> page = orderService.list(lambdaQueryWrapper);
-		if (CollectionUtils.isNotEmpty(page)) {
-			page.forEach(item -> {
+		List<Order> list = orderService.list(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(list)) {
+			list.forEach(item -> {
 				if (item.getCorpId() != null) {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());//客户
 					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
@@ -275,16 +270,16 @@ public class OrderController extends BladeController {
 					item.setCreateUserName(user.getData().getName());
 				}
 				//获取订单明细
-				List<OrderItems> list = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", item.getId()).eq("is_deleted", 0));
-				if (CollectionUtils.isNotEmpty(list)) {
-					item.setOrderQuantity(list.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//数量合计
-					item.setActualQuantity(list.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//发货数量
+				List<OrderItems> itemsListlist = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", item.getId()).eq("is_deleted", 0));
+				if (CollectionUtils.isNotEmpty(itemsListlist)) {
+					item.setOrderQuantity(itemsListlist.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//数量合计
+					item.setActualQuantity(itemsListlist.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//发货数量
 				}
 			});
 		}
 
-		List<SaleOrderExcel> list = BeanUtil.copy(page, SaleOrderExcel.class);
-		ExcelUtil.export(response, "销售订单", "销售订单", list, SaleOrderExcel.class);
+		List<SaleOrderExcel> excelListlist = BeanUtil.copy(list, SaleOrderExcel.class);
+		ExcelUtil.export(response, "销售订单", "销售订单", excelListlist, SaleOrderExcel.class);
 	}
 
 	/**

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

@@ -191,6 +191,19 @@ public class ExportBidingController extends BladeController {
 		return R.data(iPage);
 	}
 
+	/**
+	 * 获得app标书详情
+	 */
+	@GetMapping("/appDetail")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "app详情", notes = "传入biding")
+	public R<Biding> appDetail(Biding biding){
+		biding.setTenantId(AuthUtil.getTenantId());
+		biding.setIsDeleted(0);
+		Biding detail = bidingService.getAppBidingMassage(biding);
+		return R.data(detail);
+	}
+
 	@GetMapping("/getById")
 	public Biding getById(Long id) {
 		return bidingService.getById(id);

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

@@ -25,6 +25,14 @@ public interface IBidingService extends IService<Biding> {
 	Biding getBidingMassage(Biding biding);
 
 	/**
+	 * 获取app标书详情
+	 *
+	 * @param biding
+	 * @return
+	 */
+	Biding getAppBidingMassage(Biding biding);
+
+	/**
 	 * 自定义分页
 	 */
 	IPage<Biding> selectBidingPage(Biding biding, Query query);

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

@@ -3,8 +3,11 @@ package org.springblade.purchase.sales.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.client.entity.CorpsAttn;
+import org.springblade.client.feign.ICorpsAttnClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.purchase.sales.entity.Biding;
 import org.springblade.purchase.sales.entity.BidingAgent;
 import org.springblade.purchase.sales.entity.BidingItems;
@@ -25,6 +28,7 @@ import java.util.List;
 @AllArgsConstructor
 public class BidingAgentServiceImpl extends ServiceImpl<BidingAgentMapper, BidingAgent> implements IBidingAgentService {
 
+	private final ICorpsAttnClient corpsAttnClient;
 
 	/**
 	 * 保存订单明细信息
@@ -69,4 +73,27 @@ public class BidingAgentServiceImpl extends ServiceImpl<BidingAgentMapper, Bidin
 	public void updateByPid(Long id) {
 		baseMapper.updateByPid(id);
 	}
+
+	/**
+	 * app获得代理明细
+	 * @param biding
+	 * @retuen
+	 */
+	public BidingAgent getAppBidingAgent(Biding biding){
+
+		//获得当前用户信息
+		CorpsAttn corpsAttn = corpsAttnClient.getUser(AuthUtil.getUserId());
+		if (ObjectUtil.isEmpty(corpsAttn) || ObjectUtil.isEmpty(corpsAttn.getPid())){
+			throw new SecurityException("用户信息异常");
+		}
+		//获得代理信息
+		LambdaQueryWrapper<BidingAgent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BidingAgent::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.eq(BidingAgent::getIsDeleted,0);
+		lambdaQueryWrapper.eq(BidingAgent::getPid, biding.getId());
+		lambdaQueryWrapper.in(BidingAgent::getAgentId, corpsAttn.getPid());
+		BidingAgent bidingAgent = baseMapper.selectOne(lambdaQueryWrapper);
+
+		return bidingAgent;
+	}
 }

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

@@ -35,7 +35,6 @@ import java.util.List;
 public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, BidingItems> implements IBidingItemsService {
 
 	private final BidingMapper bidingMapper;
-	private final ICorpsDescClient corpsDescClient;
 	private final BidingAgentMapper bidingAgentMapper;
 	private final ICorpsAttnClient corpsAttnClient;
 

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

@@ -10,6 +10,7 @@ import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
+import org.springblade.client.entity.CorpsAttn;
 import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -75,6 +76,32 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 	}
 
 	/**
+	 * 获得app标书详情
+	 * @param biding
+	 * @return
+	 */
+	@Override
+	public Biding getAppBidingMassage(Biding biding) {
+		//获得主表信息
+		Biding bidingMassage = baseMapper.selectById(biding.getId());
+		if (bidingMassage == null){
+			throw new SecurityException("信息异常");
+		}
+
+		//获得代理信息
+		BidingAgent agent = bidingAgentService.getAppBidingAgent(bidingMassage);
+		if (ObjectUtil.isNotEmpty(agent)){
+			bidingMassage.setNonEditable(agent.getNonEditable());
+		}
+
+		//获得标书对比明细
+		List<BidingItems> contrastList = bidingItemsService.getBidingItems(bidingMassage, 1);
+		bidingMassage.setContrastList(contrastList);
+
+		return bidingMassage;
+	}
+
+	/**
 	 * 自定义分页
 	 */
 	@Override