Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFactoryCategoryEntity.java

@@ -41,6 +41,7 @@ public class BasicdataFactoryCategoryEntity extends TenantEntity {
 
 
 	private Long categoryId;
+	private String category;
 	private String firsts;
 	private String seconds;
 	private String thirds;

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataOpenIncomingSettingEntity.java

@@ -41,6 +41,7 @@ public class BasicdataOpenIncomingSettingEntity extends TenantEntity {
 
 
 	private Long warehouseId;
+	private String warehouseName;
 	private String brand;
 	private Long brandId;
 

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataBrandClient.java

@@ -53,4 +53,6 @@ public interface IBasicdataBrandClient {
 	@GetMapping(API_PREFIX+"/findAllList")
     List<JSONObject> findAllList();
 
+	@GetMapping(API_PREFIX+"/findEntityByName")
+    BasicdataBrandEntity findEntityByName(@RequestParam("brand") String brand);
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java

@@ -12,6 +12,7 @@ public class OpenOrderDTO implements Serializable {
 
 	private Long waybillId;
 
+	private Long brandId;//品牌id
 	private String brand;//品牌
 	private String trainNumber;//客户车次号
 	private String waybillNo;//运单号

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java

@@ -64,11 +64,18 @@ public class WarehouseWaybillEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "客户车次")
 	private String customerTrain;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌id")
+	private Long brandId;
+
 	/**
 	 * 品牌
 	 */
 	@ApiModelProperty(value = "品牌")
 	private String brand;
+
 	/**
 	 * 发货单位
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java

@@ -104,6 +104,15 @@ public class BasicdataCategoryController extends BladeController {
 		return R.data(tree);
 	}
 
+	@PostMapping("/listName")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataCategory")
+	public R listName(@RequestBody BasicdataCategoryVO basicdataCategory) {
+		List<BasicdataCategoryEntity> list = basicdataCategoryService.listName(basicdataCategory);
+		return R.data(list);
+	}
+
+
 	/**
 	 * 品类 新增
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFactoryCategoryController.java

@@ -71,7 +71,7 @@ public class BasicdataFactoryCategoryController extends BladeController {
 	public R remove(@RequestBody BasicdataFactoryCategoryDTO basicdataFactoryCategoryDTO) {
 		String method = "############remove: ";
 		log.info(method+"请求参数{}",basicdataFactoryCategoryDTO);
-		Long factoryCategoryId = basicdataFactoryCategoryDTO.getId();
+		Long factoryCategoryId = basicdataFactoryCategoryDTO.getFactoryCategoryId();
 
 		try{
 			return R.status(basicdataFactoryCategoryService.removeById(factoryCategoryId));

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataOpenIncomingController.java

@@ -3,8 +3,8 @@ package com.logpm.basicdata.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO;
+import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity;
 import com.logpm.basicdata.service.IBasicdataOpenIncomingSettingService;
-import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -34,7 +34,7 @@ public class BasicdataOpenIncomingController {
 		log.info(method+"请求参数{}",basicdataOpenIncomingDTO);
 		try{
 
-			IPage<BasicdataOpenIncomingSettingVO> pages = basicdataOpenIncomingSettingService.pageList(basicdataOpenIncomingDTO);
+			IPage<BasicdataOpenIncomingSettingEntity> pages = basicdataOpenIncomingSettingService.pageList(basicdataOpenIncomingDTO);
 			return R.data(pages);
 		}catch (CustomerException e){
 			log.error(e.message,e);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFactoryCategoryDTO.java

@@ -9,4 +9,6 @@ public class BasicdataFactoryCategoryDTO extends BasicdataFactoryCategoryEntity
 	private Integer pageSize;
 	private Integer pageNum;
 
+	private Long factoryCategoryId;
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataBrandClient.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataBrandEntity;
 import com.logpm.basicdata.service.IBasicdataBrandService;
@@ -58,4 +59,13 @@ public class BasicdataBrandClient implements IBasicdataBrandClient {
 		return basicdataBrandService.findAllList();
 	}
 
+	@Override
+	public BasicdataBrandEntity findEntityByName(String brand) {
+		QueryWrapper<BasicdataBrandEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("brand_name",brand)
+			.eq("is_deleted",0);
+
+		return basicdataBrandService.getOne(queryWrapper);
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.java

@@ -56,4 +56,6 @@ public interface BasicdataCategoryMapper extends BaseMapper<BasicdataCategoryEnt
     List<BasicdataCategoryEntity> lazyTree(String tenantId,Long parentId);
 
     List<JSONObject> findListByName(@Param("goodsName") String goodsName);
+
+    List<BasicdataCategoryEntity> listName(@Param("name") String name);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCategoryMapper.xml

@@ -113,6 +113,13 @@
         limit 10
     </select>
 
+    <select id="listName" resultType="com.logpm.basicdata.entity.BasicdataCategoryEntity">
+        select *
+        from logpm_basicdata_category
+        where `name` like concat(#{name},"%")
+        and is_deleted = 0
+        limit 10
+    </select>
 
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml

@@ -6,6 +6,7 @@
         select *
         from logpm_basicdata_factory_category
         where 1=1
+        and is_deleted = 0
         <if test="param.brand != null and param.brand != ''">
             and brand = #{param.brand}
         </if>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.java

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BasicdataOpenIncomingSettingMapper extends BaseMapper<BasicdataOpenIncomingSettingEntity> {
 
-	IPage<BasicdataOpenIncomingSettingVO> pageList(IPage<Object> page, @Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO);
+	IPage<BasicdataOpenIncomingSettingEntity> pageList(IPage<Object> page, @Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO);
 
 	BasicdataOpenIncomingSettingEntity findEntityByParam(@Param("param") BasicdataOpenIncomingDTO basicdataOpenIncomingDTO);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataOpenIncomingSettingMapper.xml

@@ -2,11 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.logpm.basicdata.mapper.BasicdataOpenIncomingSettingMapper">
 
-    <select id="pageList" resultType="com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO">
-        select lboi.brand brand,
-               lww.name warehouseName
+    <select id="pageList" resultType="com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity">
+        select lboi.*
         from logpm_basicdata_open_incoming lboi
-        left join logpm_warehouse_warehouse lww on lww.id = lboi.warehouse_id
         where 1=1
         and lboi.is_deleted = 0
         <if test="param.warehouseId != null">

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCategoryService.java

@@ -54,4 +54,7 @@ public interface IBasicdataCategoryService extends BaseService<BasicdataCategory
     List<BasicdataCategoryEntity> lazyTree( String tenantId,Long parentId);
 
     List<JSONObject> findListByName(String goodsName);
+
+    List<BasicdataCategoryEntity> listName(BasicdataCategoryVO basicdataCategory);
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataOpenIncomingSettingService.java

@@ -3,12 +3,11 @@ package com.logpm.basicdata.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.dto.BasicdataOpenIncomingDTO;
 import com.logpm.basicdata.entity.BasicdataOpenIncomingSettingEntity;
-import com.logpm.basicdata.vo.BasicdataOpenIncomingSettingVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
 public interface IBasicdataOpenIncomingSettingService extends BaseService<BasicdataOpenIncomingSettingEntity> {
-	IPage<BasicdataOpenIncomingSettingVO> pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO);
+	IPage<BasicdataOpenIncomingSettingEntity> pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO);
 
 	R addEntity(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO);
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCategoryServiceImpl.java

@@ -63,4 +63,9 @@ public class BasicdataCategoryServiceImpl extends BaseServiceImpl<BasicdataCateg
 		return baseMapper.findListByName(goodsName);
 	}
 
+	@Override
+	public List<BasicdataCategoryEntity> listName(BasicdataCategoryVO basicdataCategory) {
+		return baseMapper.listName(basicdataCategory.getName());
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFactoryCategoryServiceImpl.java

@@ -36,7 +36,7 @@ public class BasicdataFactoryCategoryServiceImpl extends BaseServiceImpl<Basicda
 
 		BasicdataFactoryCategoryEntity basicdataFactoryCategoryEntity = baseMapper.findEntityByParam(basicdataFactoryCategoryDTO);
 
-		if(Objects.isNull(basicdataFactoryCategoryEntity)){
+		if(!Objects.isNull(basicdataFactoryCategoryEntity)){
 			log.warn("############saveEntity: 已存在该配置");
 			return R.fail(405,"已存在该配置");
 		}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataOpenIncomingSettingServiceImpl.java

@@ -21,12 +21,12 @@ import java.util.Objects;
 @Log4j2
 public class BasicdataOpenIncomingSettingServiceImpl extends BaseServiceImpl<BasicdataOpenIncomingSettingMapper, BasicdataOpenIncomingSettingEntity> implements IBasicdataOpenIncomingSettingService {
 	@Override
-	public IPage<BasicdataOpenIncomingSettingVO> pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) {
+	public IPage<BasicdataOpenIncomingSettingEntity> pageList(BasicdataOpenIncomingDTO basicdataOpenIncomingDTO) {
 		IPage<Object> page = new Page<>();
 		page.setCurrent(basicdataOpenIncomingDTO.getPageNum());
 		page.setSize(basicdataOpenIncomingDTO.getPageSize());
 
-		IPage<BasicdataOpenIncomingSettingVO> pageList = baseMapper.pageList(page,basicdataOpenIncomingDTO);
+		IPage<BasicdataOpenIncomingSettingEntity> pageList = baseMapper.pageList(page,basicdataOpenIncomingDTO);
 
 		return pageList;
 	}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -297,9 +297,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Long departureWarehouseId = openOrderDTO.getDepartureWarehouseId();
 		Long destinationWarehouseId = openOrderDTO.getDestinationWarehouseId();
 
+		String brand = openOrderDTO.getBrand();
+		BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
+
 		WarehouseWaybillEntity waybillEntity = new WarehouseWaybillEntity();
 		waybillEntity.setWaybillNo(waybillNo);
-		waybillEntity.setBrand(openOrderDTO.getBrand());
+		if(!Objects.isNull(basicdataBrandEntity)){
+			waybillEntity.setBrandId(basicdataBrandEntity.getId());
+		}
+		waybillEntity.setBrand(brand);
 		waybillEntity.setOrderNo(openOrderDTO.getOrderCode());
 		waybillEntity.setDepartureWarehouseId(departureWarehouseId);
 		waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName());