Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java

@@ -22,6 +22,9 @@ public enum PrintTemplateStatusConstant {
 	daiqueren_12("配送任务打印模板-商配","12"),
 	peisongtask_ziti("配送任务打印模板-自提","13"),
 	daiqueren_14("订单模版","15"),
+	wallbill_1("运单打印模板","16"),
+	stock_import_1("库存品入库模块","17"),
+
 	daiqueren_1("配送任务打印模板-市配","1");
 	/**
 	 * 状态

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -798,8 +798,8 @@
         ldpl.order_package_code,
         ldpl.cargo_title,
         ldpl.shelf_title,
-        lwtg.tray_code AS pallet,
-        lwug.allocation_title AS goodsAllocation,
+        ldpl.pallet AS pallet,
+        ldpl.goods_allocation AS goodsAllocation,
         ldpl.firsts_code,
         ldpl.firsts,
         ldpl.second_code,
@@ -836,8 +836,6 @@
         FROM
         logpm_distribution_reservation_package AS ldrp
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.order_package_code = ldrp.packet_bar_code
-        LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id and lwtg.association_type = 3
-        LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3
         <where>
             and packet_bar_status != 2
             <if test="reservationId !=null and reservationId!= ''">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml

@@ -137,8 +137,8 @@ WHERE
         ldpl.order_package_code,
         ldpl.cargo_title,
         ldpl.shelf_title,
-        lwtg.tray_code AS pallet,
-        lwug.allocation_title AS goodsAllocation,
+        ldpl.pallet AS pallet,
+        ldpl.goods_allocation AS goodsAllocation,
         ldpl.firsts_code,
         ldpl.firsts,
         ldpl.second_code,
@@ -175,8 +175,6 @@ WHERE
         FROM
         logpm_distribution_reservation_package AS ldrp
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id
-        LEFT JOIN logpm_warehouse_tray_goods AS lwtg ON ldpl.id = lwtg.association_id and lwtg.association_type = 3
-        LEFT JOIN logpm_warehouse_updown_goods AS lwug ON ldpl.id = lwug.association_id and lwug.association_type = 3
         <where>
             ldrp.packet_bar_status != 2
             <if test="id != '' and id !=null">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -124,7 +124,7 @@
     <select id="pageOwn" resultType="com.logpm.distribution.vo.DistributionStockListVO">
         <include refid="stockList"></include>
         <where>
-            ldsi.is_deleted = 0 and ldsi.hide=1
+            ldsi.is_deleted = 0
             <if test=" param.serviceNumber != null and param.serviceNumber != ''">and ldsi.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -1624,7 +1624,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return Resp.scanFail("存在库存品未备货", "存在库存品未备货");
 //			return R.fail("该客户存在库存品暂未备货   一键装车失败!!!");
 		}
-		Map<String, List<DistributionReservationStockarticleEntity>> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero));
+//		Map<String, List<DistributionReservationStockarticleEntity>> allStockArticle = reservationStockarticleEntityList.stream().filter(f -> Func.isNotEmpty(f.getIsZero())).collect(Collectors.groupingBy(DistributionReservationStockarticleEntity::getIsZero));
 		DistributionDeliverySelfEntity finalDistributionDeliverySelfEntity = distributionDeliverySelfEntity;
 		List<DistributionParcelListEntity> updatePackageList = new ArrayList<>();
 		List<String> orderCodes = new ArrayList<>();
@@ -1694,7 +1694,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							//更新装车件数
 							Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
 							parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
-							distributionParcelListService.updateById(parcelListEntity);
+
+							DistributionParcelListEntity newT = new DistributionParcelListEntity();
+							newT.setId(parcelListEntity.getId());
+							newT.setOrderPackageStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+
+							distributionParcelListService.updateById(newT);
 							//扣减在库订单的在库数量
 //							Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
 							updatePackageList.add(parcelListEntity);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -5260,6 +5260,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			loadingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 			signingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 			for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
+				if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())){
+					log.info("司机一键签收   >>>>>包件已签收:{}",parcelListEntity.getOrderPackageCode());
+					continue;
+				}
 				//查询是否进行装车
 				DistributionLoadscanEntity loadscanEntities = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 					.eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId())
@@ -6080,8 +6084,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 							distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
 							distributionLoadscanEntity.setSigningUser(user.getNickName());
-							loadingNumber += distributionLoadscanEntity.getLoadedNub();
-							signingNumber += distributionLoadscanEntity.getReceivedQuantity();
+							loadingNumber += distributionLoadscanEntity.getLoadedNub()+signforEntity.getLoadedNumber();
+							signingNumber += distributionLoadscanEntity.getReceivedQuantity()+signforEntity.getReceivedQuantity();
 							//进行签收数量的统计
 							distributionLoadscanService.updateById(distributionLoadscanEntity);
 							JSONObject jsonObject = new JSONObject();

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.vo.print.PrintPreviewVO;
 import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import com.logpm.warehouse.entity.WarehouseWarehouseEntity;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
@@ -232,4 +233,24 @@ public class WarehouseWarehousingEntryController extends BladeController {
 		ExcelUtil.export(response, "仓库入库单数据" + DateUtil.time(), "仓库入库单数据表", list, WarehousingEntryDetailExcel.class);
 	}
 
+	/**
+	 * 打印入库单
+	 * @param ids
+	 * @param type
+	 * @return
+	 */
+	@PostMapping("/printBatch")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "批量打印 入库单")
+	public R<List<PrintPreviewVO>> printBatch(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "打印类型", required = true) @RequestParam Integer type) {
+		try {
+			log.info(">>>>>>>>>>>>>>>>>> printBatch {}",ids);
+			List<PrintPreviewVO> printPreviewVOS = warehouseWarehousingEntryService.printBatch(ids, type);
+			return R.data(printPreviewVOS);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+
+	}
+
 }

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

