|
|
@@ -1619,6 +1619,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string CreateDate = pos.CreateDate == null ? "" : pos.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
string TransferTime = pos.TransferTime == null ? "" : pos.TransferTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
string RecycEndDate = pos.RecycEndDate == null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
+ string DeviceName = pos.DeviceName; //设备类型
|
|
|
+ string OutBatchNo = pos.OutBatchNo; //广电卡地区
|
|
|
// string ActiveTime = reward.CreateDate == null ? "" : reward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
// string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
string result = "";
|
|
|
@@ -1646,6 +1648,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
result += "机具所属小分仓:暂无小分仓\n";
|
|
|
}
|
|
|
+ if(pos.BrandId == 23 || pos.BrandId == 24 || pos.BrandId == 25 || pos.BrandId == 26)
|
|
|
+ {
|
|
|
+ result += "设备厂商:" + DeviceName + "\n";
|
|
|
+ }
|
|
|
+ if(pos.BrandId == 14)
|
|
|
+ {
|
|
|
+ result += "广电卡地区:" + OutBatchNo + "\n";
|
|
|
+ }
|
|
|
result += "入库时间:" + CreateDate + "\n";
|
|
|
result += "循环到期时间:" + RecycEndDate + "\n";
|
|
|
result += "划拨时间:" + TransferTime + "\n";
|