三方商城列表、干线包件信息带出

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTripartiteMallVO.java

@@ -31,4 +31,14 @@ import lombok.EqualsAndHashCode;
 public class BasicdataTripartiteMallVO extends BasicdataTripartiteMallEntity {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 客户名称
+	 */
+	private String clientName;
+
+	/**
+	 * 服务类型
+	 */
+	private String typeService;
+
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java

@@ -103,6 +103,22 @@ public class AftersalesAbnormalPackageController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 异常处理包件记录 查询包件是否处理过的信息
+	 */
+	@GetMapping("/getAdvanceAbnormalPackage")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询包件是否处理过的信息", notes = "传入aftersalesAbnormalPackage")
+	public R getAdvanceAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return R.fail(403,"未授权!!!");
+		}
+		log.info("查询包件的数据》》》{}",aftersalesAbnormalPackage);
+		R  r= aftersalesAbnormalPackageService.getAdvanceAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query));
+		return r;
+	}
+
 	/**
 	 * 异常处理包件记录 自定义分页
 	 */

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -20,15 +20,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
 import com.logpm.aftersales.dto.AftersalesWorkOrderListExcelDTO;
-import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity;
 import com.logpm.aftersales.entity.AftersalesAppealEntity;
 import com.logpm.aftersales.entity.AftersalesSettlementEntity;
 import com.logpm.aftersales.excel.AftersalesWorkOrderImporter;
-import com.logpm.aftersales.mapper.AftersalesCompletionRecordMapper;
 import com.logpm.aftersales.service.IAftersalesCompletionRecordService;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
-import com.xxl.job.core.handler.annotation.XxlJob;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -37,16 +34,13 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.User;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
@@ -60,10 +54,7 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.Map;
-import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -727,6 +718,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	}
 
 
+
 	@GetMapping("/exportAllWorkOrder")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入aftersalesWorkOrder")

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.aftersales.mapper;
 
+import com.logpm.aftersales.dto.AftersalesAbnormalPackageDTO;
 import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
@@ -63,4 +64,12 @@ public interface AftersalesAbnormalPackageMapper extends BaseMapper<AftersalesAb
 	List<AftersalesDeliverVO> getDeliver(@Param("orderPackageCode")  String orderPackageCode);
 
     void updateAftersalesAbnormalPackageByWorkOrderIdAndPackCodeAndOtherNodex(@Param("workId") Long workId,@Param("orderPackageCode") String orderPackageCode, @Param("packageFinish") Integer packageFinish);
+
+	/**
+	 * 查询暂存单包件信息
+	 * @param aftersalesAbnormalPackageDTO
+	 * @return
+	 */
+	List<AftersalesAbnormalPackageVO> getAdvanceAbnormalPackage(@Param("param")AftersalesAbnormalPackageDTO aftersalesAbnormalPackageDTO);
+
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml

@@ -39,8 +39,19 @@
         SELECT * FROM logpm_aftersales_abnormal_package ${ew.customSqlSegment}
     </select>
     <select id="getAbnormalPackage" resultType="com.logpm.aftersales.vo.AftersalesAbnormalPackageVO">
-        select ldpl.order_package_code packageCode  ,ldpl.waybill_number waybillNumber,ldpl.order_code orderCode,ldpl.waybill_id waybillId,ldpl.stock_article_id orderId,
+        select ldpl.order_package_code packageCode,
-        lawo.work_order_number workOrderNumber,lawo.id workOrderId,ldsa.brand brandName,ldpl.firsts,ldpl.second,ldsa.mall_name mallName,ldsa.mall_id mallId
+        ldpl.waybill_number waybillNumber,
+        ldpl.order_code orderCode,
+        ldpl.waybill_id waybillId,
+        ldpl.stock_article_id orderId,
+        lawo.work_order_number workOrderNumber,
+        lawo.id workOrderId,
+        ldsa.brand brandName,
+        ldpl.firsts,
+        ldpl.second,
+        ldpl.third_product,
+        ldsa.mall_name mallName,
+        ldsa.mall_id mallId
         from  logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_aftersales_abnormal_package laap  on laap.package_code = ldpl.order_package_code
         LEFT JOIN logpm_aftersales_work_order lawo on laap.work_order_id = lawo.id