@@ -19,6 +19,7 @@ package com.logpm.warehouse.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.print.PrintPreviewVO;
 import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import com.logpm.warehouse.entity.WarehouseWarehouseEntity;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
@@ -72,4 +73,12 @@ public interface IWarehouseWarehousingEntryService extends BaseService<Warehouse
 	void importUser(List<WarehousingEntryDetailExcel> data, Boolean isCovered);
 
 	List<WarehouseWarehousingEntryExcel> exportWarehouseWarehousing(Map<String, Object> paramMap);
+
+	/**
+	 * 打印入库单
+	 * @param ids 入库单ID字符串 逗号凭借
+	 * @param type
+	 * @return
+	 */
+    List<PrintPreviewVO> printBatch(String ids, Integer type);
 }

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

@@ -1712,8 +1712,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				String warehouseName = warehouseEntity.getName();
 
 				updownGoodsLogEntities.forEach(warehouseUpdownGoodsLogEntity -> {
-					String allocationTitle = warehouseUpdownGoodsLogEntity.getAllocationTitle();
-					String content = "包件在 "+warehouseName+" 下架，库位 "+allocationTitle;
+					String positionCode = warehouseUpdownGoodsLogEntity.getPositionCode();
+					String content = "包件在 "+warehouseName+" 下架，库位 "+positionCode;
 					List<String> packageCodeList = new ArrayList<>();
 					packageCodeList.add(warehouseUpdownGoodsLogEntity.getAssociationValue());
 					warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
@@ -1919,9 +1919,30 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 				num = num + quantity;
 				warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
+
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("dataType",1);
+				jsonObject.put("conditions",parcelListEntity.getConditions());
+				jsonObject.put("operation",4);
+				//把listEntityList中所有元素的orderPackageCode放入一个List
+				List<String> packageCodes = new ArrayList<>();
+				packageCodes.add(parcelListEntity.getOrderPackageCode());
+
+				jsonObject.put("orderPackageCodes",packageCodes);
+				jsonObject.put("warehouseId",warehouseId);
+
+				FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.ALLOCATION.EXCHANGE).msg(jsonObject.toJSONString()).build();
+
+				sendFanoutService.sendFanoutMsg(fanoutMsg);
+
+				String positionCode = updownTypeEntity.getPositionCode();
+				String content = "包件在 "+parcelListEntity.getWarehouse()+" 下架，库位 "+positionCode;
+				warehousePackageTrackLogService.addBatchLog(packageCodes,content,warehouseId,parcelListEntity.getWarehouse(), AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
+
 			} else {
 				log.error("包件下架失败，找不到上架方式,updownTypeId:{}", updownTypeId);
 			}
+
 		}
 		return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
 	}

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

@@ -24,7 +24,9 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basic.entity.BasicMaterialEntity;
+import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
+import com.logpm.basic.feign.IBasicPrintTemplateClient;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
@@ -38,6 +40,7 @@ import com.logpm.distribution.entity.DistributionStockListInfoEntity;
 import com.logpm.distribution.feign.IDistributionStockListClient;
 import com.logpm.distribution.feign.IDistributionStockListInfoClient;
 import com.logpm.distribution.vo.DistributionStockListVO;
+import com.logpm.distribution.vo.print.PrintPreviewVO;
 import com.logpm.warehouse.dto.NoDataStockListDTO;
 import com.logpm.warehouse.dto.UpShelfStockDTO;
 import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
@@ -55,6 +58,7 @@ import com.logpm.warehouse.service.IWarehouseWarehousingEntryService;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -96,6 +100,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 	private final IBasicdataTrayClient basicdataTrayClient;
 	private final IWarehouseUpdownTypeService warehouseUpdownTypeService;
 	private final IWarehouseTrayTypeService warehouseTrayTypeService;
+	private final IBasicPrintTemplateClient basicPrintTemplateClient;
 
 
 	@Override
@@ -635,8 +640,15 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 		return listExcel;
 	}
 
+	@Override
+	public List<PrintPreviewVO> printBatch(String ids, Integer type) {
+		BasicPrintTemplateEntity printTemplate = basicPrintTemplateClient.getPrintTemplate(PrintTemplateStatusConstant.stock_import_1.getValue());
+		if (ObjectUtils.isNull(printTemplate)){
+			throw new ServiceException("打印模板不存在！");
+		}
 
+		return null;
 
 
-
+	}
 }