feat(all): 梦天工厂基地字段

1 增加梦天工厂基地字段解析
2 增加梦天工厂基地入库逻辑

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtFactoryOrderMain.java

@@ -14,6 +14,12 @@ import org.springblade.core.mp.base.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 public class MtFactoryOrderMain extends BaseEntity {
 
+	@ApiModelProperty(value = "供应基地编号")
+	private String siteCode;
+
+	@ApiModelProperty(value = "供应基地")
+	private String siteName;
+
 	//@JsonProperty("发货单编号")
 	@ApiModelProperty(value = "发货单编号")
 	private String invoiceOrderCode;

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -623,7 +623,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		Long startWarehouseId = null;
 		String startWarehouseName = null;
 		String tenantId = null;
-		R<FactoryWarehouseBindVO> r = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.MTMM.getValue(), BrandEnums.MTMM.getValue());
+		R<FactoryWarehouseBindVO> r = factoryDataBaseClient.getWarehouseByBrandAndSiteName(BrandEnums.MTMM.getValue(), mtFactoryOrderMain.getSiteName());
 		if (cn.hutool.core.util.ObjectUtil.equal(HttpConstants.HTTP.HTTP_RESOURCE_CODE.SUCCESS_CODE, r.getCode())) {
 			FactoryWarehouseBindVO data = r.getData();
 			if (cn.hutool.core.util.ObjectUtil.isNotNull(data)) {
@@ -646,7 +646,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 			}
 			advanceEntity.setOrderType("");
 			advanceEntity.setBrand(BrandEnums.MTMM.getValue());
-			advanceEntity.setSiteName("");
+			advanceEntity.setSiteName(mtFactoryOrderMain.getSiteName());
 			advanceEntity.setArea("");
 			advanceEntity.setTotalNum(Integer.parseInt(mtFactoryOrder.getQuantity()));
 			advanceEntity.setPackName("");
@@ -1506,7 +1506,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	private Integer addAdvanceEntity(MtFactoryOrderMain mtFactoryOrderMain, MtFactoryOrder mtFactoryOrder) {
 		AdvanceEntity advanceEntity = new AdvanceEntity();
 		advanceEntity.setOrderSelfNum(StringUtil.isBlank(mtFactoryOrder.getOrderCode()) ? "" : mtFactoryOrder.getOrderCode()); //订单自编号
-		advanceEntity.setSiteName(""); // 基地 TODO 需要映射
+		advanceEntity.setSiteName(mtFactoryOrderMain.getSiteName()); // 基地
 		advanceEntity.setArea(""); // 区域
 		advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空
 		advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
@@ -1517,7 +1517,6 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setMctsTruckNo(mtFactoryOrderMain.getSendCarNumber());// 车牌//字段没有了
 		advanceEntity.setFirstPackName(""); //一级品类
 		advanceEntity.setFirstPackCode(""); //一级品类
-
 		advanceEntity.setDealerName(mtFactoryOrder.getDealerName()); //商场名称
 		advanceEntity.setDealerCode(StringUtil.isBlank(mtFactoryOrder.getDealerCode()) ? "" : mtFactoryOrder.getDealerCode()); //商场编码
 
@@ -1559,7 +1558,14 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		advanceEntity.setDeleteTime(0); // 删除时间
 		advanceEntity.setWaybillNo("");//运单号  可以为空
 //			Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId());
-		advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射
+		// 推老系统中对应的仓库id 梦天重庆仓 151 梦天潜江仓 141
+		if (Objects.equals("HYXINQI", mtFactoryOrderMain.getSiteCode())) {
+			// 重庆
+			advanceEntity.setWarehouseId(151); //导入人仓库id
+		} else {
+			// 潜江
+			advanceEntity.setWarehouseId(141); //导入人仓库id
+		}
 		advanceEntity.setWaybillStatus(Integer.parseInt("1"));//开单状态：1=未开单，2=已开单
 		advanceEntity.setOldId(0);//
 		advanceEntity.setFreeze(Integer.parseInt("1"));//冻结状态：1=正常，2=冻结

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/dto/MtFactoryOrderMainDTO.java

@@ -12,6 +12,14 @@ import java.io.Serializable;
 @Data
 public class MtFactoryOrderMainDTO implements Serializable {
 
+	@JsonProperty("供应基地编号")
+	@ApiModelProperty(value = "供应基地编号")
+	private String siteCode;
+
+	@JsonProperty("供应基地")
+	@ApiModelProperty(value = "供应基地")
+	private String siteName;
+
 	@JsonProperty("发货单编号")
 	@ApiModelProperty(value = "发货单编号")
 	private String invoiceOrderCode;