修改转库存品

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java

@@ -72,6 +72,11 @@ public class BasicdataStoreBrandEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "品牌ID")
 	private String brandId;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 	/**
 	 * 客户名称
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBrandClient.java

@@ -36,6 +36,7 @@ public interface IBasicdataStoreBrandClient {
 
     String API_PREFIX = "/client";
     String TOP = API_PREFIX + "/top7";
+    String BRANDLIST = API_PREFIX + "/brandList";
 
     /**
      * 获取门店品牌中间表列表
@@ -47,4 +48,14 @@ public interface IBasicdataStoreBrandClient {
     @GetMapping(TOP)
     BladePage<BasicdataStoreBrandEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+	/**
+     * 根据客户查询对应的品牌
+     *
+     * @param clientId   客户
+     * @param brandName      品牌
+     * @return BladePage
+     */
+    @GetMapping(BRANDLIST)
+    BasicdataStoreBrandEntity getBrandList(@RequestParam("clientId") Long  clientId, @RequestParam("brandName") String brandName);
+
 }

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

@@ -118,12 +118,22 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 * 物料Id
 	 */
 	@ApiModelProperty(value = "物料ID")
-	private String material;
+	private Long material;
 	/**
 	 * 物料名称
 	 */
 	@ApiModelProperty(value = "物料名称")
 	private String materialName;
+	/**
+	 * 物料编号
+	 */
+	@ApiModelProperty(value = "物料编号")
+	private String materialCode;
+	/**
+	 * 物料单位
+	 */
+	@ApiModelProperty(value = "物料单位")
+	private String materialUnit;
 	/**
 	 * 数量
 	 */
@@ -145,5 +155,15 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "服务号")
 	private String serviceNumber;
+	/**
+	 * 品牌ID
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private String brandId;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 
 }

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

@@ -66,7 +66,7 @@ public class DistributionServiceLogEntity extends TenantEntity {
 	 * 服务类型
 	 */
 	@ApiModelProperty(value = "服务类型")
-	private Integer typeService;
+	private String typeService;
 	/**
 	 * 费用
 	 */

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

@@ -124,6 +124,11 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库")
 	private String warehouse;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
 
 	/**
 	 * 仓库ID
@@ -176,7 +181,7 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 * 服务类型
 	 */
 	@ApiModelProperty(value = "服务类型")
-	private Integer typeService;
+	private String typeService;
 	/**
 	 * 顾客名字
 	 */
@@ -399,6 +404,11 @@ public class DistributionStockArticleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "订单码")
 	private String stockArticleCode;
+	/**
+	 * 工厂车次
+	 */
+	@ApiModelProperty(value = "工厂车次")
+	private String factoryTrain;
 
 
 }

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

@@ -113,6 +113,31 @@ public class  DistributionStockEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "在库包件ID")
 	private Long parcelListId;
+	/**
+	 * 预约ID
+	 */
+	@ApiModelProperty(value = "预约ID")
+	private Long reservationId;
+	/**
+	 * 预约编号
+	 */
+	@ApiModelProperty(value = "预约编号")
+	private String reservationCode;
+	/**
+	 * 出库类型
+	 */
+	@ApiModelProperty(value = "出库类型")
+	private Long outboundType;
+	/**
+	 * 配送Id
+	 */
+	@ApiModelProperty(value = "配送Id")
+	private Long deliveryListId;
+	/**
+	 * 配送编号
+	 */
+	@ApiModelProperty(value = "配送编号")
+	private Long deliveryListCode;
 
 
 

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

@@ -98,6 +98,32 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "货物名称")
 	private String descriptionGoods;
