Browse Source

生产领料调用货柜接口修改 检验合格单批量入库修改

master
陆晔 2 years ago
parent
commit
bfafbbfa74
  1. 6
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  2. 8
      WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
  3. 44
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

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

@ -2125,7 +2125,7 @@ c.Sequence,
InspectJosnBody += "},";
}
}
InspectJosnBody.TrimEnd(',');
InspectJosnBody = InspectJosnBody.TrimEnd(',');
foreach (string DocNo in DocNoList)
{
InspectJosnHead += "{";
@ -2135,7 +2135,7 @@ c.Sequence,
InspectJosnHead += "\"ORD_CLIENTE\":\"" + WorkPoint + "\"";
InspectJosnHead += "},";
}
InspectJosnHead.TrimEnd(',');
InspectJosnHead = InspectJosnHead.TrimEnd(',');
if (InspectJosnBody != "")
{
InspectJosn = InspectJosn.Replace("货柜主表区域预留", InspectJosnHead);
@ -3312,7 +3312,7 @@ b.InvUnit,
string WorkPoint = NFine.Code.OperatorProvider.Provider.GetCurrent().Location;
string MUser = NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode;
string MUserName = NFine.Code.OperatorProvider.Provider.GetCurrent().UserName;
var date=DateTime.Now;
var date = DateTime.Now;
objCode = objCode.TrimEnd(',');
string[] parameters = objCode.Split(',');
StringBuilder sb = new StringBuilder();

8
WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs

@ -1780,15 +1780,15 @@ WHERE
string ErrorMessage = "";
foreach (DataRow dr in table.Rows)
{
SAPCallBackJYHGDVPNCS.ZWMS_SK_WS_RUKU Client = new SAPCallBackJYHGDVPNCS.ZWMS_SK_WS_RUKU();
SAPCallBackJYHGDVPNCS.ZWMS_SK_WS_RUKU1 Info = new SAPCallBackJYHGDVPNCS.ZWMS_SK_WS_RUKU1();
SAPCallBackJYHGDVPN.ZWMS_SK_WS_RUKU Client = new SAPCallBackJYHGDVPN.ZWMS_SK_WS_RUKU();
SAPCallBackJYHGDVPN.ZWMS_SK_WS_RUKU1 Info = new SAPCallBackJYHGDVPN.ZWMS_SK_WS_RUKU1();
Info.NEWID = Identification;
Info.PRUEFLOS = dr["DNCode"].ToString();
Info.L_LME = System.Decimal.Round(Convert.ToDecimal(dr["Quantity"].ToString()), 3);
Info.SERNP = "";
Info.Z_GERNR = new SAPCallBackJYHGDVPNCS.ZWEBS_GERNR[0];
Info.Z_GERNR = new SAPCallBackJYHGDVPN.ZWEBS_GERNR[0];
SAPCallBackJYHGDVPNCS.ZWMS_SK_WS_RUKUResponse result = new SAPCallBackJYHGDVPNCS.ZWMS_SK_WS_RUKUResponse();
SAPCallBackJYHGDVPN.ZWMS_SK_WS_RUKUResponse result = new SAPCallBackJYHGDVPN.ZWMS_SK_WS_RUKUResponse();
result = Client.CallZWMS_SK_WS_RUKU(Info);
if (result.Z_NULL == "N")
{

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

@ -11,7 +11,7 @@
var flag = '1';
var mark = '拣料';
var Arguments = '';
var ChosenList = "";
//var ChosenList = "";
//var PickID = '';
$(function () {
@ -260,12 +260,12 @@
$("#" + strIds[i]).find("td").css("background-color", "yellow");
}
}
if (ChosenList != "") {
var Chosen = ChosenList.split(',');
for (var i = 0; i < Chosen.length; i++) {
$("#gridList").jqGrid('setSelection', Chosen[i]);
}
}
//if (ChosenList != "") {
// var Chosen = ChosenList.split(',');
// for (var i = 0; i < Chosen.length; i++) {
// $("#gridList").jqGrid('setSelection', Chosen[i]);
// }
//}
},
//onLoadComplete: function(data) {
// // 设置行选中
@ -336,12 +336,12 @@
$("#" + strIds[i]).find("td").css("background-color", "yellow");
}
}
if (ChosenList != "") {
var Chosen = ChosenList.split(',');
for (var i = 0; i < Chosen.length; i++) {
$("#gridList").jqGrid('setSelection', Chosen[i]);
}
}
//if (ChosenList != "") {
// var Chosen = ChosenList.split(',');
// for (var i = 0; i < Chosen.length; i++) {
// $("#gridList").jqGrid('setSelection', Chosen[i]);
// }
//}
},
//onLoadComplete: function(data) {
// // 设置行选中
@ -726,16 +726,16 @@
var arr = [];
mark = '拣料';
flag = '1';
ChosenList == "";
//ChosenList == "";
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
for (var i in objList) {
if (ChosenList == "") {
ChosenList = $("#gridList").jqGrid('getRowData', objList[i]).ID;
}
else {
ChosenList += "," + $("#gridList").jqGrid('getRowData', objList[i]).ID;
}
}
//for (var i in objList) {
// if (ChosenList == "") {
// ChosenList = $("#gridList").jqGrid('getRowData', objList[i]).ID;
// }
// else {
// ChosenList += "," + $("#gridList").jqGrid('getRowData', objList[i]).ID;
// }
//}
if (objList.length <= 0) {
$.modalAlert("请先选择单据!", "warning");
return;

Loading…
Cancel
Save