添加包件查询，修改客户导入，入库导入

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesSettlementEntity.java

@@ -20,6 +20,8 @@ public class AftersalesSettlementEntity extends TenantEntity {
  private String workOrderNumber;
  //营业部
  private String businessName;
+ //营业部ID
+ private Long businessId;
  //品牌
  private String brandName;
  //商场名称
@@ -31,9 +33,9 @@ public class AftersalesSettlementEntity extends TenantEntity {
  //异常类型名称
  private String workOrderTypeName;
  //处理结果
- private String resulType;
+ private String resultType;
  //处理结果名称
- private String resulTypeName;
+ private String resultTypeName;
  //处理结果ID
  private Long laprId;
  //发现环节

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAbnormalPackageVO.java

@@ -40,6 +40,7 @@ public class AftersalesAbnormalPackageVO extends AftersalesAbnormalPackageEntity
 
 	private Integer isAbnormalSinging;
 
+	private String workOrderNumber;
 
 
 }

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

@@ -23,6 +23,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -55,6 +56,7 @@ import javax.servlet.http.HttpServletResponse;
 @AllArgsConstructor
 @RequestMapping("/aftersalesAbnormalPackage")
 @Api(value = "异常处理包件记录", tags = "异常处理包件记录接口")
+@Slf4j
 public class AftersalesAbnormalPackageController extends BladeController {
 
 	private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService;
@@ -80,6 +82,18 @@ public class AftersalesAbnormalPackageController extends BladeController {
 		return R.data(AftersalesAbnormalPackageWrapper.build().pageVO(pages));
 	}
 
+	/**
+	 * 异常处理包件记录 查询包件是否处理过的信息
+	 */
+	@GetMapping("/getAbnormalPackage")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询包件是否处理过的信息", notes = "传入aftersalesAbnormalPackage")
+	public R<AftersalesAbnormalPackageVO> getAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
+		log.info("查询包件的数据》》》{}",aftersalesAbnormalPackage);
+		AftersalesAbnormalPackageVO pages = aftersalesAbnormalPackageService.getAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query));
+		return R.data(pages);
+	}
+
 	/**
 	 * 异常处理包件记录 自定义分页
 	 */

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

@@ -51,4 +51,10 @@ public interface AftersalesAbnormalPackageMapper extends BaseMapper<AftersalesAb
 	 */
 	List<AftersalesAbnormalPackageExcel> exportAftersalesAbnormalPackage(@Param("ew") Wrapper<AftersalesAbnormalPackageEntity> queryWrapper);
 
+	/**
+	 * 查询包件是否处理过的信息
+	 * @param aftersalesAbnormalPackageEntity
+	 * @return
+	 */
+    AftersalesAbnormalPackageVO getAbnormalPackage(@Param("param") AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity);
 }

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

@@ -35,5 +35,17 @@
     <select id="exportAftersalesAbnormalPackage" resultType="com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel">
         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,
+               lawo.work_order_number workOrderNumber,lawo.id workOrderId
+        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
+        <where>
+            ldpl. is_deleted = 0
+            <if test="param.packageCode != null and param.packageCode != ''"> and ldpl.order_package_code =#{param.packageCode } </if>
+            <if test="param.warehouseId != null and param.warehouseId != ''"> and ldpl.warehouse_id =#{param.warehouseId } </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -153,7 +153,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
                  LEFT JOIN logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
         <where>
             lap.processing_status = '4' and lap.is_deleted = 0
-            <if test="param.businessId != null and param.businessId != '' "> and lap.business_id = #{param.businessId }</if>
+            <if test="param.businessId != null  "> and lap.business_id = #{param.businessId }</if>
             <if test="param.businessName != null and param.businessName != '' "> and lap.business_name = #{param.businessName }</if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != '' "> and lawo.work_order_number = #{param.workOrderNumber }</if>
             <if test="param.businessName != null and param.businessName != '' "> and lap.business_name = #{param.businessName }</if>