+
+	/**
+	 * 车牌
+	 */
+	@ApiModelProperty(value = "车牌")
+	private String licensePlate;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+	/**
+	 * 品牌Id
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private Long brandId;
+	/**
+	 * 入库时间
+	 */
+	@ApiModelProperty(value = "入库时间")
+	private Date warehousingTime;
+	/**
+	 * 拆包数
+	 */
+	@ApiModelProperty(value = "拆包数")
+	private Integer unpackingQuantity;
 	/**
 	 * 货物编号
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataStoreBrandClient.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -50,4 +51,13 @@ public class BasicdataStoreBrandClient implements IBasicdataStoreBrandClient {
         return BladePage.of(page);
     }
 
+	@Override
+	@GetMapping(BRANDLIST)
+	public BasicdataStoreBrandEntity getBrandList(Long clientId, String brandName) {
+		return basicdataStoreBrandService.getOne(Wrappers.<BasicdataStoreBrandEntity>query().lambda()
+			.eq(BasicdataStoreBrandEntity::getClientId,clientId)
+			.eq(BasicdataStoreBrandEntity::getBrandName,brandName)
+		);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -90,7 +90,7 @@ public class DistributionStockArticleController extends BladeController {
 		}
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
 		pages.getRecords().forEach( i ->{
-			Integer typeService = i.getTypeService();
+			String typeService = i.getTypeService();
 			//计算在库天数
 //			SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 			long time1 = i.getWarehouseEntryTime().getTime(); //入库
@@ -114,7 +114,7 @@ public class DistributionStockArticleController extends BladeController {
 			R<List<DictBiz>> distribution_type = dictBizClient.getList("distribution_type");
 			if(!Objects.isNull(typeService)){
 				if(Func.isNotEmpty(distribution_type.getData())){
-					DictBiz dictBiz = distribution_type.getData().get(typeService-1);
+					DictBiz dictBiz = distribution_type.getData().get(Integer.parseInt(typeService)-1);
 					i.setTypeName(dictBiz.getDictValue());
 					switch (i.getState()){
 						case 1:

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

@@ -17,15 +17,14 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.*;
-import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.mapper.DistributionAddvalueMapper;
 import com.logpm.distribution.mapper.DistributionDeliveryListMapper;
@@ -34,18 +33,16 @@ import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.RandomType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
 /**
  * 配送在库订单 服务实现类
@@ -247,38 +244,33 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 
-		distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
-		distributionStockListEntity.setOrderSelfNumbering(distributionStockArticleEntity.getOrderSelfNumbering()); //订单自编号
-		distributionStockListEntity.setIncomingBatch("入库批次号"); //入库批次号
-		distributionStockListEntity.setServiceNumber("服务号"); //服务号
-		distributionStockListEntity.setDescriptionGoods(distributionStockArticleEntity.getDescriptionGoods()); //货物名称
-		distributionStockListEntity.setCargoNumber("货物编号"); //货物编号
-
-		distributionStockListEntity.setWarehouseName(distributionStockArticleEntity.getWarehouse() ); //仓库
-		distributionStockListEntity.setWarehouseId(distributionStockArticleEntity.getWarehouseId() ); //仓库ID
-
-		distributionStockListEntity.setMarketId(Long.parseLong("456456465")); //商场
-		distributionStockListEntity.setCargoUnit("货物单位"); //货物单位
-//		distributionStockListEntity.setShop("门店"); //门店
-		distributionStockListEntity.setStorageLocation("库位信息"); //库位信息
-		distributionStockListEntity.setMallName(distributionStockArticleEntity.getMallName()); //商场名称
-		distributionStockListEntity.setQuantityStock(distributionStockArticleEntity.getHandQuantity()); //库存数量
-		distributionStockListEntity.setOutboundQuantity(distributionStockArticleEntity.getHandQuantity()); //出库数量
-		distributionStockListEntity.setDespatch("车次号");//车次号
-		distributionStockListEntity.setUnit("单位");//单位
-		distributionStockListEntity.setStoreId(Long.parseLong("12312"));//门店ID
-//		distributionStockListEntity.setShoppingMall("所属商场");//所属商场
-//		distributionStockListEntity.setShoppingMall("所属商场");//所属商场
-		distributionStockListEntity.setMarketCode("商场编码");//商场编码
-		distributionStockListEntity.setMarketName("商场名称");//商场名称
-		distributionStockListEntity.setStoreCode("门店编码");//门店编码
-		distributionStockListEntity.setStoreName("门店名称");//门店名称
-		distributionStockListEntity.setFactory("工厂车次");//工厂车次
-		distributionStockListEntity.setCategory("品分类");//品分类
-		distributionStockListEntity.setMaterialId(Long.parseLong("456456") );//货物ID
-		distributionStockListEntity.setStoreName("门店名称");//门店名称
+		distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionParcelList.getStockArticleId()).orElse(null)); //订单ID
+		distributionStockListEntity.setOrderSelfNumbering(Optional.ofNullable(distributionStockArticleEntity.getOrderSelfNumbering()).orElse(null)); //订单自编号
+//		distributionStockListEntity.setIncomingBatch(distributionStockArticleEntity.get); //入库批次号
+		distributionStockListEntity.setServiceNumber(Optional.ofNullable(distributionStockArticleEntity.getServiceNumber()).orElse(null)); //服务号
+		distributionStockListEntity.setDescriptionGoods(Optional.ofNullable(distributionParcelList.getMaterialName()).orElse(null)); //物料名称
+		distributionStockListEntity.setCargoNumber(Optional.ofNullable(distributionParcelList.getMaterialCode()).orElse(null)); //物料编号
+		distributionStockListEntity.setWarehouseName(Optional.ofNullable(distributionStockArticleEntity.getWarehouse() ).orElse(null)); //仓库
+		distributionStockListEntity.setWarehouseId(Optional.ofNullable(distributionStockArticleEntity.getWarehouseId()).orElse(null) ); //仓库ID
+		distributionStockListEntity.setMarketId(Optional.ofNullable(distributionStockArticleEntity.getMallId()).orElse(null)); //商场
+		distributionStockListEntity.setCargoUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null)); //货物单位
+		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息
+		distributionStockListEntity.setMallName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null)); //商场名称
+		distributionStockListEntity.setQuantityStock(Optional.ofNullable(distributionStockArticleEntity.getHandQuantity()).orElse(null)); //库存数量
+		distributionStockListEntity.setOutboundQuantity(Optional.ofNullable(distributionStockArticleEntity.getHandQuantity()).orElse(null)); //出库数量
+		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
+		distributionStockListEntity.setUnit(Optional.ofNullable(distributionParcelList.getMaterialUnit()).orElse(null));//单位
+		distributionStockListEntity.setStoreId( Optional.ofNullable(distributionStockArticleEntity.getStoreId()).orElse(null) );//门店ID
+		distributionStockListEntity.setMarketCode(Optional.ofNullable(distributionStockArticleEntity.getMallCode()).orElse(null));//商场编码
+		distributionStockListEntity.setMarketName(Optional.ofNullable(distributionStockArticleEntity.getMallName()).orElse(null));//商场名称
+		distributionStockListEntity.setStoreCode(Optional.ofNullable(distributionStockArticleEntity.getStoreCode()).orElse(null));//门店编码
+		distributionStockListEntity.setStoreName(Optional.ofNullable(distributionStockArticleEntity.getStoreName()).orElse(null));//门店名称
+		distributionStockListEntity.setFactory(Optional.ofNullable(distributionStockArticleEntity.getFactoryTrain()).orElse(null));//工厂车次
+		distributionStockListEntity.setCategory(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null));//品分类
+		distributionStockListEntity.setMaterialId(Optional.ofNullable(distributionParcelList.getMaterial()).orElse(null));//货物ID
 		distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
+		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
 		distributionStockListService.save(distributionStockListEntity);
 		return distributionStockArticleEntity;
 	}

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

@@ -55,18 +55,18 @@ public class WarehousingEntryDetailExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("门店名称")
 	private String storeName;
-//	/**
-//	 * 订单单号
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("订单单号")
-//	private String orderNumber;
-//	/**
-//	 * 运单号
-//	 */
-//	@ColumnWidth(20)
-//	@ExcelProperty("运单号")
-//	private String waybillNumber;
+	/**
+	 * 订单自编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderNumber;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("品牌")
+	private String brandName;
 	/**
 	 * 所在仓库
 	 */

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

