/// <summary>
/// 根据拣货单号获取商品详情
/// </summary>
/// <param name="pickTaskName"></param>
/// <returns></returns>
public BaseData <PickCommodity> GetPickTaskCommodityDetail(BaseData <PickTask> baseDataPickTask)
{
//校验是否含有数据，如果含有数据，拼接具体字段
BaseData <PickCommodity> baseDataPickTaskCommodityDetail = HttpHelper.GetInstance().ResultCheck((HttpHelper hh) => {
//var pickTaskIds = baseDataPickTask.body.objects.Select(it => it.id).ToList();
return(hh.Get <PickCommodity>(new QueryParam
{
//@in =
//{
// field = "PickTaskId",
// in_list = BllHelper.ParamUrlEncode(pickTaskIds)
//}
view_filter =
{
filter =
{
//logical_relation = "1 AND 2 AND 3",
logical_relation = "1 AND 2",
expressions =
{
//这种写法有问题，暂时把这个条件删除，在后面过滤
//new QueryParam.Expressions
//{
// field = "PickTaskId",
// @operator = "INRANGE",
// operands = BllHelper.OperandsProcess(pickTaskIds)
//},
new QueryParam.Expressions
{
field = "StoreHouseId",
@operator = "==",
operands ={ $"'{ HttpUtility.UrlEncode(ApplicationState.GetHouseId()) }'" }
},
new QueryParam.Expressions
{
field = "EquipmentId",
@operator = "==",
operands ={ $"'{ HttpUtility.UrlEncode(ApplicationState.GetEquipId()) }'" }
}
}
}
}
}));
}, baseDataPickTask);
//baseDataPickTaskCommodityDetail.body.objects = baseDataPickTaskCommodityDetail.body.objects.Where(it => it.EquipmentId == ApplicationState.GetValue<string>((int)ApplicationKey.EquipId)).ToList();
HttpHelper.GetInstance().ResultCheck(baseDataPickTask, out bool isSuccess);
HttpHelper.GetInstance().ResultCheck(baseDataPickTaskCommodityDetail, out bool isSuccess1);
if (isSuccess && isSuccess1)
{
var pickTaskIds = baseDataPickTask.body.objects.Select(it => it.id).ToList();
baseDataPickTaskCommodityDetail.body.objects = baseDataPickTaskCommodityDetail.body.objects.Where(it => pickTaskIds.Contains(it.PickTaskId)).ToList();
}
return(baseDataPickTaskCommodityDetail);
}
public static HashSet <CommodityEps> GetEpcDataJsonInventory(out bool isGetSuccess)
{
isGetSuccess = true;
string com1 = ApplicationState.GetMRfidCOM();
var ret = new HashSet <CommodityEps>()
{
new CommodityEps
{
CommodityCodeName = "RF00000327",
EquipmentId = ApplicationState.GetEquipId(),
EquipmentName = ApplicationState.GetEquipName(),
StoreHouseId = ApplicationState.GetHouseId(),
StoreHouseName = ApplicationState.GetHouseName(),
GoodsLocationName = ApplicationState.GetCabNameByRFidCom(com1),
GoodsLocationId = ApplicationState.GetCabIdByRFidCom(com1)
},
new CommodityEps
{
CommodityCodeName = "RF00000333",
EquipmentId = ApplicationState.GetEquipId(),
EquipmentName = ApplicationState.GetEquipName(),
StoreHouseId = ApplicationState.GetHouseId(),
StoreHouseName = ApplicationState.GetHouseName(),
GoodsLocationName = ApplicationState.GetCabNameByRFidCom(com1),
GoodsLocationId = ApplicationState.GetCabIdByRFidCom(com1)
},
new CommodityEps
{
CommodityCodeName = "RF00000324",
EquipmentId = ApplicationState.GetEquipId(),
EquipmentName = ApplicationState.GetEquipName(),
StoreHouseId = ApplicationState.GetHouseId(),
StoreHouseName = ApplicationState.GetHouseName(),
GoodsLocationName = ApplicationState.GetCabNameByRFidCom(com1),
GoodsLocationId = ApplicationState.GetCabIdByRFidCom(com1)
}
};
return(ret);
}
/// <summary>
/// 提交变更信息
/// </summary>
/// <param name="baseDataCommodityCode"></param>
/// <param name="allotShelf"></param>
/// <param name="baseAllotShelfCommodity"></param>
/// <returns></returns>
public BasePostData <CommodityInventoryChange> SubmitAllotShelfChangeWithOrder(BaseData <CommodityCode> baseDataCommodityCode, AllotShelf allotShelf, BaseData <AllotShelfCommodity> baseAllotShelfCommodity)
{
BasePostData <CommodityInventoryChange> retBaseSinglePostDataCommodityInventoryChange = null;
//校验是否含有数据，如果含有数据，有就继续下一步
baseDataCommodityCode = HttpHelper.GetInstance().ResultCheck(baseDataCommodityCode, out bool isSuccess);
baseAllotShelfCommodity = HttpHelper.GetInstance().ResultCheck(baseAllotShelfCommodity, out bool isSuccess2);
if (isSuccess && isSuccess2)
{
var CommodityCodes = baseDataCommodityCode.body.objects;
var CommodityInventoryChanges = new List <CommodityInventoryChange>(CommodityCodes.Count);
//调拨上架商品明细
var allotShelfCommodities = baseAllotShelfCommodity.body.objects;
//获取待上架商品CommodityId列表（去重后）
var detailCommodityIds = allotShelfCommodities.Select(it => it.CommodityId).Distinct().ToList();
CommodityCodes.ForEach(it =>
{
CommodityInventoryChange cic = new CommodityInventoryChange()
{
CommodityCodeId = it.id, //商品码【扫描】
SourceBill = new SourceBill() //来源单据
{
object_name = typeof(AllotShelf).Name,
object_id = allotShelf.id
},
//EquipmentId = ApplicationState.GetEquipId(),
//StoreHouseId = ApplicationState.GetHouseId(),
//GoodsLocationId = it.GoodsLocationId
};
//【待确认】出库
if (it.operate_type == (int)OperateType.出库)
{
cic.ChangeStatus = CommodityInventoryChangeStatus.未上架.ToString();
cic.StoreHouseId = ApplicationState.GetHouseId();
cic.AdjustStatus = CommodityInventoryChangeAdjustStatus.是.ToString();
}
//入库
else
{
cic.ChangeStatus = CommodityInventoryChangeStatus.正常.ToString();
cic.EquipmentId = it.EquipmentId;
cic.StoreHouseId = it.StoreHouseId;
cic.GoodsLocationId = it.GoodsLocationId;
//【待确认】
if (!detailCommodityIds.Contains(it.CommodityId))
{
cic.AdjustStatus = CommodityInventoryChangeAdjustStatus.是.ToString();
}
}
CommodityInventoryChanges.Add(cic);
});
retBaseSinglePostDataCommodityInventoryChange = CommodityInventoryChangeBll.GetInstance().CreateCommodityInventoryChange(CommodityInventoryChanges);
}
else
{
retBaseSinglePostDataCommodityInventoryChange = new BasePostData <CommodityInventoryChange>
{
code = baseDataCommodityCode.code,
message = baseDataCommodityCode.message
};
LogUtils.Error("CreateShelfTaskCommodityInventoryChange 失败！ " + baseDataCommodityCode.message);
}
return(retBaseSinglePostDataCommodityInventoryChange);
}
/// <summary>
/// 通过【调拨上架任务】（AllotShelf.id=AllotShelfCommodity.AllotShelfId）从表格 【调拨上架商品明细】中查询获取调拨上架商品的列表信息
/// </summary>
/// <param name="allotShelf"></param>
/// <returns></returns>
public BaseData <AllotShelfCommodity> GetShelfTaskCommodityDetail(AllotShelf allotShelf)
{
BaseData <AllotShelfCommodity> baseDataAllotShelfCommodity = HttpHelper.GetInstance().Get <AllotShelfCommodity>(new QueryParam
{
view_filter =
{
filter =
{
logical_relation = "1 AND 2 AND 3",
expressions =
{
new QueryParam.Expressions
{
field = "AllotShelfId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(allotShelf.id) }'" }
},
new QueryParam.Expressions
{
field = "StoreHouseId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(ApplicationState.GetHouseId()) }'" }
},
new QueryParam.Expressions
{
field = "EquipmentId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(ApplicationState.GetEquipId()) }'" }
}
}
}
}
});
//校验是否含有数据，如果含有数据，拼接具体字段
HttpHelper.GetInstance().ResultCheck(baseDataAllotShelfCommodity, out bool isSuccess);
if (isSuccess)
{
baseDataAllotShelfCommodity.body.objects.ForEach(it =>
{
///按理说根据该条件查询出来的商品设备名称和库房名称已经固定
////拼接设备名字
//if (!string.IsNullOrEmpty(it.EquipmentId))
//{
// it.EquipmentName = GetNameById<Equipment>(it.EquipmentId);
//}
it.EquipmentName = HttpUtility.UrlEncode(ApplicationState.GetEquipName());
////拼接库房名字
//if (!string.IsNullOrEmpty(it.StoreHouseId))
//{
// it.StoreHouseName = GetNameById<StoreHouse>(it.StoreHouseId);
//}
it.StoreHouseName = HttpUtility.UrlEncode(ApplicationState.GetHouseName());
//拼接商品码名称
if (!string.IsNullOrEmpty(it.CommodityCodeId))
{
it.CommodityCodeName = GetNameById <CommodityCode>(it.CommodityCodeId);
}
//拼接货位名字
if (!string.IsNullOrEmpty(it.GoodsLocationId))
{
it.GoodsLocationName = GetNameById <GoodsLocation>(it.GoodsLocationId);
}
//拼接商品名字
if (!string.IsNullOrEmpty(it.CommodityId))
{
it.CommodityName = GetNameById <Commodity>(it.CommodityId);
}
});
}
return(baseDataAllotShelfCommodity);
}
/// <summary>
/// 根据eps json获取eps对象数据
/// </summary>
/// <param name="isGetSuccess"></param>
/// <returns></returns>
public static HashSet <CommodityEps> GetEpcDataJson(out bool isGetSuccess)
{
isGetSuccess = true;
//string com1 = "COM1";
string com1 = ApplicationState.GetMRfidCOM();
HashSet <string> com1HashSet = new HashSet <string>();
string log = "";
#if DUALCAB
//string com4 = "COM4";
string com4 = ApplicationState.GetSRfidCOM();
HashSet <string> com4HashSet = new HashSet <string>();
#endif
HashSet <CommodityEps> currentEpcDataHs = new HashSet <CommodityEps>();
//TODO:需要补充id
GClient com1ClientConn = CreateClientConn(com1, "115200", out bool isCom1Connect);
if (isCom1Connect)
{
com1HashSet = DealComData(com1ClientConn, com1, out isGetSuccess);
}
else
{
isGetSuccess = false;
}
#if DUALCAB
GClient com4ClientConn = CreateClientConn(com4, "115200", out bool isCom4Connect);
if (isCom4Connect)
{
com4HashSet = DealComData(com4ClientConn, com4, out isGetSuccess);
}
else
{
isGetSuccess = false;
}
#endif
WaitHandle.WaitAll(manualEvents.ToArray());
manualEvents.Clear();
//提取com1的标签epc，并组装
foreach (string rfid in com1HashSet)
{
CommodityEps commodityEps = new CommodityEps
{
CommodityCodeName = $"RF{rfid.Substring(rfid.Length - 8)}",
EquipmentId = ApplicationState.GetEquipId(),
EquipmentName = ApplicationState.GetEquipName(),
StoreHouseId = ApplicationState.GetHouseId(),
StoreHouseName = ApplicationState.GetHouseName(),
GoodsLocationName = ApplicationState.GetCabNameByRFidCom(com1),
GoodsLocationId = ApplicationState.GetCabIdByRFidCom(com1)
};
currentEpcDataHs.Add(commodityEps);
LogUtils.Debug(commodityEps.CommodityCodeName + commodityEps.CommodityName);
log += commodityEps.CommodityCodeName + " ";
}
#if DUALCAB
//提取com4的标签epc，并组装
foreach (string rfid in com4HashSet)
{
CommodityEps commodityEps = new CommodityEps
{
CommodityCodeName = $"RF{rfid.Substring(rfid.Length - 8)}",
EquipmentId = ApplicationState.GetEquipId(),
EquipmentName = ApplicationState.GetEquipName(),
StoreHouseId = ApplicationState.GetHouseId(),
StoreHouseName = ApplicationState.GetHouseName(),
GoodsLocationName = ApplicationState.GetCabNameByRFidCom(com1),
GoodsLocationId = ApplicationState.GetCabIdByRFidCom(com1)
};
currentEpcDataHs.Add(commodityEps);
LogUtils.Debug(commodityEps.CommodityCodeName + commodityEps.CommodityName);
log += commodityEps.CommodityCodeName + " ";
}
#endif
Task.Factory.StartNew(a =>
{
LogUtils.Debug(log);
}, log);
LogUtils.Debug("RFID NUM:" + currentEpcDataHs.Count());
return(currentEpcDataHs);
}
/// <summary>
/// 【手动盘点】获取盘点任务相关信息
/// 通过【盘点任务名称】从表格InvoentoryTask【盘点任务】中查询获取盘点任务id。
/// 通过【盘点任务单】（InventoryTask.id =InventoryOrder.InventoryTaskId）从表格【盘点单】中查询获得盘点单列列表
/// taskName 盘点任务名称
/// </summary>
/// <param name="taskName"></param>
/// <returns></returns>
public BaseData <InventoryOrder> GetInventoryOrdersByInventoryTaskName(string taskName)
{
var task = GetInventoryTaskByInventoryTaskName(taskName);
//校验是否含有数据，如果含有数据，拼接具体字段
HttpHelper.GetInstance().ResultCheck(task, out bool isSuccess);
var orders = new BaseData <InventoryOrder>();
if (isSuccess)
{
//确认数据只有一条
if (!string.IsNullOrEmpty(task.body.objects[0].id)) //id = AQACQqweJ4wBAAAAXRA4vCD_sxWaDwQA
{
orders = HttpHelper.GetInstance().Get <InventoryOrder>(new QueryParam
{
view_filter =
{
filter =
{
logical_relation = "1 AND 2 AND 3 AND 4",
expressions =
{
new QueryParam.Expressions
{
field = "InventoryTaskId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(task.body.objects[0].id) }'" }
},
new QueryParam.Expressions
{
field = "Status",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(InventoryTaskStatus.待盘点.ToString()) }'" }
},
new QueryParam.Expressions
{
field = "StoreHouseId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(ApplicationState.GetHouseId()) }'" }
},
new QueryParam.Expressions
{
field = "EquipmentId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(ApplicationState.GetEquipId()) }'" }
}
}
}
}
});
//校验是否含有数据，如果含有数据，拼接具体字段
HttpHelper.GetInstance().ResultCheck(orders, out bool isSuccess2);
if (isSuccess2)
{
orders.body.objects.ForEach(order =>
{
//根据所在盘点货位获取所在货位名称
if (!string.IsNullOrEmpty(order.GoodsLocationId))
{
order.GoodsLocationName = GetNameById <GoodsLocation>(order.GoodsLocationId);
}
//根据所在设备编号查询设备名称
if (!string.IsNullOrEmpty(order.EquipmentId))
{
order.EquipmentName = GetNameById <Equipment>(order.EquipmentId);
}
//根据盘点库房编号查询盘点库房名称
if (!string.IsNullOrEmpty(order.StoreHouseId))
{
order.StoreHouseName = GetNameById <StoreHouse>(order.StoreHouseId);
}
});
}
}
}
else
{
orders.code = task.code;
orders.message = task.message;
}
return(orders);
}
/// <summary>
/// 【智能柜】 自动盘点更新盘点单管理和其商品明细 ,post请求为admintoken
/// </summary>
/// <param name="orders"></param>
/// <returns></returns>
public BasePostData <InventoryDetail> CreateInventoryOrderAndDetail(List <CommodityCode> commodityCodes)
{
BasePostData <InventoryDetail> inventoryDetailRet;
if (null == commodityCodes || commodityCodes.Count <= 0)
{
inventoryDetailRet = new BasePostData <InventoryDetail>()
{
code = (int)ResultCode.Parameter_Exception,
message = ResultCode.Parameter_Exception.ToString()
};
return(inventoryDetailRet);
}
//创建盘点任务单
var inventoryTasks = HttpHelper.GetInstance().PostByAdminToken(new PostParam <InventoryTask>()
{
objects = { new InventoryTask {
Status = InventoryTaskStatus.待确认.ToString()
} }
});
HttpHelper.GetInstance().ResultCheck(inventoryTasks, out bool isSuccess);
if (isSuccess)
{
string now = GetDateTimeNow();
List <InventoryOrder> inventoryOrderList = new List <InventoryOrder>();
//分柜创建盘点任务
commodityCodes.Select(it => it.GoodsLocationId).Distinct().ToList().ForEach(goodsLocationId =>
{
inventoryOrderList.Add(new InventoryOrder
{
ConfirmDate = now,
InventoryTaskId = inventoryTasks.body[0].id,
Status = InventoryOrderStatus.待盘点.ToString(), //创建盘点单状态为[待盘点]
//TODO: 需要当前设备id，货位id和库房id
GoodsLocationId = goodsLocationId,
EquipmentId = ApplicationState.GetEquipId(),
StoreHouseId = ApplicationState.GetHouseId(),
Type = "自动创建"
});
});
//创建盘点单
var inventoryOrders = HttpHelper.GetInstance().PostByAdminToken(new PostParam <InventoryOrder>()
{
objects = inventoryOrderList
});
inventoryDetailRet = HttpHelper.GetInstance().ResultCheck((HttpHelper hh) =>
{
BaseData <CommodityInventoryDetail> CommodityInventoryDetails = null;
if (commodityCodes.Count > 0)
{
var commodityCodeIds = commodityCodes.Select(it => it.id).Distinct().ToList();
CommodityInventoryDetails = hh.Get <CommodityInventoryDetail>(new QueryParam
{
@in =
{
field = "CommodityCodeId",
in_list = BllHelper.ParamUrlEncode(commodityCodeIds)
}
});
}
if (CommodityInventoryDetails != null)
{
hh.ResultCheck(CommodityInventoryDetails, out bool isSuccessq);
if (isSuccessq)
{
commodityCodes.ForEach(it =>
{
it.CommodityInventoryId = CommodityInventoryDetails.body.objects.Where(cit => cit.CommodityCodeId == it.id).First().id;
});
}
}
List <InventoryDetail> inventoryDetailList = new List <InventoryDetail>();
commodityCodes.ForEach(it =>
{
inventoryDetailList.Add(new InventoryDetail
{
CommodityInventoryId = it.CommodityInventoryId,
InventoryOrderId = inventoryOrders.body.Where(iit => iit.GoodsLocationId == it.GoodsLocationId).Select(iit => iit.id).First(),
CommodityCodeId = it.id
});
});
//创建盘名单明细列表
return(hh.PostByAdminToken(new PostParam <InventoryDetail>()
{
objects = inventoryDetailList
}));
}, inventoryOrders);
//更新盘点单状态
if (inventoryDetailRet != null)
{
var orderIds = inventoryDetailRet.body.Select(it => it.InventoryOrderId).Distinct().ToList();
orderIds.ForEach(id =>
{
var temp = inventoryOrders.body.Where(it => it.id.Equals(id)).First();
//temp.Status = InventoryOrderStatus.已完成.ToString();
//执行更新操作，异常状态记录日志，详情见方法体内部
UpdateInventoryOrderStatus(temp);
});
}
}
else
{
inventoryDetailRet = new BasePostData <InventoryDetail>()
{
code = (int)ResultCode.Result_Exception,
message = ResultCode.Result_Exception.ToString()
};
}
return(inventoryDetailRet);
}
/// <summary>
/// 上架的库存变化
/// </summary>
/// <param name="baseDataCommodityCode"></param>
/// <param name="shelfTask"></param>
/// <param name="bAutoSubmit">是否是主动提交</param>
/// <returns></returns>
public BasePostData <CommodityInventoryChange> CreateShelfTaskCommodityInventoryChange(BaseData <CommodityCode> baseDataCommodityCode, ShelfTask shelfTask, bool bAutoSubmit)
{
BasePostData <CommodityInventoryChange> retBaseSinglePostDataCommodityInventoryChange = null;
//校验是否含有数据，如果含有数据，有就继续下一步
baseDataCommodityCode = HttpHelper.GetInstance().ResultCheck(baseDataCommodityCode, out bool isSuccess);
if (isSuccess)
{
var CommodityCodes = baseDataCommodityCode.body.objects;
var CommodityInventoryChanges = new List <CommodityInventoryChange>(CommodityCodes.Count);
CommodityCodes.ForEach(it =>
{
CommodityInventoryChange cic = new CommodityInventoryChange()
{
CommodityCodeId = it.id, //商品码【扫描】
SourceBill = new SourceBill() //来源单据
{
object_name = typeof(ShelfTask).Name,
object_id = shelfTask.id
},
//EquipmentId = ApplicationState.GetEquipId(),
//StoreHouseId = ApplicationState.GetHouseId(),
//GoodsLocationId = it.GoodsLocationId
};
if (it.operate_type == (int)OperateType.出库)
{
cic.ChangeStatus = CommodityInventoryChangeStatus.未上架.ToString();
cic.StoreHouseId = ApplicationState.GetHouseId();
}
else
{
cic.ChangeStatus = CommodityInventoryChangeStatus.正常.ToString();
cic.EquipmentId = it.EquipmentId;
cic.StoreHouseId = it.StoreHouseId;
cic.GoodsLocationId = it.GoodsLocationId;
}
if (!bAutoSubmit && it.AbnormalDisplay == AbnormalDisplay.异常.ToString())
{
cic.AdjustStatus = CommodityInventoryChangeAdjustStatus.是.ToString();
}
CommodityInventoryChanges.Add(cic);
});
retBaseSinglePostDataCommodityInventoryChange = CommodityInventoryChangeBll.GetInstance().CreateCommodityInventoryChange(CommodityInventoryChanges);
}
else
{
retBaseSinglePostDataCommodityInventoryChange = new BasePostData <CommodityInventoryChange>
{
code = baseDataCommodityCode.code,
message = baseDataCommodityCode.message
};
LogUtils.Error("CreateShelfTaskCommodityInventoryChange 失败！ " + baseDataCommodityCode.message);
}
return(retBaseSinglePostDataCommodityInventoryChange);
}
/// <summary>
/// 根据上架单号获取商品详情
/// </summary>
/// <param name="shelfTaskName"></param>
/// <returns></returns>
public BaseData <ShelfTaskCommodityDetail> GetShelfTaskCommodityDetail(ShelfTask shelfTask)
{
BaseData <ShelfTaskCommodityDetail> baseDataShelfTaskCommodityDetail = HttpHelper.GetInstance().Get <ShelfTaskCommodityDetail>(new QueryParam
{
view_filter =
{
filter =
{
logical_relation = "1 AND 2 AND 3",
expressions =
{
new QueryParam.Expressions
{
field = "ShelfTaskId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(shelfTask.id) }'" }
},
new QueryParam.Expressions
{
field = "StoreHouseId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(ApplicationState.GetHouseId()) }'" }
},
new QueryParam.Expressions
{
field = "EquipmentId",
@operator = "==",
operands = { $"'{ HttpUtility.UrlEncode(ApplicationState.GetEquipId()) }'" }
}
}
}
}
});
//校验是否含有数据，如果含有数据，拼接具体字段
HttpHelper.GetInstance().ResultCheck(baseDataShelfTaskCommodityDetail, out bool isSuccess);
if (isSuccess)
{
baseDataShelfTaskCommodityDetail.body.objects.ForEach(it =>
{
//拼接设备名字
if (!string.IsNullOrEmpty(it.EquipmentId))
{
it.EquipmentName = GetNameById <Equipment>(it.EquipmentId);
}
//拼接库房名字
if (!string.IsNullOrEmpty(it.StoreHouseId))
{
it.StoreHouseName = GetNameById <StoreHouse>(it.StoreHouseId);
}
//拼接货位名字
if (!string.IsNullOrEmpty(it.GoodsLocationId))
{
it.GoodsLocationName = GetNameById <GoodsLocation>(it.GoodsLocationId);
}
//拼接商品名字
if (!string.IsNullOrEmpty(it.CommodityId))
{
it.CommodityName = GetNameById <Commodity>(it.CommodityId);
}
});
}
return(baseDataShelfTaskCommodityDetail);
}