@@ -73,5 +84,33 @@
                 LEFT JOIN logpm_distribution_delivery_list AS lddl ON lddl.id = lds.delivery_id
         where ldrp.packet_bar_status in (1,3) and ldrp.packet_bar_code = #{orderPackageCode}
     </select>
+    <select id="getAdvanceAbnormalPackage" resultType="com.logpm.aftersales.vo.AftersalesAbnormalPackageVO">
+        SELECT
+        DISTINCT
+        ltad.order_package_code AS packageCode,
+        ltad.waybill_no AS waybillNumber,
+        ltad.order_code AS orderCode,
+        ltad.waybill_id AS waybillId,
+        ltad.brand AS brandName,
+        ltad.first_pack_name AS firsts,
+        ltad.second_pack_name AS second,
+        ltad.third_pack_name AS third_product,
+        lawo.id workOrderId,
+        lawo.work_order_number workOrderNumber,
+        lww.consignee AS mallName,
+        lww.consignee_id AS mallId
+        FROM
+        logpm_trunkline_advance_detail AS ltad
+        LEFT JOIN logpm_warehouse_waybill AS lww ON ltad.waybill_id = lww.id AND lww.is_deleted = 0
+        LEFT JOIN logpm_aftersales_abnormal_package laap  on laap.package_code = ltad.order_package_code AND laap.is_deleted = 0
+        LEFT JOIN logpm_aftersales_work_order lawo on laap.work_order_id = lawo.id AND lawo.is_deleted = 0
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ltad.order_code = ldsa.order_code AND ldsa.is_deleted = 0
+        <where>
+            ltad.is_deleted = 0
+            <if test="param.packageCode != null and param.packageCode != ''">
+              AND  ltad.order_package_code = #{param.packageCode}
+            </if>
+        </where>
+    </select>
 
 </mapper>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java

@@ -22,6 +22,8 @@ import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
 import java.util.List;
 import java.util.Map;
 
@@ -57,4 +59,12 @@ public interface IAftersalesAbnormalPackageService extends BaseService<Aftersale
 	 * @return
 	 */
     List<AftersalesAbnormalPackageVO> getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page);
+
+	/**
+	 * 查询暂存单包件信息
+	 * @param aftersalesAbnormalPackage
+	 * @param page
+	 * @return
+	 */
+	R getAdvanceAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java

@@ -18,6 +18,7 @@ package com.logpm.aftersales.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.aftersales.dto.AftersalesAbnormalPackageDTO;
 import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
@@ -32,6 +33,7 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.api.R;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -41,6 +43,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 异常处理包件记录 服务实现类
@@ -115,4 +118,36 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 
 	}
 
+	@Override
+	public R getAdvanceAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page) {
+		AftersalesAbnormalPackageDTO aftersalesAbnormalPackageDTO = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAbnormalPackage), AftersalesAbnormalPackageDTO.class);
+		if (Objects.isNull(aftersalesAbnormalPackageDTO.getPackageCode())){
+			return R.fail("orderPackageCode参数缺失");
+		}
+		List<AftersalesAbnormalPackageVO> abnormalPackage = baseMapper.getAdvanceAbnormalPackage(aftersalesAbnormalPackageDTO);
+		if (!abnormalPackage.isEmpty()){
+			abnormalPackage.forEach(i ->{
+				if (ObjectUtils.isNotNull(i.getPackageCode())){
+					i.setTrunklines( baseMapper.getTrunklines(i.getPackageCode()));
+					i.setDeliver(baseMapper.getDeliver(i.getPackageCode()));
+				}
+				if(ObjectUtils.isNotNull(i.getMallId())){
+					List<BasicdataStoreBusinessEntity> byClientIdList = basicdataStoreBusinessClient.findByClientIdList(i.getMallId());
+					if(!byClientIdList.isEmpty()){
+						StringBuffer stringBu = new StringBuffer();
+						byClientIdList.forEach(a ->{
+							String value = DictBizCache.getValue( DictBizConstant.BASIC_FREIGHT_TYPE,a.getTypeService());
+							stringBu.append(value);
+						});
+						i.setTypeServiceName(stringBu.toString());
+					}
+				}
+			});
+			return R.data(abnormalPackage);
+		}else {
+			return R.data(null,"未查询到相关信息,请手动录入数据");
+		}
+
+	}
+
 }

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.dto.BasicdataTripartiteMallDTO;
 import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
 import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
 import com.logpm.basicdata.service.IBasicdataTripartiteMallService;