@@ -24,8 +24,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basic.entity.BasicMaterialEntity;
 import com.logpm.basic.feign.IBasicMaterialClient;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
+import com.logpm.basicdata.feign.IBasicdataStoreBrandClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.feign.IDistributionStockListClient;
@@ -73,6 +75,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 	private final IBasicMaterialClient basicMaterialClient;
 	private final IBasicdataClientClient basicdataClientClient;
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+	private final IBasicdataStoreBrandClient basicdataStoreBrandClient;
 
 
 
@@ -198,12 +201,12 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			}
 			distributionStockListEntity.setUnpack(false);
 //			distributionStockListEntity.setStockArticleId(distributionParcelList.getStockArticleId()); //订单ID
-//			distributionStockListEntity.setOrderSelfNumbering(distributionStockArticleEntity.getOrderSelfNumbering()); //订单自编号
+			distributionStockListEntity.setOrderSelfNumbering(warehousingEntryDTO.getOrderNumber()); //订单自编号
 			distributionStockListEntity.setIncomingBatch(warehousingEntryDTO.getReceiptBatch()); //入库批次号
 //			distributionStockListEntity.setServiceNumber("服务号"); //服务号
 			distributionStockListEntity.setDescriptionGoods(warehousingDetail.getProductName()); //货物名称
