1.库内bug修复

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java

@@ -53,7 +53,8 @@ public class TrayScanDesServiceImpl implements ITrayScanDesService {
 		QueryWrapper<TrayScanDesEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("now_warehouse_id",oldWarehouseId)
 			.eq("type",1)
-			.eq("tray_id",trayId);
+			.eq("tray_id",trayId)
+			.eq("delete_time",0);
 		return trayScanDesMapper.selectList(queryWrapper);
 	}
 }

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

@@ -494,15 +494,18 @@
         select ltco.id carsOrderId,
                ltco.waybill_no waybillNo,
                ltco.order_code orderCode,
+               lww.create_time createTime,
+               lww.destination destination,
+               lww.destination_warehouse_name destinationWarehouseName,
+               lww.shipper shipper,
+               lww.consignee consignee,
+               lww.goods_name goodsName,
                ltco.plan_num planNum,
                ltco.real_num realNum,
                ltco.type type,
-               ldsa.mall_name consignee,
-               ldsa.consignee_person consigneeName,
-               ldsa.consignee_mobile consigneeMobile,
-               ldsa.consignee_address consigneeAddress,
-               lww.departure_warehouse_name departureWarehouseName,
-               lww.destination_warehouse_name destinationWarehouseName
+               lww.total_freight freight,
+               lww.remark remark,
+               lww.total_freight/lww.total_count*ltco.real_num price
         from logpm_trunkline_cars_order ltco
         left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code
         left join logpm_warehouse_waybill lww on lww.waybill_no = ltco.waybill_no

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

@@ -398,7 +398,6 @@
                  left join logpm_warehouse_waybill lww on ltcls.waybill_no = lww.waybill_no
         where ltcls.load_id = #{loadId}
           and ltcls.warehouse_id = #{warehouseId}
-          and ltcls.warehouse_id != ltcls.unload_node_id
         group by ltcls.order_code,
                  ltcls.waybill_no,
                  ltcls.type,
