修改订单详情UI 布局控件
This commit is contained in:
1 parent
f7082d8a7a
commit
39648cd9a9
4 files changed
+431
-757
No files matched your search
@@ -10,12 +10,12 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
public string OutOrderNumStr
|
||||
{
|
||||
get { return "采购单号:" + out_order_no; }
|
||||
get { return out_order_no; }
|
||||
set { }
|
||||
}
|
||||
public string OutOrderBuyerStr
|
||||
{
|
||||
get { return "采购账户:" + buyer_account; }
|
||||
get { return buyer_account; }
|
||||
set { }
|
||||
}
|
||||
|
||||
|
||||
@@ -262,19 +262,19 @@ namespace AllBase.Model.DBModel
|
||||
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
|
||||
this.TransitOrderWaybillToWareHouseStr = null;
|
||||
else
|
||||
this.TransitOrderWaybillToWareHouseStr = "买手物流:" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
||||
this.TransitOrderWaybillToWareHouseStr = ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
||||
|
||||
// 提前取号物流
|
||||
if (ItemTransitOrder?.pre_allocated_order_no != 2)
|
||||
this.TransitOrderWaybillFakeStr = null;
|
||||
else
|
||||
this.TransitOrderWaybillFakeStr = "取号物流:" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
||||
this.TransitOrderWaybillFakeStr = ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
|
||||
|
||||
// 仓库下游物流
|
||||
if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
|
||||
TransitOrderWaybillFromWareHouseStr = null;
|
||||
else
|
||||
TransitOrderWaybillFromWareHouseStr = "仓库物流:" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
|
||||
TransitOrderWaybillFromWareHouseStr = ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
|
||||
|
||||
if (order_id == "3738461463336072960")
|
||||
{
|
||||
@@ -722,7 +722,7 @@ namespace AllBase.Model.DBModel
|
||||
if (ItemTransitOrderWithVoid == null)
|
||||
return "";
|
||||
|
||||
string timeStr = "采购时间:" + ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
string timeStr = ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (CreateDateTime.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
|
||||
return timeStr + " ×";
|
||||
return timeStr + " √";
|
||||
|
||||
Reference in new issue
Block a user