1.提货线路增加修改功能

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicDelineEntity.java

@@ -92,6 +92,16 @@ public class BasicDelineEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库联系人")
 	private String warehouseContacts;
+	/**
+	 * 终点里程
+	 */
+	@ApiModelProperty(value = "终点里程")
+	private BigDecimal route;
+	/**
+	 * 终点时效
+	 */
+	@ApiModelProperty(value = "终点时效")
+	private BigDecimal ageing;
 	/**
 	 * 预留1
 	 */

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/vo/BasicDelineNodeVO.java

@@ -17,10 +17,13 @@
 package com.logpm.basic.vo;
 
 import com.logpm.basic.entity.BasicDelineNodeEntity;
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * 提货路线节点表 视图实体类
  *
@@ -31,5 +34,15 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class BasicDelineNodeVO extends BasicDelineNodeEntity {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 里程;单位(km)
+	 */
+	@ApiModelProperty(value = "里程;单位(km)")
+	private BigDecimal route;
+	/**
+	 * 时效;单位(h)
+	 */
+	@ApiModelProperty(value = "时效;单位(h)")
+	private BigDecimal ageing;
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicDelineController.java

@@ -17,6 +17,8 @@
 package com.logpm.basic.controller;
 
 import com.logpm.basic.dto.BasicDelineDTO;
+import com.logpm.basic.dto.BasicDelineNodeDTO;
+import com.logpm.basic.service.IBasicDelineMiddleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,6 +26,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
+import net.logstash.logback.encoder.org.apache.commons.lang3.StringEscapeUtils;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -43,6 +47,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -55,9 +60,11 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/deline")
 @Api(value = "提货路线", tags = "提货路线接口")
+@Slf4j
 public class BasicDelineController extends BladeController {
 
 	private final IBasicDelineService basicDelineService;
+	private final IBasicDelineMiddleService basicDelineMiddleService;
 
 	/**
 	 * 提货路线 详情
@@ -98,7 +105,11 @@ public class BasicDelineController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicDeline")
 	public R save(@Valid @RequestBody BasicDelineDTO basicDeline) {
-		return R.status(basicDelineService.save(basicDeline));
+		//转义->
+		basicDeline.setLineName(StringEscapeUtils.unescapeHtml4(basicDeline.getLineName()));
+		basicDelineService.save(basicDeline);
+		//新增关联表
+		return R.status(basicDelineMiddleService.saveByDTO(basicDeline));
 	}
 
 	/**
@@ -108,6 +119,12 @@ public class BasicDelineController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入basicDeline")
 	public R update(@Valid @RequestBody BasicDelineDTO basicDeline) {
+		//转义->
+		basicDeline.setLineName(StringEscapeUtils.unescapeHtml4(basicDeline.getLineName()));
+		//删除所有中间表
+		basicDelineMiddleService.deleteBydelineId(Func.toLongList(String.valueOf(basicDeline.getId())));
+		//新增关联表
+		basicDelineMiddleService.saveByDTO(basicDeline);
 		return R.status(basicDelineService.updateById(basicDeline));
 	}
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicDelineNodeController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basic.controller;
 
+import com.logpm.basic.dto.BasicDelineNodeDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -85,7 +86,7 @@ public class BasicDelineNodeController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入basicDelineNode")
-	public R<IPage<BasicDelineNodeVO>> page(BasicDelineNodeVO basicDelineNode, Query query) {
+	public R<IPage<BasicDelineNodeVO>> page(BasicDelineNodeDTO basicDelineNode, Query query) {
 		IPage<BasicDelineNodeVO> pages = basicDelineNodeService.selectBasicDelineNodePage(Condition.getPage(query), basicDelineNode);
 		return R.data(pages);
 	}

blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicDelineDTO.java

@@ -19,6 +19,7 @@ package com.logpm.basic.dto;
 import com.logpm.basic.entity.BasicDelineEntity;
 import com.logpm.basic.entity.BasicDelineNodeEntity;
 import com.logpm.basic.entity.BasicLineNodeEntity;
+import com.logpm.basic.vo.BasicDelineNodeVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,6 +40,7 @@ public class BasicDelineDTO extends BasicDelineEntity {
 	 * 提货路线节点
 	 */
 	@ApiModelProperty(value = "提货路线节点")
-	private List<BasicDelineNodeEntity> delinenode;
+	private List<BasicDelineNodeDTO> delinenode;
+
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/dto/BasicDelineNodeDTO.java

@@ -17,9 +17,12 @@
 package com.logpm.basic.dto;
 
 import com.logpm.basic.entity.BasicDelineNodeEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * 提货路线节点表 数据传输对象实体类
  *
@@ -31,4 +34,23 @@ import lombok.EqualsAndHashCode;
 public class BasicDelineNodeDTO extends BasicDelineNodeEntity {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 里程
+	 */
+	@ApiModelProperty(value = "里程")
+	private BigDecimal route;
+	/**
+	 * 时效
+	 */
+	@ApiModelProperty(value = "时效")
+	private BigDecimal ageing;
+
+	/**
+	 * 主表Id
+	 */
+	@ApiModelProperty(value = "主表Id")
+	private Long delineId;
+
+
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicDelineMiddleMapper.xml

@@ -15,13 +15,13 @@
         <result column="create_dept" property="createDept"/>
         <result column="deline_id" property="delineId"/>
         <result column="node_id" property="nodeId"/>
-        <result column="reserve1" property="reserve1"/>
-        <result column="reserve2" property="reserve2"/>
+        <result column="route" property="route"/>
+        <result column="ageing" property="ageing"/>
         <result column="reserve3" property="reserve3"/>
     </resultMap>
 
 
-    <select id="selectBasicDelineMiddlePage" resultMap="basicDelineMiddleResultMap">
+    <select id="selectBasicDelineMiddlePage" resultType="com.logpm.basic.vo.BasicDelineMiddleVO">
         select * from logpm_basic_deline_middle where is_deleted = 0
     </select>
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicDelineNodeMapper.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basic.mapper;
 
+import com.logpm.basic.dto.BasicDelineNodeDTO;
 import com.logpm.basic.entity.BasicDelineNodeEntity;
 import com.logpm.basic.vo.BasicDelineNodeVO;
 import com.logpm.basic.excel.BasicDelineNodeExcel;
@@ -40,7 +41,7 @@ public interface BasicDelineNodeMapper extends BaseMapper<BasicDelineNodeEntity>
 	 * @param basicDelineNode
 	 * @return
 	 */
-	List<BasicDelineNodeVO> selectBasicDelineNodePage(IPage page, BasicDelineNodeVO basicDelineNode);
+	List<BasicDelineNodeVO> selectBasicDelineNodePage(IPage page,@Param("param") BasicDelineNodeDTO basicDelineNode);
 
 
 	/**

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicDelineNodeMapper.xml

@@ -26,8 +26,31 @@
     </resultMap>
 
 
-    <select id="selectBasicDelineNodePage" resultMap="basicDelineNodeResultMap">
-        select * from logpm_basic_deline_node where is_deleted = 0
+    <select id="selectBasicDelineNodePage" resultType="com.logpm.basic.vo.BasicDelineNodeVO">
+        SELECT
+            lbdn.id id,
+            lbdn.tenant_id tenantId,
+            lbdn.create_user createUser,
+            lbdn.create_time createTime,
+            lbdn.update_user updateUser,
+            lbdn.update_time updateTime,
+            lbdn.STATUS status,
+            lbdn.create_dept createDept,
+            lbdn.customer customer,
+            lbdn.contacts contacts,
+            lbdn.address address,
+            lbdn.telephone telephone,
+            lbdm.ageing ageing,
+            lbdm.route route
+        FROM
+            logpm_basic_deline_node lbdn
+                JOIN logpm_basic_deline_middle lbdm  on lbdn.id = lbdm.node_id
+        <where>
+            lbdn.is_deleted = 0
+            AND lbdm.is_deleted = 0
+            <if test="param.delineId != null ">and lbdm.deline_id = #{param.delineId}</if>
+            <if test="param.id != null ">and lbdm.node_id = #{param.id}</if>
+        </where>
     </select>
 
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineMiddleService.java

@@ -17,6 +17,7 @@
 package com.logpm.basic.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basic.dto.BasicDelineDTO;
 import com.logpm.basic.entity.BasicDelineMiddleEntity;
 import com.logpm.basic.vo.BasicDelineMiddleVO;
 import com.logpm.basic.excel.BasicDelineMiddleExcel;
@@ -48,5 +49,17 @@ public interface IBasicDelineMiddleService extends BaseService<BasicDelineMiddle
 	 * @return
 	 */
 	List<BasicDelineMiddleExcel> exportBasicDelineMiddle(Wrapper<BasicDelineMiddleEntity> queryWrapper);
-
+	/**
+	 * 新增关联表
+	 *
+	 * @param basicDeline
+	 * @return
+	 */
+	Boolean saveByDTO(BasicDelineDTO basicDeline);
+	/**
+	 * 删除关联表
+	 *
+	 * @return
+	 */
+    Integer deleteBydelineId(List<Long> id);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicDelineNodeService.java

@@ -17,6 +17,7 @@
 package com.logpm.basic.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basic.dto.BasicDelineNodeDTO;
 import com.logpm.basic.entity.BasicDelineNodeEntity;
 import com.logpm.basic.vo.BasicDelineNodeVO;
 import com.logpm.basic.excel.BasicDelineNodeExcel;
@@ -38,7 +39,7 @@ public interface IBasicDelineNodeService extends BaseService<BasicDelineNodeEnti
 	 * @param basicDelineNode
 	 * @return
 	 */
-	IPage<BasicDelineNodeVO> selectBasicDelineNodePage(IPage<BasicDelineNodeVO> page, BasicDelineNodeVO basicDelineNode);
+	IPage<BasicDelineNodeVO> selectBasicDelineNodePage(IPage<BasicDelineNodeVO> page, BasicDelineNodeDTO basicDelineNode);
 
 
 	/**

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineMiddleServiceImpl.java

@@ -16,15 +16,24 @@
  */
 package com.logpm.basic.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.basic.dto.BasicDelineDTO;
+import com.logpm.basic.dto.BasicDelineMiddleDTO;
+import com.logpm.basic.entity.BasicDelineEntity;
 import com.logpm.basic.entity.BasicDelineMiddleEntity;
+import com.logpm.basic.entity.BasicLineEntity;
+import com.logpm.basic.entity.BasicLineNodeEntity;
 import com.logpm.basic.vo.BasicDelineMiddleVO;
 import com.logpm.basic.excel.BasicDelineMiddleExcel;
 import com.logpm.basic.mapper.BasicDelineMiddleMapper;
 import com.logpm.basic.service.IBasicDelineMiddleService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,6 +43,7 @@ import java.util.List;
  * @since 2023-05-25
  */
 @Service
+@Slf4j
 public class BasicDelineMiddleServiceImpl extends BaseServiceImpl<BasicDelineMiddleMapper, BasicDelineMiddleEntity> implements IBasicDelineMiddleService {
 
 	@Override
@@ -51,4 +61,24 @@ public class BasicDelineMiddleServiceImpl extends BaseServiceImpl<BasicDelineMid
 		return basicDelineMiddleList;
 	}
 
+	@Override
+	public Boolean saveByDTO(BasicDelineDTO basicDeline) {
+		ArrayList<BasicDelineMiddleEntity> list = new ArrayList<>();
+		basicDeline.getDelinenode().forEach(e->{
+			BasicDelineMiddleEntity basicDelineMiddleEntity = new BasicDelineMiddleEntity();
+			basicDelineMiddleEntity.setDelineId(basicDeline.getId());
+			basicDelineMiddleEntity.setNodeId(e.getId());
+			basicDelineMiddleEntity.setRoute(e.getRoute());
+			basicDelineMiddleEntity.setAgeing(e.getAgeing());
+			list.add(basicDelineMiddleEntity);
+		});
+		return this.saveBatch(list);
+	}
+
+	@Override
+	public Integer deleteBydelineId(List<Long> ids) {
+		QueryWrapper<BasicDelineMiddleEntity> wrapper = new QueryWrapper();
+		return baseMapper.delete(wrapper.lambda().in(BasicDelineMiddleEntity::getDelineId,ids));
+	}
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineNodeServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basic.service.impl;
 
+import com.logpm.basic.dto.BasicDelineNodeDTO;
 import com.logpm.basic.entity.BasicDelineNodeEntity;
 import com.logpm.basic.vo.BasicDelineNodeVO;
 import com.logpm.basic.excel.BasicDelineNodeExcel;
@@ -37,7 +38,7 @@ import java.util.List;
 public class BasicDelineNodeServiceImpl extends BaseServiceImpl<BasicDelineNodeMapper, BasicDelineNodeEntity> implements IBasicDelineNodeService {
 
 	@Override
-	public IPage<BasicDelineNodeVO> selectBasicDelineNodePage(IPage<BasicDelineNodeVO> page, BasicDelineNodeVO basicDelineNode) {
+	public IPage<BasicDelineNodeVO> selectBasicDelineNodePage(IPage<BasicDelineNodeVO> page, BasicDelineNodeDTO basicDelineNode) {
 		return page.setRecords(baseMapper.selectBasicDelineNodePage(page, basicDelineNode));
 	}
 

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

@@ -93,6 +93,17 @@ public class BasicdataWarehouseController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 仓库 字典
+	 */
+	@GetMapping("/dictionary")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "字典", notes = "传入warehouseWarehouse")
+	public R<List<BasicdataWarehouseVO>> dictionary() {
+		List<BasicdataWarehouseVO> pages = warehouseService.selectWarehouseWarehouseDictionary();
+		return R.data(pages);
+	}
+
 	/**
 	 * 仓库 自定义分页
 	 */

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

@@ -58,6 +58,13 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 	List<BasicdataWarehouseVO> getWarehouseList();
 
 
+	/**
+	 * 获取字典
+	 *
+	 * @return
+	 */
+	List<BasicdataWarehouseVO> selectWarehouseWarehouseDictionary();
+
 	Integer removeWarehouse(String id);
 
 }

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

@@ -73,6 +73,9 @@
     <select id="getWarehouseList" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
         SELECT * FROM logpm_warehouse_warehouse WHERE is_deleted=0
     </select>
+    <select id="selectWarehouseWarehouseDictionary" resultType="com.logpm.basicdata.vo.BasicdataWarehouseVO">
+        select id id,name name,linkman linkman,contact_number contactNumber,remarks remarks from logpm_warehouse_warehouse where is_deleted = 0
+    </select>
 
 
 </mapper>

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

@@ -74,4 +74,10 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	boolean removeWarehouse(List<String> ids);
 
     List<BasicdataWarehouseEntity> pageListName(String name);
+	/**
+	 * 查询仓库字典
+	 *
+	 * @return
+	 */
+	List<BasicdataWarehouseVO> selectWarehouseWarehouseDictionary();
 }

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

@@ -102,4 +102,9 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		return baseMapper.selectList( queryWrapper);
 	}
 
+	@Override
+	public List<BasicdataWarehouseVO> selectWarehouseWarehouseDictionary() {
+		return baseMapper.selectWarehouseWarehouseDictionary();
+	}
+
 }