入库
供应商,物料接口
This commit is contained in:
parent
8702a24e20
commit
cfbddf7e9e
@ -6,6 +6,7 @@ using WalkingTec.Mvvm.Mvc;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using HHWMS.Web;
|
||||
using HHWMS.Web.Models;
|
||||
using System.Linq;
|
||||
|
||||
namespace HHWMS.Web.Controllers
|
||||
{
|
||||
@ -82,7 +83,18 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
//vm.Entity.SourceLine =
|
||||
var header = dc.Set<ReceiptHeader2>()
|
||||
.FirstOrDefault(x => x.ID == vm.Entity.ReceiptId);
|
||||
vm.Entity.WarehouseId = header.WarehouseId;
|
||||
vm.Entity.ReceiptCode = header?.Code;
|
||||
var detailList = dc.Set<ReceiptDetail2>()
|
||||
.Where(x => x.ReceiptId == vm.Entity.ReceiptId).ToList();
|
||||
vm.Entity.SourceLine = (detailList.Count() + 1).ToString();
|
||||
vm.Entity.Status = 0;
|
||||
var mater = dc.Set<Material2>()
|
||||
.FirstOrDefault(x => x.Code == vm.Entity.MaterialCode);
|
||||
vm.Entity.MaterialCode = mater?.Name;
|
||||
vm.Entity.Batch = vm.Entity.Batch = _unitwork.GetSerialNumber("HYB", 5).Remove(3, 2);
|
||||
vm.DoAdd();
|
||||
if (!ModelState.IsValid)
|
||||
{
|
||||
|
||||
@ -137,6 +137,10 @@ public class XWMSMFMController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
shipment.TotalLines = detailList.Count;
|
||||
shipment.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(shipment);
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@ -134,6 +134,11 @@ public class XWMSPOHController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
receipt.TotalLines = detailList.Count();
|
||||
receipt.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(receipt);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@ -137,6 +137,11 @@ public class XWMSPTHController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
shipment.TotalLines = detailList.Count;
|
||||
shipment.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(shipment);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@ -131,6 +131,8 @@ public class XWMSSHIPController : BaseController
|
||||
receipt.TotalLines = detailList.Count();
|
||||
receipt.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(receipt);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@ -126,6 +126,12 @@ public class XWMSSOHController : BaseController
|
||||
detailList.Add(detail);
|
||||
}
|
||||
_unitwork.BatchAdd(detailList.ToArray());
|
||||
|
||||
shipment.TotalLines = detailList.Count;
|
||||
shipment.TotalQty = detailList.Sum(x => x.Qty);
|
||||
_unitwork.Update(shipment);
|
||||
|
||||
tran.Commit();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@ -32,16 +32,10 @@ namespace HHWMS.Web
|
||||
protected override IEnumerable<IGridColumn<Material2_View>> InitGridHeader()
|
||||
{
|
||||
return new List<GridColumn<Material2_View>>{
|
||||
this.MakeGridHeader(x => x.Code),
|
||||
this.MakeGridHeader(x => x.Code).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.Name),
|
||||
this.MakeGridHeader(x => x.Name).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.MasterUnit),
|
||||
this.MakeGridHeader(x => x.AssistUnit),
|
||||
this.MakeGridHeader(x => x.WarehouseId),
|
||||
this.MakeGridHeader(x => x.WarehouseCode),
|
||||
this.MakeGridHeader(x => x.CompanyId),
|
||||
this.MakeGridHeader(x => x.CompanyCode),
|
||||
this.MakeGridHeader(x => x.Barcode),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,8 +16,11 @@ namespace HHWMS.Web
|
||||
public String WarehouseCode { get; set; }
|
||||
public Int32? CompanyId { get; set; }
|
||||
public String CompanyCode { get; set; }
|
||||
[Display(Name = "Material2.Code")]
|
||||
public String Code { get; set; }
|
||||
[Display(Name = "Material2.Type")]
|
||||
public String Type { get; set; }
|
||||
[Display(Name = "Material2.Name")]
|
||||
public String Name { get; set; }
|
||||
public String Barcode { get; set; }
|
||||
public String Barcode2 { get; set; }
|
||||
|
||||
@ -54,11 +54,7 @@ namespace HHWMS.Web
|
||||
}),
|
||||
|
||||
this.MakeGridHeader(x => x.Unit),
|
||||
this.MakeGridHeader(x => x.QtyCompleted)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
return a.QtyCompleted.ToString().TrimEnd('0').TrimEnd('.');
|
||||
}),
|
||||
this.MakeGridHeader(x => x.Project).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Status),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
|
||||
@ -47,9 +47,9 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
return rv;
|
||||
}).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.Type),
|
||||
this.MakeGridHeader(x => x.SourceCode).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SourceCode),
|
||||
this.MakeGridHeader(x => x.SupplierCode).SetHide(),
|
||||
this.MakeGridHeader(x => x.SupplierName).SetWidth(150),
|
||||
this.MakeGridHeader(x => x.SupplierName),
|
||||
this.MakeGridHeader(x => x.TotalQty)
|
||||
.SetFormat((a,b) =>
|
||||
{
|
||||
@ -57,16 +57,17 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
}),
|
||||
this.MakeGridHeader(x => x.TotalLines),
|
||||
this.MakeGridHeader(x => x.Remark).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadStatus),
|
||||
this.MakeGridHeader(x => x.Uploadremark),
|
||||
this.MakeGridHeader(x => x.UploadStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.Uploadremark).SetHide(),
|
||||
this.MakeGridHeader(x => x.UploadTime).SetHide(),
|
||||
this.MakeGridHeader(x => x.AppointmentTime).SetHide(),
|
||||
this.MakeGridHeader(x => x.FirstStatus),
|
||||
this.MakeGridHeader(x => x.LastStatus),
|
||||
this.MakeGridHeader(x => x.FirstStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.LastStatus).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef1).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef2).SetHide(),
|
||||
this.MakeGridHeader(x => x.UserDef3).SetHide(),
|
||||
this.MakeGridHeader(x => x.Station),
|
||||
this.MakeGridHeader(x => x.UserDef5).SetHide(),
|
||||
this.MakeGridHeader(x => x.Station).SetHide(),
|
||||
this.MakeGridHeaderAction(width: 200)
|
||||
};
|
||||
}
|
||||
@ -79,6 +80,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
.CheckContain(Searcher.Type, x => x.Type)
|
||||
.CheckContain(Searcher.SourceCode, x => x.SourceCode)
|
||||
.CheckContain(Searcher.SupplierName, x => x.SupplierName)
|
||||
.CheckContain(Searcher.UserDef5, x => x.UserDef5)
|
||||
.Select(x => new ReceiptHeader2_View
|
||||
{
|
||||
ID = x.ID,
|
||||
|
||||
@ -14,14 +14,18 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
{
|
||||
public Int32? WarehouseId { get; set; }
|
||||
public String WarehouseCode { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.ReceiptCode")]
|
||||
public String Code { get; set; }
|
||||
public Int32? CompanyId { get; set; }
|
||||
public String CompanyCode { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.Type")]
|
||||
public String Type { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.SourceCode")]
|
||||
public String SourceCode { get; set; }
|
||||
public String SourcePlatform { get; set; }
|
||||
public Int32? SupplierId { get; set; }
|
||||
public String SupplierCode { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.SupplierName")]
|
||||
public String SupplierName { get; set; }
|
||||
public Decimal? TotalQty { get; set; }
|
||||
public Int32? TotalLines { get; set; }
|
||||
@ -41,6 +45,7 @@ namespace HHWMS.Web.xwms.ViewModels.ReceiptHeader2VMs
|
||||
public String UserDef3 { get; set; }
|
||||
public String Station { get; set; }
|
||||
public String UserDef4 { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.UserDef5")]
|
||||
public String UserDef5 { get; set; }
|
||||
protected override void InitVM()
|
||||
{
|
||||
|
||||
@ -14,8 +14,7 @@
|
||||
</wt:searchpanel>
|
||||
</wt:selector>
|
||||
</wt:row>
|
||||
<wt:textbox field="Entity.MaterialName" />
|
||||
<wt:textbox field="Entity.Batch"/>
|
||||
@* <wt:textbox field="Entity.Batch"/> *@
|
||||
<wt:textbox field="Entity.Qty" />
|
||||
<wt:textbox field="Entity.Price" />
|
||||
<wt:combobox field="Entity.InventoryStatus" items="InventoryStatus" />
|
||||
|
||||
@ -3,6 +3,11 @@
|
||||
|
||||
<wt:searchpanel vm="@Model" reset-btn="true">
|
||||
<wt:row items-per-row="ItemsPerRowEnum.Three" grid-id="ReceiptHeader2">
|
||||
<wt:textbox field="Searcher.Code" />
|
||||
<wt:textbox field="Searcher.Type" />
|
||||
<wt:textbox field="Searcher.SourceCode" />
|
||||
<wt:textbox field="Searcher.SupplierName" />
|
||||
<wt:textbox field="Searcher.UserDef5" />
|
||||
</wt:row>
|
||||
</wt:searchpanel>
|
||||
<wt:grid vm="@Model" id="ReceiptHeader2" url="/xwms/ReceiptHeader2/Search" limit="6" />
|
||||
|
||||
@ -38,16 +38,19 @@ namespace HHWMS.Web.Models
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
[Column("code")]
|
||||
[Display(Name = "Material2.Code")]
|
||||
public string Code { get; set; }
|
||||
/// <summary>
|
||||
/// 物料类别
|
||||
/// </summary>
|
||||
[Column("type")]
|
||||
[Display(Name = "Material2.Type")]
|
||||
public string Type { get; set; }
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
[Column("name")]
|
||||
[Display(Name = "Material2.Name")]
|
||||
public string Name { get; set; }
|
||||
/// <summary>
|
||||
/// 条码
|
||||
@ -143,6 +146,7 @@ namespace HHWMS.Web.Models
|
||||
/// 主计量单位
|
||||
/// </summary>
|
||||
[Column("masterUnit")]
|
||||
[Display(Name = "Material2.MasterUnit")]
|
||||
public string MasterUnit { get; set; }
|
||||
/// <summary>
|
||||
/// 辅计量单位
|
||||
|
||||
48
HHWMS.Web/Models/XWMS/MaterialQr.cs
Normal file
48
HHWMS.Web/Models/XWMS/MaterialQr.cs
Normal file
@ -0,0 +1,48 @@
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 供应商
|
||||
/// </summary>
|
||||
[Table("materialqr")]
|
||||
public partial class MaterialQr2 : BasePoco
|
||||
{
|
||||
[Key]
|
||||
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
|
||||
public new int ID { get; set; }
|
||||
/// <summary>
|
||||
/// 仓库Id
|
||||
/// </summary>
|
||||
[Column("warehouseId")]
|
||||
public int? WarehouseId { get; set; }
|
||||
/// <summary>
|
||||
/// 仓库编码
|
||||
/// </summary>
|
||||
[Column("warehouseCode")]
|
||||
public string WarehouseCode { get; set; }
|
||||
/// <summary>
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
[Column("code")]
|
||||
public string Code { get; set; }
|
||||
/// <summary>
|
||||
/// 物料类别
|
||||
/// </summary>
|
||||
[Column("batch")]
|
||||
public string Batch { get; set; }
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
[Column("qty")]
|
||||
public decimal Qty { get; set; }
|
||||
/// <summary>
|
||||
/// 条码
|
||||
/// </summary>
|
||||
[Column("barcode")]
|
||||
public string Barcode { get; set; }
|
||||
}
|
||||
}
|
||||
@ -48,18 +48,21 @@ namespace HHWMS.Web.Models
|
||||
/// 上游系统单号
|
||||
/// </summary>
|
||||
[Column("sourceCode")]
|
||||
[Display(Name = "ReceiptDetail2.SourceCode")]
|
||||
public string SourceCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 供应商编码
|
||||
/// </summary>
|
||||
[Column("supplierCode")]
|
||||
[Display(Name = "ReceiptDetail2.SupplierCode")]
|
||||
public string SupplierCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 供应商名称
|
||||
/// </summary>
|
||||
[Column("supplierName")]
|
||||
[Display(Name = "ReceiptDetail2.SupplierName")]
|
||||
public string SupplierName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -78,6 +81,7 @@ namespace HHWMS.Web.Models
|
||||
/// 上游系统行号
|
||||
/// </summary>
|
||||
[Column("sourceLine")]
|
||||
[Display(Name = "ReceiptDetail2.SourceLine")]
|
||||
public string SourceLine { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -90,6 +94,7 @@ namespace HHWMS.Web.Models
|
||||
/// 入库单编码
|
||||
/// </summary>
|
||||
[Column("receiptCode")]
|
||||
[Display(Name = "ReceiptDetail2.ReceiptCode")]
|
||||
public string ReceiptCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -102,36 +107,42 @@ namespace HHWMS.Web.Models
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
[Column("materialCode")]
|
||||
[Display(Name = "ReceiptDetail2.MaterialCode")]
|
||||
public string MaterialCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 物料名称
|
||||
/// </summary>
|
||||
[Column("materialName")]
|
||||
[Display(Name = "ReceiptDetail2.MaterialName")]
|
||||
public string MaterialName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 批次
|
||||
/// </summary>
|
||||
[Column("batch")]
|
||||
[Display(Name = "ReceiptDetail2.Batch")]
|
||||
public string Batch { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 批号---规格
|
||||
/// </summary>
|
||||
[Column("lot")]
|
||||
[Display(Name = "ReceiptDetail2.Lot")]
|
||||
public string Lot { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// SN:铁损值
|
||||
/// </summary>
|
||||
[Column("sn")]
|
||||
[Display(Name = "ReceiptDetail2.Sn")]
|
||||
public string Sn { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 项目号:二维码
|
||||
/// </summary>
|
||||
[Column("project")]
|
||||
[Display(Name = "ReceiptDetail2.Project")]
|
||||
public string Project { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -150,24 +161,27 @@ namespace HHWMS.Web.Models
|
||||
/// 物料状态:0:存货编码;1:批次;2:序列号
|
||||
/// </summary>
|
||||
[Column("inventoryStatus")]
|
||||
[Display(Name = "ReceiptDetail2.InventoryStatus")]
|
||||
public string InventoryStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 系统数量
|
||||
/// </summary>
|
||||
[Column("qty")]
|
||||
[Display(Name = "ReceiptDetail2.Qty")]
|
||||
public decimal? Qty { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 收货数量
|
||||
/// </summary>
|
||||
[Column("qtyCompleted")]
|
||||
public decimal? QtyCompleted { get; set; }
|
||||
public decimal? QtyCompleted { get; set; } = 0;
|
||||
|
||||
/// <summary>
|
||||
/// 单位
|
||||
/// </summary>
|
||||
[Column("unit")]
|
||||
[Display(Name = "ReceiptDetail2.Unit")]
|
||||
public string Unit { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -192,12 +206,14 @@ namespace HHWMS.Web.Models
|
||||
/// 单价
|
||||
/// </summary>
|
||||
[Column("price")]
|
||||
public decimal? Price { get; set; }
|
||||
[Display(Name = "ReceiptDetail2.Price")]
|
||||
public decimal? Price { get; set; } = 0;
|
||||
|
||||
/// <summary>
|
||||
/// 状态
|
||||
/// </summary>
|
||||
[Column("status")]
|
||||
[Display(Name = "ReceiptDetail2.Status")]
|
||||
public int? Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -240,6 +256,6 @@ namespace HHWMS.Web.Models
|
||||
/// 已分配数量
|
||||
/// </summary>
|
||||
[Column("qtyDivided")]
|
||||
public decimal? QtyDivided { get; set; }
|
||||
public decimal? QtyDivided { get; set; } = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -30,6 +30,7 @@ namespace HHWMS.Web.Models
|
||||
/// 入库单号
|
||||
/// </summary>
|
||||
[Column("code")]
|
||||
[Display(Name = "ReceiptDetail2.ReceiptCode")]
|
||||
public string Code { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -48,12 +49,14 @@ namespace HHWMS.Web.Models
|
||||
/// 入库类型
|
||||
/// </summary>
|
||||
[Column("type")]
|
||||
[Display(Name = "ReceiptHeader2.Type")]
|
||||
public string Type { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 上游系统单号
|
||||
/// </summary>
|
||||
[Column("sourceCode")]
|
||||
[Display(Name = "ReceiptDetail2.SourceCode")]
|
||||
public string SourceCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -72,24 +75,28 @@ namespace HHWMS.Web.Models
|
||||
/// 供应商编码
|
||||
/// </summary>
|
||||
[Column("supplierCode")]
|
||||
[Display(Name = "ReceiptDetail2.SupplierCode")]
|
||||
public string SupplierCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 供应商名称
|
||||
/// </summary>
|
||||
[Column("supplierName")]
|
||||
[Display(Name = "ReceiptDetail2.SupplierName")]
|
||||
public string SupplierName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 总数量
|
||||
/// </summary>
|
||||
[Column("totalQty")]
|
||||
[Display(Name = "ReceiptHeader2.TotalQty")]
|
||||
public decimal? TotalQty { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 总行数
|
||||
/// </summary>
|
||||
[Column("totalLines")]
|
||||
[Display(Name = "ReceiptHeader2.TotalLines")]
|
||||
public int? TotalLines { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -102,24 +109,28 @@ namespace HHWMS.Web.Models
|
||||
/// 入库单备注
|
||||
/// </summary>
|
||||
[Column("remark")]
|
||||
[Display(Name = "ReceiptHeader2.Remark")]
|
||||
public string Remark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// upload状态
|
||||
/// </summary>
|
||||
[Column("uploadStatus")]
|
||||
public int? UploadStatus { get; set; }
|
||||
[Display(Name = "ReceiptHeader2.UploadStatus")]
|
||||
public int? UploadStatus { get; set; } = 0;
|
||||
|
||||
/// <summary>
|
||||
/// 上传备注
|
||||
/// </summary>
|
||||
[Column("uploadremark")]
|
||||
[Display(Name = "ReceiptHeader2.Uploadremark")]
|
||||
public string Uploadremark { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 上传时间
|
||||
/// </summary>
|
||||
[Column("uploadTime")]
|
||||
[Display(Name = "ReceiptHeader2.UploadTime")]
|
||||
public System.DateTime? UploadTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -132,12 +143,14 @@ namespace HHWMS.Web.Models
|
||||
/// 单据头状态
|
||||
/// </summary>
|
||||
[Column("firstStatus")]
|
||||
[Display(Name = "ReceiptHeader2.FirstStatus")]
|
||||
public int? FirstStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 单据尾状态
|
||||
/// </summary>
|
||||
[Column("lastStatus")]
|
||||
[Display(Name = "ReceiptHeader2.LastStatus")]
|
||||
public int? LastStatus { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -168,6 +181,7 @@ namespace HHWMS.Web.Models
|
||||
/// 自定义字段2
|
||||
/// </summary>
|
||||
[Column("userDef2")]
|
||||
[Display(Name = "ReceiptHeader2.UserDef2")]
|
||||
public string UserDef2 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@ -192,6 +206,7 @@ namespace HHWMS.Web.Models
|
||||
/// 交易组
|
||||
/// </summary>
|
||||
[Column("userDef5")]
|
||||
[Display(Name = "ReceiptHeader2.UserDef5")]
|
||||
public string UserDef5 { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -1386,4 +1386,97 @@
|
||||
<data name="Ship.ShipmentCode" xml:space="preserve">
|
||||
<value>出库单号</value>
|
||||
</data>
|
||||
<data name="Material2.Code" xml:space="preserve">
|
||||
<value>物料编码</value>
|
||||
</data>
|
||||
<data name="Material2.Type" xml:space="preserve">
|
||||
<value>类型</value>
|
||||
</data>
|
||||
<data name="Material2.Name" xml:space="preserve">
|
||||
<value>物料名称</value>
|
||||
</data>
|
||||
<data name="Material2.MasterUnit" xml:space="preserve">
|
||||
<value>单位</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.SourceCode" xml:space="preserve">
|
||||
<value>上游单号</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.SupplierCode" xml:space="preserve">
|
||||
<value>供应商编码</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.SupplierName" xml:space="preserve">
|
||||
<value>供应商名称</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.SourceLine" xml:space="preserve">
|
||||
<value>行号</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.ReceiptCode" xml:space="preserve">
|
||||
<value>入库单号</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.MaterialCode" xml:space="preserve">
|
||||
<value>物料编码</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.MaterialName" xml:space="preserve">
|
||||
<value>物料名称</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Batch" xml:space="preserve">
|
||||
<value>批次</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Lot" xml:space="preserve">
|
||||
<value>规格</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Sn" xml:space="preserve">
|
||||
<value>铁损值</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Project" xml:space="preserve">
|
||||
<value>二维码</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Qty" xml:space="preserve">
|
||||
<value>数量</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Unit" xml:space="preserve">
|
||||
<value>单位</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Status" xml:space="preserve">
|
||||
<value>状态</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.InventoryStatus" xml:space="preserve">
|
||||
<value>物料状态</value>
|
||||
</data>
|
||||
<data name="ReceiptDetail2.Price" xml:space="preserve">
|
||||
<value>价格</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.TotalQty" xml:space="preserve">
|
||||
<value>总数</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.Type" xml:space="preserve">
|
||||
<value>类型</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.TotalLines" xml:space="preserve">
|
||||
<value>总行数</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.UploadStatus" xml:space="preserve">
|
||||
<value>回传状态</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.Uploadremark" xml:space="preserve">
|
||||
<value>回传备注</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.UploadTime" xml:space="preserve">
|
||||
<value>回传时间</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.FirstStatus" xml:space="preserve">
|
||||
<value>首状态</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.LastStatus" xml:space="preserve">
|
||||
<value>尾状态</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.UserDef5" xml:space="preserve">
|
||||
<value>交易组</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.UserDef2" xml:space="preserve">
|
||||
<value>地点</value>
|
||||
</data>
|
||||
<data name="ReceiptHeader2.Remark" xml:space="preserve">
|
||||
<value>备注</value>
|
||||
</data>
|
||||
</root>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
},
|
||||
{
|
||||
"Key": "hangyong",
|
||||
"Value": "Server=172.16.12.212;Port=3306;Database=hangyongwms;Uid=root;Password=abc123*;Character Set=utf8mb4;",
|
||||
"Value": "Server=127.0.0.1;Port=3306;Database=hangtongwms2;Uid=root;Password=abc123*;Character Set=utf8mb4;",
|
||||
"DbContext": "DataContext",
|
||||
"DBType": "mysql"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user