@@ -99,6 +100,17 @@ public class BasicdataTripartiteMallController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 客户三方商城 自定义分页
+	 */
+	@GetMapping("/pageList")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataTripartiteMall")
+	public R<IPage<BasicdataTripartiteMallVO>> pageList(Map<String,Object> basicdataTripartiteMall, Query query) {
+		IPage<BasicdataTripartiteMallVO> pages = basicdataTripartiteMallService.pageList(Condition.getPage(query), basicdataTripartiteMall);
+		return R.data(pages);
+	}
+
 	/**
 	 * 客户三方商城 新增
 	 */

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

@@ -19,12 +19,14 @@ package com.logpm.basicdata.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.dto.BasicdataTripartiteMallDTO;
 import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
 import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
 import com.logpm.basicdata.vo.BasicdataTripartiteMallVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户三方商城 Mapper 接口
@@ -57,4 +59,12 @@ public interface BasicdataTripartiteMallMapper extends BaseMapper<BasicdataTripa
 	List<BasicdataTripartiteMallEntity> getOwn();
 
 	Long getClientIdByNameAndBrandAndCode(@Param("name") String name, @Param("code") String code, @Param("brand") String brand);
+
+	/**
+	 * 查询三方商城分页
+	 * @param page
+	 * @param aftersalesAbnormalPackageDTO
+	 * @return
+	 */
+    IPage<BasicdataTripartiteMallVO> pageList(IPage<Object> page,@Param("param") Map<String,Object> aftersalesAbnormalPackageDTO);
 }

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

@@ -62,5 +62,29 @@
 
         limit 1
     </select>
+    <select id="pageList" resultType="com.logpm.basicdata.vo.BasicdataTripartiteMallVO">
+        SELECT
+        lbtm.id,
+        lbtm.tripartite_mall,
+        lbtm.tripartite_coding,
+        lbtm.brand_name,
+        lbc.client_name AS clientName,
+        lbc.type_service AS typeService
+        FROM
+        logpm_basicdata_tripartite_mall AS lbtm
+        LEFT JOIN logpm_basicdata_client AS lbc ON lbtm.client_id = lbc.id AND  lbc.is_deleted = 0
+        <where>
+            lbtm.is_deleted = 0
+            <if test="param.tripartiteMall != null and param.tripartiteMall != ''">
+                and lbtm.tripartite_mall like concat('%',#{param.tripartiteMall},'%')
+            </if>
+            <if test="param.tripartiteCoding != null and param.tripartiteCoding != ''">
+                and lbtm.tripartite_coding like concat('%',#{param.tripartiteCoding},'%')
+            </if>
+            <if test="param.brandName != null and param.brandName != ''">
+                and lbtm.brand_name like concat('%',#{param.brandName},'%')
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -18,6 +18,7 @@ package com.logpm.basicdata.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.dto.BasicdataTripartiteMallDTO;
 import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
 import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
 import com.logpm.basicdata.vo.BasicdataTripartiteMallVO;
@@ -25,6 +26,7 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户三方商城 服务类
@@ -70,4 +72,12 @@ public interface IBasicdataTripartiteMallService extends BaseService<BasicdataTr
 	 * @return
 	 */
 	R removeClientTripartiteMall(String ids);
+
+	/**
+	 * 查询三方商城分页
+	 * @param page
+	 * @param basicdataTripartiteMall
+	 * @return
+	 */
+	IPage<BasicdataTripartiteMallVO> pageList(IPage<Object> page, Map<String,Object> basicdataTripartiteMall);
 }

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

@@ -16,8 +16,10 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.dto.BasicdataTripartiteMallDTO;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataClientLogEntity;
 import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
@@ -38,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -187,6 +190,12 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		return R.status(this.removeByIds(list));
 	}
 
+	@Override
+	public IPage<BasicdataTripartiteMallVO> pageList(IPage<Object> page, Map<String,Object> basicdataTripartiteMall) {
+
+		return baseMapper.pageList(page,basicdataTripartiteMall);
+	}
+
 	private String comparisonBasicdataTripartiteMall(BasicdataTripartiteMallEntity entity, BasicdataTripartiteMallEntity basicdataTripartiteMall) {
 		StringBuilder builder = new StringBuilder();
 		String str1 = entity.getTripartiteCoding().isEmpty() ? "空" : entity.getTripartiteCoding();