1.售后-异常列表基本逻辑实现

2.开单-同步处理对应订单的状态 信息

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

@@ -4,11 +4,42 @@
 
     <select id="findPageList" resultType="com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity">
         select *
-        from logpm_warehouse_abnormal_record
+        from logpm_aftersales_abnormal_record
         where 1=1
-        <if test="">
-
+        <if test="param.type !=null and param.type != ''">
+            and `type` = #{param.type}
+        </if>
+        <if test="param.abnormalType !=null and param.abnormalType != ''">
+            and abnormal_type = #{param.abnormalType}
+        </if>
+        <if test="param.carType !=null and param.carType != ''">
+            and car_type = #{param.carType}
+        </if>
+        <if test="param.upWarehouseName !=null and param.upWarehouseName != ''">
+            and Locate(#{param.upWarehouseName},up_warehouse_name) > 0
+        </if>
+        <if test="param.carsNo !=null and param.carsNo != ''">
+            and Locate(#{param.carsNo},cars_no) > 0
+        </if>
+        <if test="param.waybillNo !=null and param.waybillNo != ''">
+            and Locate(#{param.waybillNo},waybill_no) > 0
+        </if>
+        <if test="param.orderCode !=null and param.orderCode != ''">
+            and Locate(#{param.orderCode},order_code) > 0
+        </if>
+        <if test="param.orderPackageCode !=null and param.orderPackageCode != ''">
+            and Locate(#{param.orderPackageCode},order_package_code) > 0
+        </if>
+        <if test="param.upUserName !=null and param.upUserName != ''">
+            and Locate(#{param.upUserName},up_user_name) > 0
+        </if>
+        <if test="param.abnormalStatus !=null and param.abnormalStatus != ''">
+            and abnormal_status = #{param.abnormalStatus}
+        </if>
+        <if test="param.dealUserName !=null and param.dealUserName != ''">
+            and Locate(#{param.dealUserName},deal_user_name) > 0
         </if>
+        order by up_time desc
     </select>
 
 </mapper>

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

@@ -70,6 +70,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 			abnormalRecordEntity.setDealTime(new Date());
 			abnormalRecordEntity.setDealUserId(AuthUtil.getUserId());
 			abnormalRecordEntity.setDealUserName(AuthUtil.getNickName());
+			updateById(abnormalRecordEntity);
 		}
 
 		return R.success("处理成功");

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java

@@ -39,4 +39,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
     void deleteAdvanceDetailById(@Param("advanceDetailId") Long advanceDetailId);
 
     Integer findTotalNumByOrderCode(@Param("orderCode") String orderCode);
+
+	void updateWaybillNoByAdvanceId(@Param("advanceId") Long advanceId, @Param("waybillNo") String waybillNo, @Param("waybillId") Long waybillId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -32,7 +32,8 @@
                lwt.pallet_name trayName,
                ltad.system_type systemType,
                ltad.weight weight,
-               ltad.volume volume
+               ltad.volume volume,
+               ltad.incoming_warehouse_name incomingWarehouseName
         from logpm_trunkline_advance_detail ltad
         left join logpm_trunkline_advance lta on lta.id = ltad.advance_id
         left join logpm_warehouse_tray_goods lwtg on lwtg.association_value = ltad.order_package_code
@@ -165,4 +166,11 @@
         and is_deleted = 0
     </select>
 
+    <update id="updateWaybillNoByAdvanceId" >
+        update logpm_trunkline_advance_detail
+        set waybill_no = #{waybillNo}
+        where advance_id = #{advanceId}
+    </update>
+
+
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@@ -49,4 +49,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
     R deleteAdvanceDetail(AdvanceDetailDTO advanceDetailDTO);
 
     Integer findTotalNumByOrderCode(String orderCode);
+
+	void updateWaybillNoByAdvanceId(Long advanceId, String waybillNo, Long waybillId);
 }

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

@@ -1,6 +1,8 @@
 package com.logpm.trunkline.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.bean.Resp;
 import com.logpm.trunkline.dto.InComingDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
@@ -29,6 +31,7 @@ public class InComingServiceImpl implements IInComingService {
 	private final ITrunklineAdvanceDetailService advanceDetailService;
 	private final ITrunklineAdvanceService advanceService;
 	private final IWarehouseTrayTypeClient warehouseTrayTypeClient;
+	private final IBasicdataWarehouseClient warehouseClient;
 
 	@Override
 	public R incomingPackage(InComingDTO inComingDTO) {
@@ -46,8 +49,7 @@ public class InComingServiceImpl implements IInComingService {
 			//包件入库开始
 			//查询包件是否有数据
 			QueryWrapper<TrunklineAdvanceDetailEntity> advanceDetailQueryWrapper = new QueryWrapper<>();
-			advanceDetailQueryWrapper.eq("order_package_code",packageCode)
-				.eq("warehouse_id",warehouseId);
+			advanceDetailQueryWrapper.eq("order_package_code",packageCode);
 			TrunklineAdvanceDetailEntity advanceDetailEntity = advanceDetailService.getOne(advanceDetailQueryWrapper);
 			if(Objects.isNull(advanceDetailEntity)){
 				log.warn("############incomingPackage: 包件不存在 packageCode={} warehouseId={}",packageCode,warehouseId);
@@ -60,6 +62,13 @@ public class InComingServiceImpl implements IInComingService {
 				return Resp.scanFail(405,"包件已入库","包件已入库");
 			}
 
+			if(StringUtil.isBlank(warehouseName)){
+				BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId);
+				if(!Objects.isNull(warehouseEntity)){
+					warehouseName = warehouseEntity.getName();
+				}
+			}
+
 			//1.修改暂存单包件入库状态
 			advanceDetailService.updatePackageStatusById("1",advanceDetailId,warehouseId,warehouseName);
 

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

@@ -448,41 +448,20 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			waybillOrderEntity.setHandleNumber(incomingNum);
 			waybillOrderEntities.add(waybillOrderEntity);
 
-
-			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findList(advanceEntity.getId());
+			//更新暂存单包件的运单信息
+			advanceDetailService.updateWaybillNoByAdvanceId(advanceId,waybillNo,waybillId);
+			List<TrunklineAdvanceDetailVO> list = advanceDetailService.findList(advanceId);
 			trunklineWaybillPackageService.saveList(list,waybillEntity);
 			distributionParcelListClient.updateEntityByOpenOrder(advanceId,waybillId);
 //			orderCodes.add(advanceEntity.getOrderCode());
 			advanceEntity.setWaybillStatus("1");
-			advanceEntity.setWaybillNo(waybillEntity.getWaybillNo());
+			advanceEntity.setWaybillNo(waybillNo);
+
 		}
 		trunklineWaybillOrderService.saveBatch(waybillOrderEntities);
 		//修改暂存单的状态为已开单
 		advanceService.updateBatchById(advanceEntityList);
 
-//		Integer isTransfer = 1;
-//		if(departureWarehouseId.equals(destinationWarehouseId)){
-//			isTransfer = 0;
-//		}
-
-//		for (String orderCode : orderCodes) {
-//			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleClient.findListByOrderCode(orderCode);
-//			for (DistributionStockArticleEntity stockArticleEntity : stockArticleEntities) {
-//				Long orderWarehouseId = stockArticleEntity.getWarehouseId();
-//				stockArticleEntity.setConsigneeUnit(openOrderDTO.getConsignee());
-//				stockArticleEntity.setConsigneePerson(openOrderDTO.getConsigneeName());
-//				stockArticleEntity.setConsigneeMobile(openOrderDTO.getConsigneeMobile());
-//				stockArticleEntity.setConsigneeAddress(openOrderDTO.getConsigneeAddress());
-//				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(consigneeId);
-//				if(!Objects.isNull(basicdataClientEntity)){
-//					stockArticleEntity.setMallId(consigneeId);
-//					stockArticleEntity.setMallCode(basicdataClientEntity.getClientCode());
-//					stockArticleEntity.setMallName(basicdataClientEntity.getClientName());
-//				}
-//			}
-//			distributionStockArticleClient.updateByBatchId(stockArticleEntities);
-//		}
-
 		//计算扫码入库的包件是否需要把运单和提货单挂上
 		List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);
 		List<TrunklineBillladingWaybillEntity> billladingWaybillEntities = new ArrayList<>();

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

@@ -230,4 +230,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 	public Integer findTotalNumByOrderCode(String orderCode) {
 		return baseMapper.findTotalNumByOrderCode(orderCode);
 	}
+
+	@Override
+	public void updateWaybillNoByAdvanceId(Long advanceId, String waybillNo, Long waybillId) {
+		baseMapper.updateWaybillNoByAdvanceId(advanceId,waybillNo,waybillId);
+	}
 }