@@ -167,7 +167,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.vehicleRoute != null and param.vehicleRoute != '' "> and lawo.vehicle_route = #{param.vehicleRoute }</if>
             <if test="param.indemnitor != null and param.indemnitor != '' "> and lacr.indemnitor = #{param.indemnitor }</if>
             <if test="param.reason != null and param.reason != '' "> and lacr.reason = #{param.reason }</if>
-            <if test="param. != null and param. != '' "> and date_format(from_unixtime(lawo.create_time),'%Y-%m-%d') = date_format(#{param.createTime}),'%Y-%m-%d')  </if>
+            <if test="param.createTime != null and param.createTime != '' "> and date_format(from_unixtime(lawo.create_time),'%Y-%m-%d') = date_format(#{param.createTime}),'%Y-%m-%d')  </if>
             <if test="param.processNumber != null and param.processNumber != '' "> and lawo.process_number = #{param.processNumber }</if>
         </where>
 

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

@@ -23,6 +23,7 @@ import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 异常处理包件记录 服务类
@@ -49,4 +50,11 @@ public interface IAftersalesAbnormalPackageService extends BaseService<Aftersale
 	 */
 	List<AftersalesAbnormalPackageExcel> exportAftersalesAbnormalPackage(Wrapper<AftersalesAbnormalPackageEntity> queryWrapper);
 
+	/**
+	 * 查询包件是否处理过的信息
+	 * @param aftersalesAbnormalPackage
+	 * @param page
+	 * @return
+	 */
+    AftersalesAbnormalPackageVO getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page);
 }

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

@@ -16,16 +16,23 @@
  */
 package com.logpm.aftersales.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.aftersales.entity.AftersalesAbnormalPackageEntity;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.aftersales.excel.AftersalesAbnormalPackageExcel;
 import com.logpm.aftersales.mapper.AftersalesAbnormalPackageMapper;
 import com.logpm.aftersales.service.IAftersalesAbnormalPackageService;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import lombok.AllArgsConstructor;
+import org.springblade.core.log.exception.ServiceException;
 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.List;
+import java.util.Map;
 
 /**
  * 异常处理包件记录 服务实现类
@@ -34,8 +41,11 @@ import java.util.List;
  * @since 2023-11-17
  */
 @Service