-			distributionStockListEntity.setCargoNumber(warehousingDetail.getPackagingNumber()); //货物编号
-			distributionStockListEntity.setWarehouse(warehousingEntryDTO.getWarehouseId()); //仓库
+			distributionStockListEntity.setCargoNumber(warehousingDetail.getProductCode()); //货物编号
+			distributionStockListEntity.setWarehouseId(warehousingEntryDTO.getWarehouseId()); //仓库ID
 			distributionStockListEntity.setMarketId(warehousingEntryDTO.getClientId()); //商场及客户
 			distributionStockListEntity.setCargoUnit(warehousingDetail.getProductUnit()); //货物单位
 			if(Func.isNotEmpty(warehousingEntryDTO.getStoreId())){
@@ -227,8 +230,10 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			distributionStockListEntity.setMarketName(warehousingEntryDTO.getCustomerName());//商场名称
 //			distributionStockListEntity.setStoreCode(warehousingEntryDTO.getStore);//门店编码
 			distributionStockListEntity.setStoreName(warehousingEntryDTO.getStoreName());//门店名称
+			distributionStockListEntity.setBrandName(warehousingDetail.getBrandName());//品牌]名称
+			distributionStockListEntity.setBrandId(warehousingDetail.getBrandId());//品牌ID
 //			distributionStockListEntity.setFactory("工厂车次");//工厂车次
-			distributionStockListEntity.setCategory("品分类");//品分类
+//			distributionStockListEntity.setCategory("品分类");//品分类
 			distributionStockListEntity.setMaterialId( warehousingDetail.getMaterialId());//货物ID
 //			distributionStockListEntity.setStoreName("门店名称");//门店名称
 //			distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
@@ -338,6 +343,15 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				detail.setCreateInventory(i.getCreateInventory());
 				detail.setWarehousingEntryId(entryEntity.getId());
 				detail.setActualReceipt(0);
+				//品牌
+				BasicdataStoreBrandEntity brandList = basicdataStoreBrandClient.getBrandList(entryEntity.getClientId(), i.getBrandName());
+				if(Func.isNotEmpty(brandList)){
+					detail.setBrandName(brandList.getBrandName());
+					detail.setBrandId(Long.parseLong(brandList.getBrandId()));
+				}else{
+					throw new ServiceException(i.getProductName()+i.getProductCode()+i.getSku()+"品牌信息不存在！！请维护客户品牌数据！！！");
+				}
+
 				BasicMaterialEntity materialOwn = basicMaterialClient.getMaterialOwn(i.getProductCode(), i.getProductName(), i.getSku());
 				if(Func.isNotEmpty(materialOwn)){
 					detail.setMaterialId(materialOwn.getId());//物料ID