1.更新导入操作

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleQRCodeVO.java

@@ -37,6 +37,7 @@ public class DistributionStockArticleQRCodeVO  {
 	 */
 	@ApiModelProperty(value = "订单号")
 	private String orderCode;
+
 	/**
 	 * 已备货数量
 	 */
@@ -128,6 +129,12 @@ public class DistributionStockArticleQRCodeVO  {
 //	@ApiModelProperty(value = "订单状态")
 //	private String waybillsNum;
 
+	/**
+	 * 二维码
+	 */
+	@ApiModelProperty(value = "订单号")
+	private String imgType;
+
 
 	public Map<String, Object> toMap() throws IllegalAccessException {
 		Map<String, Object> map = new HashMap<>();

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java

@@ -2,6 +2,9 @@ package com.logpm.distribution.vo.app;
 
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.vo.DistributionParcelListVO;
+import com.logpm.distribution.vo.DistributionStockListInfoVO;
+import com.logpm.distribution.vo.DistributionStockListVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,6 +22,13 @@ public class queryOrderVO extends DistributionStockArticleEntity {
 	 */
 	@ApiModelProperty(value = "包件列表")
 	private List<DistributionParcelListEntity> list = new ArrayList<>();
+
+	/**
+	 * 库存品列表
+	 */
+	@ApiModelProperty(value = "库存品列表")
+	private List<DistributionStockListInfoVO> stockList = new ArrayList<>();
+
 	/**
 	 * 定制品
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java

@@ -77,8 +77,12 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl<BasicMaterialMappe
 		ArrayList<BasicMaterialEntity> arrayList = new ArrayList<>();
 		for (BasicMaterialExcel datum : data) {
 			//去重
-			List<BasicMaterialEntity> basicMaterialEntities = baseMapper.selectList(new QueryWrapper<BasicMaterialEntity>().lambda().eq(BasicMaterialEntity::getProductCode,datum.getProductCode()));
-			if (!basicMaterialEntities.isEmpty()){continue;}
+			List<BasicMaterialEntity> basicMaterialEntities = baseMapper.selectList(new QueryWrapper<BasicMaterialEntity>().lambda()
+				.eq(BasicMaterialEntity::getProductCode,datum.getProductCode()));
+			if (!basicMaterialEntities.isEmpty()){
+				//更新数据，删除老数据
+				baseMapper.deleteBatchIds(basicMaterialEntities.stream().map(BasicMaterialEntity::getId).collect(Collectors.toList()));
+			}
 			BasicMaterialEntity copy = BeanUtil.copy(datum, BasicMaterialEntity.class);
             assert copy != null;
             copy.setHide(1);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/wrapper/BasicdataAllocationVOWrapper.java

@@ -0,0 +1,47 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  ReWarehouse and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  ReWarehouses of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  ReWarehouses in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the Warehouse.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.wrapper;
+
+import com.logpm.warehouse.vo.WarehouseVisualizationVO;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.system.cache.DictBizCache;
+
+/**
+ * 备货扫描记录 包装类,返回视图层所需的字段
+ *
+ * @author lmy
+ * @since 2023-08-24
+ */
+public class BasicdataAllocationVOWrapper extends BaseEntityWrapper<WarehouseVisualizationVO, WarehouseVisualizationVO>  {
+	public static BasicdataAllocationVOWrapper build() {
+		return new BasicdataAllocationVOWrapper();
+ 	}
+
+	@Override
+	public WarehouseVisualizationVO entityVO(WarehouseVisualizationVO WarehouseStock) {
+		WarehouseStock.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, WarehouseStock.getOrderPackageStatus()));
+		WarehouseStock.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, WarehouseStock.getOrderPackageFreezeStatus()));
+		WarehouseStock.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, WarehouseStock.getOrderPackageGroundingStatus()));
+		WarehouseStock.setOrderPackageStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STOCKUP_STATUS, WarehouseStock.getOrderPackageStockupStatus()));
+		WarehouseStock.setOrderPackageReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_RESERVATION_STATUS, WarehouseStock.getOrderPackageReservationStatus()));
+		WarehouseStock.setOrderPackageLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, WarehouseStock.getOrderPackageLoadingStatus()));
+		return WarehouseStock;
+	}
+
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionInQueryApiController.java

@@ -55,7 +55,7 @@ public class DistributionInQueryApiController {
 	@PostMapping("/template")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "模板数据", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+	public R getTemplate(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.data(distributionStockArticleService.selectTemplate(Func.toLongList(ids)));
 	}
 

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

@@ -967,7 +967,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		List<Long> collect = myWarehouseList.stream()
 			.map(BasicdataWarehouseEntity::getId)
 			.collect(Collectors.toList());
-		//查询包条所在订单
+		//查询包条(库存品)所在订单
 		queryOrderVO queryOrderVO;
 		if (i ==1){
 		 	queryOrderVO =	distributionStockArticleMapper.selectOneByWrap(condition,collect);
@@ -981,6 +981,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		Long id = queryOrderVO.getId();
 		//查询订单下的所有包条
 		List<DistributionParcelListEntity>  distributionParcelListEntitys =	distributionParcelListMapper.selectListByOderId(id,collect);
+		//查询订单下的所有库存品
 	   queryOrderVO.setWrapNum(distributionParcelListEntitys.size());
 	   queryOrderVO.setInventoryNum(0);
 		queryOrderVO.setList(distributionParcelListEntitys);
@@ -1194,6 +1195,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		ArrayList<DistributionStockArticleQRCodeVO> arrayList = new ArrayList<>();
 		for (Long id : ids) {
 			DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null,String.valueOf(id));
+			// 订单号 生成二维码
+//			String fileTypeName = QRCodeUtil.createCodeToFile(orderNoList.getOrderCode());
+//			orderNoList.setImgType(QRCodeUtil.getEmpAutograph(fileTypeName));
 			arrayList.add(orderNoList);
 		}
 		return arrayList;