diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml index 36a7fbc..f4cb923 100644 --- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml +++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml @@ -95,7 +95,7 @@ }); - + } @@ -159,7 +159,7 @@ label: '删除', width: 100, align: 'left', formatter: btnDelete }, - + { label: '料品编码', name: 'InvCode', width: 150, align: 'left' }, { label: '料品名称', name: 'InvName', width: 100, align: 'left' }, { label: '规格型号', name: 'InvStd', width: 100, align: 'left' }, @@ -168,6 +168,7 @@ { label: '生产日期', name: 'ProductDate', width: 150, align: 'left' }, { label: '数量', name: 'Quantity', width: 100, align: 'left' }, { label: '本次发料数量', name: 'CurrentQuantity', width: 200, align: 'left', editable: true }, + { label: '辅计量', name: 'Amount', width: 100, align: 'left' }, { label: '项目号', name: 'ProjectCode', width: 200, align: 'left', hidden: true }, { label: '批次', name: 'BatchCode', width: 200, align: 'left', hidden: true }, { label: '版本', name: 'Version', width: 200, align: 'left', hidden: true }, @@ -195,9 +196,9 @@ //查看子件信息 function BtnLookPick(cellvalue, options, rowObject) { debugger; - + return cellvalue = "选择"; - + } function BtnPick(cellvalue, options, rowObject) { @@ -302,8 +303,8 @@ WorkPoint: WorkPoint, User: User, } - - + + $.ajax({ url: "/OMAY/OMAYMoOutbound/GetLotNotInfo" + "?" + Math.random(), data: { keyValue: JSON.stringify(keyValue) }, @@ -320,6 +321,10 @@ $.modalAlert(data.msg); return; } + var cQuantity = data.dt[0].Quantity; + if (data.dt[0].AmountEnable == true) { + cQuantity = data.dt[0].Amount; + } //最后一行新增数据 var obj = { @@ -331,7 +336,8 @@ InvUnit: data.dt[0].InvUnit, ProductDate: data.dt[0].ProductDate, Quantity: data.dt[0].Quantity, - CurrentQuantity: data.dt[0].Quantity, + CurrentQuantity: cQuantity, + Amount: data.dt[0].Amount, ProjectCode: data.dt[0].ProjectCode, BatchCode: data.dt[0].BatchCode, Version: data.dt[0].Version, @@ -430,7 +436,7 @@