+@AllArgsConstructor
 public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<AftersalesAbnormalPackageMapper, AftersalesAbnormalPackageEntity> implements IAftersalesAbnormalPackageService {
 
+	private final IBasicdataWarehouseClient warehouseClient;
+
 	@Override
 	public IPage<AftersalesAbnormalPackageVO> selectAftersalesAbnormalPackagePage(IPage<AftersalesAbnormalPackageVO> page, AftersalesAbnormalPackageVO aftersalesAbnormalPackage) {
 		return page.setRecords(baseMapper.selectAftersalesAbnormalPackagePage(page, aftersalesAbnormalPackage));
@@ -51,4 +61,23 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 		return aftersalesAbnormalPackageList;
 	}
 
+	/**
+	 * 查询包件是否处理过的信息
+	 * @param aftersalesAbnormalPackage
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public AftersalesAbnormalPackageVO getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+
+		AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAbnormalPackage), AftersalesAbnormalPackageEntity.class);
+		if(ObjectUtils.isNotNull(myCurrentWarehouse)){
+			aftersalesAbnormalPackageEntity.setWarehouseId(myCurrentWarehouse.getId());
+		}
+
+		return baseMapper.getAbnormalPackage(aftersalesAbnormalPackageEntity);
+
+	}
+
 }

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

@@ -1100,7 +1100,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		iPage.getRecords().forEach(i ->{
 			i.setWorkOrderTypeName( DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER,i.getWorkOrderType()));
 			i.setDiscoveryNodeName( DictBizCache.getValue(DictBizConstant.PC_DISCOVERY_NODE,i.getDiscoveryNode()));
-			i.setResulTypeName( DictBizCache.getValue(DictBizConstant.RESULT_HANDLING,i.getResulType()));
+			i.setResultTypeName( DictBizCache.getValue(DictBizConstant.RESULT_HANDLING,i.getResultType()));
 			i.setWorkOrderStatusName(DictBizCache.getValue(DictBizConstant.WORK_ORDER_STATUS,i.getWorkOrderStatus()));
 		});
 		return iPage;

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

@@ -489,21 +489,28 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		if(!storageServicesEntities.isEmpty()){
 			List<BasicdataStorageServicesEntity> servicesEntityList = new ArrayList<>();
 			storageServicesEntities.stream().forEach(i ->{
-				if(i.getSendWarehouseName().contains(",")){
-					String[] split = i.getSendWarehouseName().split(",");
-					for (int j = 0; j < split.length; j++) {
-						BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity();
-						Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName())).findFirst().get().getId();
-						BeanUtil.copyProperties(i,servicesEntity);
-						servicesEntity.setSendWarehouseId(id.toString());
-						servicesEntity.setSendWarehouseName(split[j]);
-						servicesEntityList.add(servicesEntity);
+				if(ObjectUtils.isNotNull(i.getSendWarehouseName())){
+					if(  i.getSendWarehouseName().contains(",")){
+						String[] split = i.getSendWarehouseName().split(",");
+						for (int j = 0; j < split.length; j++) {
+							BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity();
+							Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName())).findFirst().get().getId();
+							BeanUtil.copyProperties(i,servicesEntity);
+							servicesEntity.setSendWarehouseId(id.toString());
+							servicesEntity.setSendWarehouseName(split[j]);
+							servicesEntityList.add(servicesEntity);
+						}
+					}else{
+						Long id = list1.stream().filter(q ->    q.getName().equals(i.getSendWarehouseName())   ).findFirst().get().getId();
+						i.setSendWarehouseId(id.toString());
+						servicesEntityList.add(i);
 					}
 				}else{
-					Long id = list1.stream().filter(q -> q.getName().equals(i.getSendWarehouseName())).findFirst().get().getId();
-					i.setSendWarehouseId(id.toString());
-					servicesEntityList.add(i);
+					BasicdataStorageServicesEntity servicesEntity = new BasicdataStorageServicesEntity();
+					BeanUtil.copyProperties(i,servicesEntity);
+					servicesEntityList.add(servicesEntity);
 				}
+
 			});
 			basicdataStorageServicesService.saveBatch(servicesEntityList);
 		}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

@@ -190,37 +190,37 @@ public class WarehouseWarehousingEntryController extends BladeController {
 	/**
 	 * 导出数据
 	 */
-//	@GetMapping("/export-warehouseWarehousingEntry")
-//	@ApiOperationSupport(order = 9)
-//	@ApiOperation(value = "导出数据", notes = "传入warehouseWarehousingEntry")
-//	public void exportWarehouseWarehousingEntry(@ApiIgnore @RequestParam Map<String, Object> warehouseWarehousingEntry, BladeUser bladeUser, HttpServletResponse response) {
-//
-//		List<WarehousingEntryDetailExcel> list = new ArrayList<>();
-//		WarehousingEntryDetailExcel warehousingEntryDetailExcel = new WarehousingEntryDetailExcel();
-//		warehousingEntryDetailExcel.setReceiptBatch("2022031402350 选添");
-//		warehousingEntryDetailExcel.setReceiptDate(new Date());
-//		warehousingEntryDetailExcel.setCustomerCode("NCOP00011");
-//		warehousingEntryDetailExcel.setCustomerName("南充欧派衣橱");
-//		warehousingEntryDetailExcel.setStoreName("门店  选填");
-//		warehousingEntryDetailExcel.setOrderNumber("OPLYC南充市220200015YA5-5 选填");
-//		warehousingEntryDetailExcel.setBrandName("欧派");
-//		warehousingEntryDetailExcel.setWarehouse("南充仓");
-//		warehousingEntryDetailExcel.setWarehouseCode("NC");
-//		warehousingEntryDetailExcel.setTrainNumber("SF098876456 选添");
-//		warehousingEntryDetailExcel.setLicensePlate("川S5346347 选添");
-//		warehousingEntryDetailExcel.setServiceType("自提  商配  市配  选择其一");
-//		warehousingEntryDetailExcel.setSku("G21191547");
-//		warehousingEntryDetailExcel.setProductName("OP-CD309-1.8慕思如梦时光床垫/1800*2000*260");
-//		warehousingEntryDetailExcel.setProductCode("G21191547");
-//		warehousingEntryDetailExcel.setProductUnit("张");
-//		warehousingEntryDetailExcel.setLogisticsCompany("物流公司 选填");
-//		warehousingEntryDetailExcel.setPackagingNumber("1");
-//		warehousingEntryDetailExcel.setPackagingSpecifications("1");
-//		warehousingEntryDetailExcel.setCreateInventory(100);
-//		warehousingEntryDetailExcel.setPositions("存放位置  选填");
-//		warehousingEntryDetailExcel.setRemark("备注  选填");
-//		list.add(warehousingEntryDetailExcel);
-//		ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehousingEntryDetailExcel.class);
-//	}
+	@GetMapping("/export-warehouseWarehousingTemplate")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据模版", notes = "传入warehouseWarehousingEntry")
+	public void exportWarehouseWarehousingEntry(@ApiIgnore @RequestParam Map<String, Object> warehouseWarehousingEntry, BladeUser bladeUser, HttpServletResponse response) {
+
+		List<WarehousingEntryDetailExcel> list = new ArrayList<>();
+		WarehousingEntryDetailExcel warehousingEntryDetailExcel = new WarehousingEntryDetailExcel();
+		warehousingEntryDetailExcel.setReceiptBatch("2022031402350 选添");
+		warehousingEntryDetailExcel.setReceiptDate(new Date());
+		warehousingEntryDetailExcel.setCustomerCode("NCOP00011");
+		warehousingEntryDetailExcel.setCustomerName("南充欧派衣橱");
+		warehousingEntryDetailExcel.setStoreName("门店  选填");
+		warehousingEntryDetailExcel.setOrderNumber("OPLYC南充市220200015YA5-5 选填");
+		warehousingEntryDetailExcel.setBrandName("欧派");
+		warehousingEntryDetailExcel.setWarehouse("南充仓");
+		warehousingEntryDetailExcel.setWarehouseCode("NC");
+		warehousingEntryDetailExcel.setTrainNumber("SF098876456 选添");
+		warehousingEntryDetailExcel.setLicensePlate("川S5346347 选添");
+		warehousingEntryDetailExcel.setServiceType("自提  商配  市配  选择其一");
+		warehousingEntryDetailExcel.setSku("G21191547");
+		warehousingEntryDetailExcel.setProductName("OP-CD309-1.8慕思如梦时光床垫/1800*2000*260");
+		warehousingEntryDetailExcel.setProductCode("G21191547");
+		warehousingEntryDetailExcel.setProductUnit("张");
+		warehousingEntryDetailExcel.setLogisticsCompany("物流公司 选填");
+		warehousingEntryDetailExcel.setPackagingNumber("1");
+		warehousingEntryDetailExcel.setPackagingSpecifications("1");
+		warehousingEntryDetailExcel.setCreateInventory(100);
+		warehousingEntryDetailExcel.setPositions("存放位置  选填");
+		warehousingEntryDetailExcel.setRemark("备注  选填");
+		list.add(warehousingEntryDetailExcel);
+		ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehousingEntryDetailExcel.class);
+	}
 
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -462,6 +462,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 					entryEntity.setServiceType(dictBiz.getDictKey());//仓库名称
 				}
 				entryEntity.setPositions(Optional.ofNullable(o.getPositions()).orElse(null));
+				entryEntity.setRemark(Optional.ofNullable(o.getRemark()).orElse(null));
 				String s = JSONObject.toJSONString(entryEntity);
 				return s;
 			}