基础资料商品补全字段

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -206,6 +206,16 @@ public class GoodsDesc implements Serializable {
 	private int effectiveDay;
 
 	private String company;
+	/**
+	 * 供应商
+	 */
+	@ApiModelProperty(value = "供应商")
+	private Long corpId;
+	/**
+	 * 供应商名称
+	 */
+	@ApiModelProperty(value = "供应商名称")
+	private String corpName;
 
 
 

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsPrice.java

@@ -88,6 +88,8 @@ public class GoodsPrice implements Serializable {
 
     //供应商
 	private String corpName;
+	//单价
+	private BigDecimal amount;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/mapper/GoodsDescMapper.xml

@@ -54,6 +54,8 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="type" property="type"/>
         <result column="goods_type_id" property="goodsTypeId"/>
+        <result column="corp_id" property="corpId"/>
+        <result column="corp_name" property="corpName"/>
     </resultMap>
 
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -40,6 +40,7 @@ import org.springblade.mocha.service.IPriceBankService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.time.Period;
+import java.util.List;
 
 /**
  * 出口价格库 控制器
@@ -154,6 +155,27 @@ public class PriceBankController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(priceBankService.removeByIds(Func.toLongList(ids)));
 	}
+	/**
+	 * 分页 出口价格库
+	 */
+	@GetMapping("/messageList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "所有数据", notes = "传入priceBank")
+	public R<List> messageList(PriceBankVO priceBank, Query query) {
+		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PriceBank::getIsDeleted,0);
+		lambdaQueryWrapper.eq(PriceBank::getStatus,0);
+		lambdaQueryWrapper.eq(PriceBank::getTenantId, SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(PriceBank::getTradeType,"CK");
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getCname()),PriceBank::getCname,priceBank.getCname());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getCorpId()),PriceBank::getCorpId,priceBank.getCorpId());
+		lambdaQueryWrapper.like(Func.isNotEmpty(priceBank.getSpecs()),PriceBank::getSpecs,priceBank.getSpecs());
+		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getStatusTime()),PriceBank::getStartTime,priceBank.getStatusTime());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getStatusTime()),PriceBank::getEndTime,priceBank.getStatusTime());
+		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
+		List<PriceBank> list = priceBankService.list(lambdaQueryWrapper);
+		return R.data(priceBankService.list(lambdaQueryWrapper));
+	}
 
 
 }