Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IGoodsDescClient.java

@@ -26,6 +26,8 @@ public interface IGoodsDescClient {
 	String GET_GOOD_ID = API_PREFIX +"/getGoodId";
 	String GOOD_TYPE_ID = API_PREFIX + "/goodTypeId";
 	String GET_GOOD_Name = API_PREFIX +"/getGoodName";
+	String GOOD_TYPE_CNAME = API_PREFIX + "/goodTypeCname";
+
 
 	/**
 	 * 获取商品信息
@@ -85,6 +87,13 @@ public interface IGoodsDescClient {
 	@GetMapping(GOOD_TYPE_ID)
 	GoodsType goodTypeId(@RequestParam("goodId") Long goodId);
 	/**
+	 * 获取商品类别
+	 * @param cname
+	 * @return
+	 */
+	@GetMapping(GOOD_TYPE_CNAME)
+	GoodsType goodTypeCname(@RequestParam("cname") String cname);
+	/**
 	 * 获取商品信息
 	 * @param cname 商品名
 	 * @param corpId 供应商

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -230,6 +230,11 @@ public class PriceBank implements Serializable {
 		@ApiModelProperty(value = "商品类别中文名")
 		private String goodsTypeName;
 	/**
+	 * 商品类型id
+	 */
+		@ApiModelProperty(value = "商品类型id")
+		private Long goodTypeId;
+	/**
 	 * 采购金额
 	 */
 		@ApiModelProperty(value = "采购金额")

blade-service/blade-client/src/main/java/org/springblade/client/goods/feign/GoodsDescClient.java

@@ -115,6 +115,11 @@ public class GoodsDescClient implements IGoodsDescClient {
 	}
 
 	@Override
+	public GoodsType goodTypeCname(String cname) {
+		 return goodsTypeService.getOne(new QueryWrapper<GoodsType>().eq("cname", cname).eq("tenant_id", SecureUtil.getTenantId()));
+	}
+
+	@Override
 	public GoodsDesc getGoodName(String cname,Long corpId) {
 		return goodsDescService.getOne(new QueryWrapper<GoodsDesc>().eq("cname",cname).eq("corp_id",corpId)
 		.eq("tenant_id",SecureUtil.getTenantId()).eq("is_deleted",0));

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -107,6 +107,7 @@ public class DeliveryController extends BladeController {
 		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 ->{

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -100,6 +100,7 @@ public class ExportDeliveryController extends BladeController {
 		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 ->{

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -105,6 +105,7 @@ public class ImportDeliveryController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getBillNo()),Delivery::getBillNo,delivery.getBillNo());//提单号
 		lambdaQueryWrapper.like(Func.isNotEmpty(delivery.getOrderNo()),Delivery::getOrderNo,delivery.getOrderNo());//合同号
 		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 ->{

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

@@ -90,6 +90,7 @@ public class PriceBankController extends BladeController {
 		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());
+		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 	/*	if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
@@ -121,6 +122,7 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getDateValidityStart()),PriceBank::getStartTime,priceBank.getDateValidityStart());
 		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getDateValidityEnd()),PriceBank::getEndTime,priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
+		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
@@ -186,6 +188,7 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getDateValidityStart()),PriceBank::getStartTime,priceBank.getDateValidityStart());
 		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getDateValidityEnd()),PriceBank::getEndTime,priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
+		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		List<PriceBank> list = priceBankService.list(lambdaQueryWrapper);
 		return R.data(priceBankService.list(lambdaQueryWrapper));
 	}

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -69,7 +70,10 @@ public class PriceController extends BladeController {
 	public R<IPage<Price>> list(Price price, Query query) {
 		price.setTenantId(SecureUtil.getTenantId());
 		price.setIsDeleted(0);
-		IPage<Price> pages = priceService.page(Condition.getPage(query), Condition.getQueryWrapper(price));
+		LambdaQueryWrapper<Price> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.setEntity(price);
+		lambdaQueryWrapper.orderByDesc(Price::getId);
+		IPage<Price> pages = priceService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,6 +29,7 @@ import javax.validation.Valid;
 
 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.excel.util.ExcelUtil;
@@ -76,7 +78,12 @@ public class PriceItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入priceItem")
 	public R<IPage<PriceItem>> list(PriceItem priceItem, Query query) {
-		IPage<PriceItem> pages = priceItemService.listMessage(Condition.getPage(query), Condition.getQueryWrapper(priceItem));
+		priceItem.setIsDeleted(0);
+		priceItem.setTenantId(SecureUtil.getTenantId());
+		LambdaQueryWrapper<PriceItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.setEntity(priceItem);
+		lambdaQueryWrapper.orderByDesc(PriceItem::getId);
+		IPage<PriceItem> pages = priceItemService.listMessage(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}
 

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

@@ -93,6 +93,7 @@ public class SalesPolicyController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(salesPolicy.getCreateTimeEnd()),SalesPolicy::getCreateTime,salesPolicy.getCreateTimeEnd());
 		lambdaQueryWrapper.ge(Func.isNotEmpty(salesPolicy.getDateValidityStart()),SalesPolicy::getStartTime,salesPolicy.getDateValidityStart());
 		lambdaQueryWrapper.le(Func.isNotEmpty(salesPolicy.getDateValidityEnd()),SalesPolicy::getEndTime,salesPolicy.getDateValidityEnd());
+		lambdaQueryWrapper.orderByDesc(SalesPolicy::getId);
 		IPage<SalesPolicy> pages = salesPolicyService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/PriceBankMapper.xml

@@ -39,6 +39,7 @@
         <result column="exchange_rate" property="exchangeRate"/>
         <result column="greenback" property="greenback"/>
         <result column="goods_type_name" property="goodsTypeName"/>
+        <result column="good_type_id" property="goodTypeId"/>
         <result column="tax_rate" property="taxRate"/>
         <result column="purchase_amount" property="purchaseAmount"/>
         <result column="priority_referrer" property="priorityReferrer"/>

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.mocha.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springblade.core.tool.api.R;
 import org.springblade.mocha.entity.PriceItem;
@@ -64,7 +65,7 @@ public interface IPriceItemService extends IService<PriceItem> {
 	 * 查询价格信息
 	 * @return
 	 */
-	IPage<PriceItem> listMessage(IPage<PriceItem> page,QueryWrapper<PriceItem> queryWrapper);
+	IPage<PriceItem> listMessage(IPage<PriceItem> page, LambdaQueryWrapper<PriceItem> queryWrapper);
 	/**
 	 * 修改价格管理的销售价格
 	 * @param code  商品编码

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceBankServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
+import org.springblade.client.entity.GoodsType;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -144,6 +145,11 @@ public class PriceBankServiceImpl extends ServiceImpl<PriceBankMapper, PriceBank
 				if (corpByName.isSuccess() && corpByName.getData() != null){
 					priceBank.setCorpName(item.getCorpName());//供应商
 					priceBank.setCorpId(corpByName.getData().getId());//供应商id
+					//查商品id
+					GoodsType goodsType = goodsDescClient.goodTypeCname(item.getGoodsTypeName());
+					if (goodsType != null){
+						priceBank.setGoodTypeId(goodsType.getId());
+					}
 					//查商品看商品是否存在
 					GoodsDesc goodName = goodsDescClient.getGoodName(item.getCname(), priceBank.getCorpId());
 					if (goodName != null){

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceItemServiceImpl.java

@@ -135,7 +135,7 @@ public class PriceItemServiceImpl extends ServiceImpl<PriceItemMapper, PriceItem
 	}
 
 	@Override
-	public IPage<PriceItem> listMessage(IPage<PriceItem> page, QueryWrapper<PriceItem> queryWrapper) {
+	public IPage<PriceItem> listMessage(IPage<PriceItem> page, LambdaQueryWrapper<PriceItem> queryWrapper) {
 		IPage<PriceItem> priceItemIPage = baseMapper.selectPage(page, queryWrapper);
 		if (CollectionUtils.isNotEmpty(priceItemIPage.getRecords())){
 			priceItemIPage.getRecords().forEach(item ->{

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

@@ -133,6 +133,7 @@ public class OrderController extends BladeController {
 		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());//备注
+		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

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

@@ -123,6 +123,7 @@ public class EntranceOrderController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()),Order::getOrderRemark,order.getOrderRemark());//备注
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderAmount()),Order::getOrderAmount,order.getOrderAmount());//合同金额
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getSalesName()),Order::getSalesName,order.getSalesName());//业务员
+		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

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

@@ -109,6 +109,7 @@ public class ExportEnquiryController extends BladeController {
 		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.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

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

@@ -110,6 +110,7 @@ public class ExportOrderController extends BladeController {
 		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());//备注
+		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
 			page.getRecords().stream().forEach(item ->{

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderPartsMapper.xml

@@ -11,7 +11,8 @@
         <result column="price" property="price"/>
         <result column="good_number" property="goodNumber"/>
         <result column="amout" property="amout"/>
-        <result column="good_type" property="goodType"/>
+        <result column="good_type_id" property="goodTypeId"/>
+        <result column="good_type_name" property="goodTypeName"/>
         <result column="remarks" property="remarks"/>
         <result column="version" property="version"/>
         <result column="create_user" property="createUser"/>

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -125,6 +125,7 @@ public class PurchaseEnquiry  extends BladeController {
 		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.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().stream().forEach(item -> {

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -121,6 +121,7 @@ public class ShippingEnquiry extends BladeController {
 		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.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().stream().forEach(item -> {