修改入库转库存品

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListEntity.java

@@ -68,6 +68,11 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String serviceType;
 	/**
 	 * 订单自编号
 	 */

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

@@ -17,6 +17,8 @@
 package com.logpm.warehouse.controller;
 
 import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
+import com.logpm.warehouse.excel.WarehouseEntryImporter;
+import com.logpm.warehouse.excel.WarehousingEntryDetailExcel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,6 +42,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
@@ -142,6 +145,19 @@ public class WarehouseWarehousingEntryController extends BladeController {
 	}
 
 
+	/**
+	 * 导入入库数据
+	 */
+	@PostMapping("import-WarehousingEntry")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "导入入库数据", notes = "传入excel")
+	public R importWarehousingEntry(MultipartFile file, Integer isCovered) {
+		WarehouseEntryImporter userImporter = new WarehouseEntryImporter(warehouseWarehousingEntryService, isCovered == 1);
+		ExcelUtil.save(file, userImporter, WarehousingEntryDetailExcel.class);
+		return R.success("操作成功");
+	}
+
+
 	/**
 	 * 导出数据
 	 */

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseEntryImporter.java

@@ -0,0 +1,26 @@
+package com.logpm.warehouse.excel;
+
+import com.logpm.warehouse.service.IWarehouseWarehousingEntryService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.excel.support.ExcelImporter;
+
+import java.util.List;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-07-13 17:26
+ **/
+@RequiredArgsConstructor
+public class WarehouseEntryImporter implements ExcelImporter<WarehousingEntryDetailExcel> {
+
+	private final IWarehouseWarehousingEntryService service;
+	private final Boolean isCovered;
+
+
+	@Override
+	public void save(List<WarehousingEntryDetailExcel> data) {
+		service.importUser(data, isCovered);
+	}
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehousingEntryDetailExcel.java

@@ -0,0 +1,156 @@
+package com.logpm.warehouse.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @program: LogisticsPlatform-Service
+ * @description:
+ * @author: cyz
+ * @create: 2023-07-13 17:34
+ **/
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class WarehousingEntryDetailExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 入库批次
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库批次")
+	private String receiptBatch;
+	/**
+	 * 入库时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库时间")
+	private Date receiptDate;
+	/**
+	 * 客户名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户名称")
+	private String customerName;
+	/**
+	 * 门店名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店名称")
+	private String storeName;
+//	/**
+//	 * 订单单号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("订单单号")
+//	private String orderNumber;
+//	/**
+//	 * 运单号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("运单号")
+//	private String waybillNumber;
+	/**
+	 * 所在仓库
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("仓库")
+	private String warehouse;
+	/**
+	 * 物流车次
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物流车次")
+	private String trainNumber;
+	/**
+	 * 入库车牌
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库车牌")
+	private String licensePlate;
+	/**
+	 * 服务类型
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("服务类型")
+	private String serviceType;
+//	/**
+//	 * 来源
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("来源")
+//	private String source;
+//	/**
+//	 * 入库状态
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("入库状态")
+//	private String condition;
+//	/**
+//	 * 入库总件数
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("入库总件数")
+//	private Integer totalInput;
+
+	/**
+	 * SKU
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("SKU")
+	private String sku;
+	/**
+	 * 物品名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物品名称")
+	private String productName;
+	/**
+	 * 物品编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物品编码")
+	private String productCode;
+	/**
+	 * 物品单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("物品单位")
+	private String productUnit;
+	/**
+	 * 包装数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包装数量")
+	private String packagingNumber;
+	/**
+	 * 包装规格
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("包装规格")
+	private String packagingSpecifications;
+	/**
+	 * 创建入库数量
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("入库数量")
+	private String createInventory;
+	/**
+	 * 存放位置
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("存放位置")
+	private String positions;
+
+
+
+
+}

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.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
+import com.logpm.warehouse.excel.WarehousingEntryDetailExcel;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,4 +64,6 @@ public interface IWarehouseWarehousingEntryService extends BaseService<Warehouse
 	 * @return
 	 */
 	WarehouseWarehousingEntryVO getOneOwn(WarehouseWarehousingEntryEntity warehouseWarehousingEntry);
+
+	void importUser(List<WarehousingEntryDetailExcel> data, Boolean isCovered);
 }

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

@@ -25,6 +25,7 @@ import com.logpm.distribution.vo.DistributionStockListVO;
 import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO;
 import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity;
 import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity;
+import com.logpm.warehouse.excel.WarehousingEntryDetailExcel;
 import com.logpm.warehouse.service.IWarehouseWarehousingDetailService;
 import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO;
 import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel;
@@ -187,7 +188,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			if(Func.isNotEmpty(warehousingEntryDTO.getLicensePlate())){
 				distributionStockListEntity.setDespatch(warehousingEntryDTO.getTrainNumber());//车次号运单
 			}
-
+			distributionStockListEntity.setServiceType(warehousingEntryDTO.getServiceType());
 //			distributionStockListEntity.setStorageLocation("库位信息"); //库位信息
 //			distributionStockListEntity.setMallName(warehousingEntryDTO.getCustomerName()); //商场名称
 
@@ -236,4 +237,16 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 		return warehouseWarehousingEntryVO;
 	}
 
+	/**
+	 * 导入
+	 * @param data
+	 * @param isCovered
+	 */
+	@Override
+	public void importUser(List<WarehousingEntryDetailExcel> data, Boolean isCovered) {
+		data.forEach( i ->{
+			System.out.println("smsmmsmsmsmsmsmmsmsmsmmsmsms"+i);
+		});
+	}
+
 }