@@ -706,7 +705,7 @@
     <select id="findUnloadReport" resultType="com.logpm.trunkline.vo.UnloadReportVO">
         select sum(IF(ltcls.final_node_id = #{warehouseId},ltcls.num,0)) loadingNum,
                sum(IF(ltcls.unload_node_id = #{warehouseId},ltcls.num,0)) unloadNum,
-               sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status != '1' and ltcls.is_data = 0,ltcls.num,0)) noDataNum,
+               sum(IF(ltcls.unload_node_id = #{warehouseId} and ltcls.scan_status != '1' and ltcls.is_data = 0,ltcls.num,0)) noDataNum,
                sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status != '1' and ltco.id is null,ltcls.num,0)) noPlanNum,
                sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status = '1',ltcls.num,0))+sum(IF(ltcls.final_node_id = #{warehouseId} and ltcls.scan_status != '1',ltcls.num-ltcls.unload_num,0)) noUnloadNum,
                sum(IF(ltcls.unload_node_id = #{warehouseId} and ltcls.type = 2 and ltcls.scan_status = '1',ltcls.unload_num,0)) manualNum

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

@@ -423,7 +423,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if(!Objects.isNull(carsLoadLineEntity)){
 			carsLoadLineEntity.setUnloadReportStatus(1);
-			carsLoadLineEntity.setReportOne("本次装车件数 "+unloadReportVO.getLoadingNum()+" 件，实际卸车件数 "+unloadReportVO.getUnloadNum()+" 件，计划未卸车数量 "+(unloadReportVO.getLoadingNum()-unloadReportVO.getUnloadNum())+" 件");
+			carsLoadLineEntity.setReportOne("本次装车件数 "+unloadReportVO.getLoadingNum()+" 件，实际卸车件数 "+unloadReportVO.getUnloadNum()+" 件，计划未卸车数量 "+(unloadReportVO.getNoUnloadNum()-unloadReportVO.getNoPlanNum())+" 件");
 			carsLoadLineEntity.setReportTwo("无基础数据货物 "+unloadReportVO.getNoDataNum()+" 件、非计划内货物 "+unloadReportVO.getNoPlanNum()+" 件、手动确认入库 "+unloadReportVO.getManualNum()+" 件");
 			trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
 		}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillDetailClient.java

@@ -42,7 +42,7 @@ public class WarehouseWaybillDetailClient implements IWarehouseWaybillDetailClie
 
 	@Override
 	public void updateEntityById(WarehouseWayBillDetail warehouseWayBillDetail) {
-		warehouseWayBillDetailService.update(warehouseWayBillDetail);
+		warehouseWayBillDetailService.updateById(warehouseWayBillDetail);
 	}
 
 	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailService.java

@@ -1,16 +1,13 @@
 package com.logpm.warehouse.service;
 
 import com.logpm.warehouse.entity.WarehouseWayBillDetail;
+import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
 
-public interface IWarehouseWayBillDetailService {
+public interface IWarehouseWayBillDetailService extends BaseService<WarehouseWayBillDetail> {
 	WarehouseWayBillDetail findByProductName(String productName);
 
-	void save(WarehouseWayBillDetail warehouseWayBillDetail);
-
-	void update(WarehouseWayBillDetail warehouseWayBillDetail);
-
 	List<WarehouseWayBillDetail> findByWaybillId(Long waybillId);
 
 	WarehouseWayBillDetail findByWaybillIdAndGoodsName(Long waybillId, String goodsName);

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

@@ -737,7 +737,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 
 		//把parcelListEntityList通过orderCode进行分组
-		Map<String, List<DistributionParcelListEntity>> map = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
+		Map<String, List<DistributionParcelListEntity>> map = parcelListEntityList.stream().filter(parcelListEntity -> "20".equals(parcelListEntity.getOrderPackageStatus())).collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
 
 		FindParamterDTO findParamterDTO = new FindParamterDTO();
 		findParamterDTO.setOrderCodeSet(map.keySet());

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

@@ -1958,7 +1958,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		try{
 
 			FindParamterDTO findParamterDTO = new FindParamterDTO();
-			findParamterDTO.setOrderCodeList(orderPackageCodes);
+			findParamterDTO.setOrderPackageCodeList(orderPackageCodes);
 			findParamterDTO.setWarehouseId(warehouseId);
 			List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListClient.findListByOrderPackageCodeList(findParamterDTO);
 

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

@@ -6,6 +6,7 @@ import com.logpm.warehouse.mapper.WarehouseWayBillDetailMapper;
 import com.logpm.warehouse.service.IWarehouseWayBillDetailService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,7 +14,7 @@ import java.util.List;
 @Slf4j
 @AllArgsConstructor
 @Service
-public class WarehouseWayBillDetailServiceImpl implements IWarehouseWayBillDetailService {
+public class WarehouseWayBillDetailServiceImpl extends BaseServiceImpl<WarehouseWayBillDetailMapper,WarehouseWayBillDetail> implements IWarehouseWayBillDetailService {
 
 	private final WarehouseWayBillDetailMapper warehouseWayBillDetailMapper;
 
@@ -24,15 +25,6 @@ public class WarehouseWayBillDetailServiceImpl implements IWarehouseWayBillDetai
 		return warehouseWayBillDetailMapper.selectOne(queryWrapper);
 	}
 
-	@Override
-	public void save(WarehouseWayBillDetail warehouseWayBillDetail) {
-		warehouseWayBillDetailMapper.insert(warehouseWayBillDetail);
-	}
-
-	@Override
-	public void update(WarehouseWayBillDetail warehouseWayBillDetail) {
-		warehouseWayBillDetailMapper.updateById(warehouseWayBillDetail);
-	}
 
 	@Override
 	public List<WarehouseWayBillDetail> findByWaybillId(Long waybillId) {