Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderDTO.java

@@ -47,4 +47,6 @@ public class OrderDTO extends OrderItems {
 
 	private Long itemId;
 
+	private Long id;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/affairs/controller/AffairsController.java

@@ -2,6 +2,7 @@ package org.springblade.client.affairs.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 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.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -56,11 +57,14 @@ public class AffairsController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
-	public R<IPage<GoodsDescVO>> list(GoodsDescVO goodsDesc, Query query) {
-		goodsDesc.setTenantId(AuthUtil.getTenantId());
-		goodsDesc.setIsDeleted(0);
-		goodsDesc.setType(GoodsTypeEnum.AFFAIRS.getType());
-		IPage<GoodsDescVO> pages = goodsDescService.selectGoodsDescPage(Condition.getPage(query), goodsDesc);
+	public R<IPage<GoodsDesc>> list(GoodsDescVO goodsDesc, Query query) {
+		LambdaQueryWrapper<GoodsDesc> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.like(StringUtils.isNotBlank(goodsDesc.getCname()),GoodsDesc::getCname,goodsDesc.getCname());
+		queryWrapper.like(StringUtils.isNotBlank(goodsDesc.getCode()),GoodsDesc::getCode,goodsDesc.getCode());
+		queryWrapper.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId());
+		queryWrapper.eq(GoodsDesc::getIsDeleted,0);
+		queryWrapper.eq(GoodsDesc::getType,GoodsTypeEnum.AFFAIRS.getType());
+		IPage<GoodsDesc> pages = goodsDescService.page(Condition.getPage(query), queryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/container/controller/ContainerController.java

@@ -26,6 +26,7 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -56,11 +57,15 @@ public class ContainerController
 	@GetMapping("type/list")
 	public R typeList(@RequestParam(name = "current", defaultValue = "1") Integer current,
 					  @RequestParam(name = "size", defaultValue = "10") Integer size,
+					  @RequestParam(name = "status", required = false) Integer status,
+					  @RequestParam(name = "name", required = false) String name,
 					  @RequestParam(name = "parentId", required = false) Long parentId)
 
 	{
 		LambdaQueryWrapper<BasicContainerType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		typeLambdaQueryWrapper
+			.like(!StringUtils.isEmpty(name),BasicContainerType::getName,name)
+			.eq(status!=null,BasicContainerType::getStatus,status)
 			.eq(BasicContainerType::getTenantId,AuthUtil.getTenantId())
 			.eq(parentId!=null,BasicContainerType::getParentId,parentId)
 			.orderByDesc(BasicContainerType::getCreateTime);
@@ -102,7 +107,7 @@ public class ContainerController
 		return R.success("操作成功");
 	}
 
-	@DeleteMapping("type/delet")
+	@DeleteMapping("type/delete")
 	public R  typeDelet(@RequestParam(name = "id", required = true) Long id)
 	{
 		LambdaQueryWrapper<BasicContainerType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.client.fees.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
@@ -29,6 +30,7 @@ import org.springblade.client.entity.FeesType;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -82,9 +84,16 @@ public class FeesTypeController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入feesType")
-	public R<IPage<FeesTypeVO>> page(FeesTypeVO feesType, Query query) {
-		feesType.setTenantId(SecureUtil.getTenantId());
-		IPage<FeesTypeVO> pages = feesTypeService.selectFeesTypePage(Condition.getPage(query), feesType);
+	public R<IPage<FeesType>> page(FeesTypeVO feesType, Query query,
+									 @RequestParam(value = "createStartTime",required = false) String createStartTime,
+	                            	@RequestParam(value = "createEndTime",required = false )String createEndTime)
+										 {
+		LambdaQueryWrapper<FeesType> feesTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+											 feesTypeLambdaQueryWrapper.between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),FeesType::getCreateTime,createStartTime,createEndTime);
+		feesTypeLambdaQueryWrapper.like(StringUtils.isNotBlank(feesType.getCname()),FeesType::getCname,feesType.getCname());
+		feesTypeLambdaQueryWrapper.eq(FeesType::getTenantId, AuthUtil.getTenantId());
+		feesTypeLambdaQueryWrapper.eq(FeesType::getIsDeleted,0);
+		IPage<FeesType> pages = feesTypeService.page(Condition.getPage(query), feesTypeLambdaQueryWrapper);
 		return R.data(pages);
 	}
 

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

@@ -297,9 +297,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		 if (stockById.getData() == null){
 			 throw  new RuntimeException("库存账不存在");
 		 }
-		 BigDecimal actualQuantity = deliveryItems.getActualQuantity();
-		 BigDecimal invoiceWeight = deliveryItems.getInvoiceWeight();
-		 BigDecimal billWeight = deliveryItems.getBillWeight();
+		 BigDecimal actualQuantity = deliveryItems.getActualQuantity()==null?new BigDecimal("0"):deliveryItems.getActualQuantity();
+		 BigDecimal invoiceWeight = deliveryItems.getInvoiceWeight()==null?new BigDecimal("0"):deliveryItems.getInvoiceWeight();
+		 BigDecimal billWeight = deliveryItems.getBillWeight()==null?new BigDecimal("0"):deliveryItems.getBillWeight();
 		 StockGoods stockGoods = stockById.getData();
 		 if(actualQuantity.compareTo(stockGoods.getInQuantity())==1)
 		 {
@@ -352,10 +352,10 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		stockGoods.setBalanceQuantity(stockGoods.getBalanceQuantity().add(deliveryItems.getActualQuantity()));//结余数量 加
 		stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().add(deliveryItems.getActualQuantity()));//可用数量 加
 		if (tradeType.equals(OrderTypeEnum.IMPORT.getType())){
-			stockGoods.setInWeight(stockGoods.getInWeight().add(deliveryItems.getInvoiceWeight()));//入库发票重量 加
-			stockGoods.setBalanceWeight(stockGoods.getBalanceWeight().add(deliveryItems.getInvoiceWeight()));//结余发票重量 加
-			stockGoods.setInVolumn(stockGoods.getInVolumn().add(deliveryItems.getBillWeight()));//入库码单重量 加
-			stockGoods.setBalanceVolumn(stockGoods.getBalanceVolumn().add(deliveryItems.getBillWeight()));//结余码单重量 加
+			stockGoods.setInWeight(stockGoods.getInWeight()!=null?stockGoods.getInWeight().add(deliveryItems.getInvoiceWeight()):new BigDecimal("0").add(deliveryItems.getInvoiceWeight()));//入库发票重量 加
+			stockGoods.setBalanceWeight(stockGoods.getBalanceWeight()!=null?stockGoods.getBalanceWeight().add(deliveryItems.getInvoiceWeight()):new BigDecimal("0").add(deliveryItems.getInvoiceWeight()));//结余发票重量 加
+			stockGoods.setInVolumn(stockGoods.getInVolumn()!=null?stockGoods.getInVolumn().add(deliveryItems.getBillWeight()):new BigDecimal("0").add(deliveryItems.getBillWeight()));//入库码单重量 加
+			stockGoods.setBalanceVolumn(stockGoods.getBalanceVolumn()!=null?stockGoods.getBalanceVolumn().add(deliveryItems.getBillWeight()):new BigDecimal("0").add(deliveryItems.getBillWeight()));//结余码单重量 加
 		}
 		stockGoods.setUpdateTime(new Date());
 		stockGoods.setUpdateUser(SecureUtil.getUserId());

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -63,17 +63,20 @@ public class ProjectController {
 							@RequestParam(name = "corpAttn", required = false) String corpAttn,
 							@RequestParam(name = "dutyName", required = false) String dutyName,
 							@RequestParam(name = "remark", required = false) String remark,
+							@RequestParam(name = "createStartDate", required = false) String createStartDate,
+							@RequestParam(name = "createEndDate", required = false) String createEndDate,
 							@RequestParam(name = "flag", required = true) int flag
 	)
 	{
 		LambdaQueryWrapper<ServiceProject> serviceProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		serviceProjectLambdaQueryWrapper
+			.between(StringUtils.isNotBlank(createStartDate)&&StringUtils.isNotBlank(createEndDate),ServiceProject::getCreateTime,createStartDate,createEndDate)
 			.eq(ServiceProject::getTenantId, AuthUtil.getTenantId())
 			.like(StringUtils.isNotBlank(dutyName), ServiceProject::getDutyName, dutyName)
 			.like(StringUtils.isNotBlank(remark), ServiceProject::getRemark, remark)
 			.like(StringUtils.isNotBlank(corpAttn), ServiceProject::getCorpAttn, corpAttn)
 			.like(StringUtils.isNotBlank(cName), ServiceProject::getCName, cName)
-			.eq(StringUtils.isNotBlank(code), ServiceProject::getCode, code)
+			.like(StringUtils.isNotBlank(code), ServiceProject::getCode, code)
 			.eq(StringUtils.isNotBlank(corpId), ServiceProject::getCorpId, corpId)
 			.eq(ServiceProject::getIsDeleted, 0)
 			.orderByDesc(ServiceProject::getCreateTime);
@@ -217,7 +220,9 @@ public class ProjectController {
 						  @RequestParam(name = "payStartTime",  required = false) String payStartTime,
 						  @RequestParam(name = "payEndTime",  required = false) String payEndTime,
 						  @RequestParam(name = "createStartTime",  required = false) String createStartTime,
-						  @RequestParam(name = "createEndTime",  required = false) String createEndTime
+						  @RequestParam(name = "createEndTime",  required = false) String createEndTime,
+						  @RequestParam(name = "beginStartTime",  required = false) String beginStartTime,
+						  @RequestParam(name = "beginEndTime",  required = false) String beginEndTime
 						 )
 	{
 		List<String> listStatus=Arrays.asList(status.split(","));
@@ -226,6 +231,7 @@ public class ProjectController {
 		  itemLambdaQueryWrapper
 			  .like(StringUtils.isNotBlank(userName),ServiceProjectItem::getUserName,userName)
 			  .eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
+			  .between(StringUtils.isNotBlank(beginStartTime)&&StringUtils.isNotBlank(beginEndTime),ServiceProjectItem::getBeginTime,beginStartTime,beginEndTime)
 			  .between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),ServiceProjectItem::getCreateTime,createStartTime,createEndTime)
 			  .between(StringUtils.isNotBlank(payStartTime)&&StringUtils.isNotBlank(payEndTime),ServiceProjectItem::getPayTime,payStartTime,payEndTime)
 			  .like(StringUtils.isNotBlank(pName),ServiceProjectItem::getPName,pName)

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

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -34,13 +35,13 @@ import java.util.stream.Collectors;
 @Service
 public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMapper, ServiceProject> implements ServiceProjectService
 {
-   @Autowired
+   @Resource
    private ServiceProjectMapper serviceProjectMapper;
-   @Autowired
+	@Resource
    private ServiceProjectItemMapper serviceProjectItemMapper;
-   @Autowired
+	@Resource
    private ServiceProjectFilesMapper serviceProjectFilesMapper;
-   @Autowired
+	@Resource
    private ISerialClient serialClient;//生成系统编号
 
 	@Override
@@ -60,6 +61,11 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
           {
              throw new RuntimeException("已收金额+未收金额≠合同总金额,请确认后提交");
 		  }
+		  R billNo = serialClient.getBillNo("ZY", "ZY");
+          if(billNo.isSuccess())
+          {
+			  serviceProject.setSysNo(billNo.getData().toString());
+		  }
 		  serviceProject.setTenantId(AuthUtil.getTenantId());
 		  serviceProject.setCreateTime(new Date());
 		  serviceProject.setCreateUser(SecureUtil.getUserId());

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java

@@ -157,7 +157,8 @@ public class SettlementController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入settlement")
 	public R submit(@Valid @RequestBody Settlement settlement) {
-		return R.status(settlementService.saveOrUpdate(settlement));
+		 settlementService.saveOrUpdate(settlement);
+		return R.data(settlement);
 	}
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -70,13 +70,14 @@
         b.invoice_weight as invoiceWeight,
         b.price as price,
         b.amount as amount,
-        b.item_id as itemId
+        b.item_id as itemId,
+        b.id as id
         FROM
         business_order a,
         business_order_items b
         WHERE
         a.id = b.pid
-        and b.purchase_quantity>b.actual_quantity
+        and b.order_quantity>b.actual_quantity
         and a.bill_type='CG'
         and a.trade_type=#{tradeType}
         and a.is_deleted=0

doc/nacos/blade.yaml

@@ -43,7 +43,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 5000
+            timeoutInMilliseconds: 200000
 
 #ribbon配置
 ribbon:
@@ -52,9 +52,9 @@ ribbon:
   #切换实例的重试次数
   MaxAutoRetriesNextServer: 2
   #请求处理的超时时间
-  ReadTimeout: 60000
+  ReadTimeout: 200000
   #请求连接的超时时间
-  ConnectTimeout: 60000
+  ConnectTimeout: 200000
   #对所有操作请求都进行重试
   OkToRetryOnAllOperations: true