diff --git a/WMS-BS/NFine.Application/OMAY/OMAYLotDataGenerationApp.cs b/WMS-BS/NFine.Application/OMAY/OMAYLotDataGenerationApp.cs
index 61b866f..dfc10a0 100644
--- a/WMS-BS/NFine.Application/OMAY/OMAYLotDataGenerationApp.cs
+++ b/WMS-BS/NFine.Application/OMAY/OMAYLotDataGenerationApp.cs
@@ -34,7 +34,7 @@ namespace NFine.Application.OMAY
from dbo.ICSInventoryLot a
left join dbo.ICSWareHouseLotInfo b on a.LotNo=b.LotNo and a.WorkPoint=b.WorkPoint
inner join dbo.ICSInventory c on a.InvCode=c.InvCode
-inner join dbo.ICSType d on a.Type=d.Code and d.TableCode='ICSInventoryLot' and d.ColumnCode='Type''
+inner join dbo.ICSType d on a.Type=d.Code and d.TableCode='ICSInventoryLot' and d.ColumnCode='Type'
where a.Type='{0}'";
sql = string.Format(sql, queryParam["Type"].ToString());
// sql += " WHERE 1=1";
@@ -222,7 +222,7 @@ SELECT LocationCode as Code ,LocationName as Name FROM dbo.ICSLocation WITH (NOL
//{
if (LotNoCode!="")
{
- LotNo = LotNoCode;
+ LotNo = LotNoCode.ToUpper();
}
else
{
diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSInvCodeHC/Index.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSInvCodeHC/Index.cshtml
index cd84689..b3d5b2a 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSInvCodeHC/Index.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/ICSInvCodeHC/Index.cshtml
@@ -180,7 +180,8 @@
{ label: '自由项8', name: 'cFree8', width: 200, align: 'left', hidden: true },
{ label: '自由项9', name: 'cFree9', width: 200, align: 'left', hidden: true },
{ label: '自由项10', name: 'cFree10', width: 200, align: 'left', hidden: true },
- { label: 'LogID', name: 'LogID', width: 200, align: 'left', hidden: true }
+ { label: 'LogID', name: 'LogID', width: 200, align: 'left', hidden: true },
+ { label: '本次最大发料数', name: 'QTY', hidden: true },
],
width: "100%",
autowidth: true,
@@ -319,7 +320,10 @@
$.modalAlert(data.msg);
return;
}
-
+ var cQuantity = data.dt[0].Quantity;
+ if (data.dt[0].AmountEnable == true) {
+ cQuantity = data.dt[0].Amount;
+ }
//最后一行新增数据
var obj = {
ID: data.dt[0].ID,
@@ -330,7 +334,7 @@
InvUnit: data.dt[0].InvUnit,
ProductDate: data.dt[0].ProductDate,
Quantity: data.dt[0].Quantity,
- CurrentQuantity: 0,
+ CurrentQuantity: cQuantity,
ProjectCode: data.dt[0].ProjectCode,
BatchCode: data.dt[0].BatchCode,
Version: data.dt[0].Version,
@@ -345,7 +349,8 @@
cFree8: data.dt[0].cFree8,
cFree9: data.dt[0].cFree9,
cFree10: data.dt[0].cFree10,
- LogID: data.dt[0].LogID
+ LogID: data.dt[0].LogID,
+ QTY: cQuantity
};
$("#gridList3").jqGrid('addRowData', obj.ID, obj, 'first');
$(".unwritten").hide();
@@ -383,7 +388,7 @@
// $.modalAlert("条码" + RowData.LotNo + "未输入本次退料数量,请确认!", "warning");
return;
}
- if (Number(RowData.CurrentQuantity) > Number(RowData.Quantity)) {
+ if (Number(RowData.CurrentQuantity) > Number(RowData.QTY)) {
$.modalAlert("条码" + RowData.LotNo + "所输入本次退料数量大于条码剩余数量,请确认!", "warning");
return;
}
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 a51c9a0..68fd76a 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYMoOutbound/OMAYMoOutbound.cshtml
@@ -184,6 +184,7 @@
{ label: '自由项8', name: 'cFree8', width: 200, align: 'left', hidden: true },
{ label: '自由项9', name: 'cFree9', width: 200, align: 'left', hidden: true },
{ label: '自由项10', name: 'cFree10', width: 200, align: 'left', hidden: true },
+ { label: '本次最大发料数', name: 'QTY', hidden: true },
],
width: "100%",
autowidth: true,
@@ -354,7 +355,8 @@
cFree7: data.dt[0].cFree7,
cFree8: data.dt[0].cFree8,
cFree9: data.dt[0].cFree9,
- cFree10: data.dt[0].cFree10
+ cFree10: data.dt[0].cFree10,
+ QTY: cQuantity
};
$("#gridList3").jqGrid('addRowData', obj.ID, obj, 'first');
$(".unwritten").hide();
@@ -399,7 +401,7 @@
$.modalAlert("条码" + RowData.LotNo + "未输入本次发料数量,请确认!", "warning");
return;
}
- if (Number(RowData.CurrentQuantity) > Number(RowData.Quantity)) {
+ if (Number(RowData.CurrentQuantity) > Number(RowData.QTY)) {
$.modalAlert("条码" + RowData.LotNo + "所输入本次发料数量大于条码剩余数量,请确认!", "warning");
return;
}
diff --git a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYSalesDelivery/OMAYSalesDeliveryIndex.cshtml b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYSalesDelivery/OMAYSalesDeliveryIndex.cshtml
index 97eaf3b..09f5ec7 100644
--- a/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYSalesDelivery/OMAYSalesDeliveryIndex.cshtml
+++ b/WMS-BS/NFine.Web/Areas/OMAY/Views/OMAYSalesDelivery/OMAYSalesDeliveryIndex.cshtml
@@ -140,6 +140,7 @@
{ label: '自由项8', name: 'cFree8', width: 200, align: 'left', hidden: true },
{ label: '自由项9', name: 'cFree9', width: 200, align: 'left', hidden: true },
{ label: '自由项10', name: 'cFree10', width: 200, align: 'left', hidden: true },
+ { label: '本次最大发料数', name: 'QTY', hidden: true },
],
width: "100%",
autowidth: true,
@@ -307,7 +308,8 @@
cFree7: data.dt[0].cFree7,
cFree8: data.dt[0].cFree8,
cFree9: data.dt[0].cFree9,
- cFree10: data.dt[0].cFree10
+ cFree10: data.dt[0].cFree10,
+ QTY: cQuantity
};
$("#gridList3").jqGrid('addRowData', obj.ID, obj, 'first');
$(".unwritten").hide();
@@ -343,7 +345,7 @@
$.modalAlert("条码" + RowData.LotNo + "未输入本次发货数量,请确认!", 'warning');
return;
}
- if (Number(RowData.CurrentQuantity) > Number(RowData.Quantity)) {
+ if (Number(RowData.CurrentQuantity) > Number(RowData.QTY)) {
$.modalAlert("条码" + RowData.LotNo + "所输入本次发货数量大于条码剩余数量,请确认!", 'warning');
return;
}
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/Deciliter/ICSDeciliter.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/Deciliter/ICSDeciliter.cshtml
index dcd6b9e..12bf242 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/Deciliter/ICSDeciliter.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/Deciliter/ICSDeciliter.cshtml
@@ -807,57 +807,7 @@
}
- function btn_Print() {
- if (MoCount == "" && Type == "3") {
- $.modalAlert("请录入数量再进行打印！", "warning");
- return;
- }
- debugger;
- var objArr = '';
- var arr = [];
- var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
- for (var i = 0; i < objList.length; i++) {
- var rowId = objList[i];
- var rowData = $("#gridList").jqGrid('getRowData', rowId);
- objArr += "'" + rowData.LotNo + "',";
- }
- objArr = objArr.slice(0, objArr.length - 1);
- if (objArr == "") {
- $.modalAlertNew("WMS00003");
- return;
- }
- //if (Type == '3') {
- objArr = "" + objArr + "|" + "'" + MoCount + "'|";
- arr.push(objArr);
- //} else {
- // objArr = "" + objArr + "|";
- // arr.push(objArr);
- //}
- $.modalOpen({
- id: "PrintLot",
- title: "打印",
- url: "/WMS/Print/PrintView?Arguments=" + encodeURI(encodeURI(arr)) + "&mold=" + mold + "&" + Math.random(),
- width: "550px",
- height: "1000px",
- callBack: function (iframeId) {
- top.frames[iframeId].submitForm();
- }
- });
- for (var i = 0; i < objList.length; i++) {
- var rowId = objList[i];
- var rowData = $("#gridList").jqGrid('getRowData', rowId);
- $.ajax({
- url: "/WMS/Print/updatePrintStatus?LotNo=" + rowData.LotNo + "&" + Math.random(),
- dataType: "json",
- async: false,
- success: function (data) {
- content = data.content.replace('{0}', message).replace('{1}', message1);
- }
- });
- }
- MoCount = "";
- }
@@ -901,13 +851,13 @@
$.modalAlertNew("WMS00003");
return;
}
- if (Type == '3') {
+ //if (Type == '3') {
objArr = "" + objArr + "|" + "'" + MoCount + "'|";
arr.push(objArr);
- } else {
- objArr = "" + objArr + "|";
- arr.push(objArr);
- }
+ //} else {
+ // objArr = "" + objArr + "|";
+ // arr.push(objArr);
+ //}
$.modalOpen({
id: "PrintLot",
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
index 3279510..c297310 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
@@ -626,7 +626,7 @@
cols.push(collast);
var collast = { label: '创建人', name: 'CreatePerson', width: 60, align: 'left', };
cols.push(collast);
- var collast = { label: '创建时间', name: 'CreateDateTime', width: 100, align: 'left' };
+ var collast = { label: '到货日期', name: 'CreateDateTime', width: 100, align: 'left' };
cols.push(collast);
$.ajax({
@@ -4153,10 +4153,18 @@
}
});
} else if (Type == '7') {
+ debugger;
for (var i in ids) {
DNCode = $("#gridList").jqGrid('getRowData', ids[i]).DNCode;
Sequence = $("#gridList").jqGrid('getRowData', ids[i]).Sequence;
InvCode = $("#gridList").jqGrid('getRowData', ids[i]).InvCode;
+ CreateDateTime = $("#gridList").jqGrid('getRowData', ids[i]).CreateDateTime;
+ }
+ var ArrivalTime=new Date(CreateDateTime);
+ var NowTime=new Date();
+ if (ArrivalTime > NowTime) {
+ $.modalAlert("单据" + DNCode + "的到货日期大于当前时间,请确认!", "warning");
+ return;
}
$.modalOpen({
id: "FormAddItemLot",
diff --git a/WMS-BS/NFine.Web/Configs/database.config b/WMS-BS/NFine.Web/Configs/database.config
index 8e73c35..df122c7 100644
--- a/WMS-BS/NFine.Web/Configs/database.config
+++ b/WMS-BS/NFine.Web/Configs/database.config
@@ -17,12 +17,12 @@
-
+
+
-
-
+