Juj 2 years ago
parent
commit
69aefa309c
  1. 2
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  2. 37
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

2
WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@ -1737,7 +1737,7 @@ a.Sequence,
#region 其它出库SQL #region 其它出库SQL
sqls = @" select sqls = @" select
a.OutCode as Code, a.OutCode as Code,
a.Sequence
a.Sequence,
a.InvCode, a.InvCode,
b.InvName, b.InvName,
b.InvStd, b.InvStd,

37
WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

@ -8,7 +8,7 @@
var _Clos = new Array(); var _Clos = new Array();
var _Clos1 = new Array(); var _Clos1 = new Array();
var flag = '1'; var flag = '1';
var mark = '';
var mark = '拣料';
var Arguments = ''; var Arguments = '';
//var PickID = ''; //var PickID = '';
$(function () { $(function () {
@ -741,6 +741,7 @@
$.modalAlertNew("WMS00093"); $.modalAlertNew("WMS00093");
return; return;
} }
if (mark == '合并拣料') { if (mark == '合并拣料') {
var arr = []; var arr = [];
@ -753,6 +754,10 @@
for (var i = 0; i < rowIds_Item1.length; i++) { for (var i = 0; i < rowIds_Item1.length; i++) {
var objArr = ''; var objArr = '';
var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]); var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]);
if (RowData_Item1.IsOccupy!='已占料') {
$.modalAlert("所选单据未拣料,无法打印!", "warning");
return;
}
objArr += "'" + RowData_Item1.MergeID + "',"; objArr += "'" + RowData_Item1.MergeID + "',";
objArr = objArr.slice(0, objArr.length - 1); objArr = objArr.slice(0, objArr.length - 1);
objArr = "" + objArr + "|"; objArr = "" + objArr + "|";
@ -775,22 +780,22 @@
} }
} }
if (mark == '拣料') { if (mark == '拣料') {
var arr = []; var arr = [];
var obj_Item1 = $("#gridList2");
var rowIds_Item1 = obj_Item1.getDataIDs();
var arrayData_Item1 = new Array();
var Enables = '';
if (rowIds_Item1.length > 0) {
debugger;
for (var i = 0; i < rowIds_Item1.length; i++) {
var objArr = '';
var RowData_Item1 = obj_Item1.getRowData(rowIds_Item1[i]);
objArr += "'" + RowData_Item1.Code + "',";
objArr = objArr.slice(0, objArr.length - 1);
objArr = "" + objArr + "|";
arr.push(objArr);
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
for (var i = 0; i < objList.length; i++) {
var objArr = '';
var rowId = objList[i];
var rowData = $("#gridList").jqGrid('getRowData', rowId);
if (rowData.IsOccupy == '未占料') {
$.modalAlert("所选单据未拣料,无法打印!", "warning");
return;
} }
objArr += "'" + rowData.Code + "',";
objArr = objArr.slice(0, objArr.length - 1);
objArr = "" + objArr + "|";
arr.push(objArr);
}
//var arr = []; //var arr = [];
//var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow'); //var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
@ -805,7 +810,7 @@
//} //}
Arguments = arr; Arguments = arr;
mold = 'JL00001'; mold = 'JL00001';
}
} }
$.modalOpen({ $.modalOpen({
id: "PrintLot", id: "PrintLot",

Loading…
Cancel
Save