From cc9fb0fe046e0c24507f93f7ceb6ac76a2206303 Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Thu, 8 Jun 2023 16:32:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=A0=E6=96=99=E5=8F=8D=E5=90=91?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=20=20=E9=94=81=E5=AE=9A=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../NFine.Application/WMS/PickMaterialApp.cs | 4 +-
.../Views/PickMaterial/ICSMOPickMerge.cshtml | 48 ++++++++++++++++---
2 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 0a1421e..5fcc73c 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -3026,11 +3026,11 @@ b.InvUnit,
objCode = objCode.Substring(1, objCode.Length - 2);
string sql = string.Empty;
- sql += string.Format(@" delete dbo.ICSWareHouseLotInfoLog where TransCode in({0}) and TransType='15' and WorkPoint='{1}'", objCode.TrimEnd(','), WorkPoint);
- sql += string.Format(@"update b set b.LockQuantity=b.LockQuantity-a.Quantity
+ sql += string.Format(@"update b set b.LockQuantity=convert(decimal(18,6),b.LockQuantity)-convert(decimal(18,6),a.Quantity )
from dbo.ICSWareHouseLotInfoLog a
left join dbo.ICSWareHouseLotInfo b on a.LotNo=b.LotNo and a.WorkPoint=b.WorkPoint
where a.TransCode in ({0}) and a.TransType='15' and a.WorkPoint='{1}'", objCode.TrimEnd(','), WorkPoint);
+ sql += string.Format(@" delete dbo.ICSWareHouseLotInfoLog where TransCode in({0}) and TransType='15' and WorkPoint='{1}'", objCode.TrimEnd(','), WorkPoint);
try
{
if (SqlHelper.CmdExecuteNonQueryLi(sql) > 0)
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
index a29feab..f102eeb 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
@@ -10,6 +10,7 @@
var flag = '1';
var mark = '';
var Arguments = '';
+ //var PickID = '';
$(function () {
SetCols();
@@ -230,6 +231,16 @@
shrinkToFit: false,//宽度自适应
autowidth: true,
gridComplete: function () {
+ // debugger;
+ //var PickID = $("#PickID").val();
+ // if (PickID!='') {
+ // var PickID = PickID.split(',');
+ // for (var i = 0; i < PickID.length; i++) {
+ // //$("#gridList").jqGrid('setSelection', PickID[i]);
+ // $("#gridList").jqGrid('setSelection', PickID[i]);
+
+ // }
+ // }
},
rowNum: 10000,
autoScroll: true,
@@ -238,6 +249,7 @@
viewrecords: true,
multiselect: true,
subGrid: true, // (1)开启子表格支持
+
subGridRowExpanded: function (subgrid_id, rowid) { // (2)子表格容器的id和需要展开子表格的行id，将传入此事件函数
$("#gridList").jqGrid("setSelection", rowid, false);
bindSubGrid(subgrid_id, rowid)
@@ -570,6 +582,7 @@
//var ISFlag = false;
var sign = '';
var objCode = '';
+ var PickIDs = '';
var arr = [];
mark = '拣料';
flag = '1';
@@ -582,6 +595,7 @@
$.modalAlertNew("WMS00091");
return;
}
+ PickIDs += "'" + rowId + "',";
objCode += "'" + rowData.Code + "',";
objArr += "'" + rowData.Code + "',";
objArr = objArr.slice(0, objArr.length - 1);
@@ -598,6 +612,8 @@
}
});
if (sign == '0') {
+ // PickID = PickIDs;
+ //$("#PickID").val(PickIDs);
gridList2(flag);
}
if (sign == '1') {
@@ -605,10 +621,11 @@
return;
}
if (sign == '2') {
+ //$("#PickID").val(PickIDs);
gridList3();
}
-
+ Seach();
}
@@ -786,12 +803,30 @@
var objArr = '';
var rowId = objList[i];
var rowData = $("#gridList").jqGrid('getRowData', rowId);
- if (rowData.IsOccupy == "已占料") {
+ //if (rowData.IsOccupy == "已占料") {
objCode += "'" + rowData.Code + "',";
- ISFlag = ISFlag + 1;
+ // ISFlag = ISFlag + 1;
+ //}
+ }
+ $.ajax({
+ url: "/WMS/PickMaterial/SeachPickLog" + "?" + Math.random() + "&objCode=" + objCode,
+ dataType: "json",
+ type: "post",
+ async: false,
+ success: function (data) {
+ sign = data.count;
}
+ });
+ if (sign == '0') {
+
+ $.modalAlert("所选单据无需取消占料！", "warning");
+ return;
+ }
+ if (sign == '1') {
+ $.modalAlert("所选单据占料状态不一致！", "warning");
+ return;
}
- if (objList.length == ISFlag) {
+ if (sign == '2') {
$.submitForm({
url: "/WMS/PickMaterial/DelPickLog?" + Math.random(),
param: { objCode: JSON.stringify(objCode) },
@@ -799,10 +834,8 @@
$.currentWindow().$("#gridList").trigger("reloadGrid");
}
})
- } else {
- $.modalAlert("所选单据中存在未占料单据,请重新选择！", "warning");
- return;
}
+
}
@@ -886,6 +919,7 @@
|
+
|
From 726ea811f4fe52edc0ccce5cb6bb1c8384f277f7 Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Thu, 8 Jun 2023 19:10:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=A3=E6=96=99=E5=89=8D=E5=8F=B0?=
=?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/PickMaterial/ICSMOPickMerge.cshtml | 66 +++++++++++++------
1 file changed, 47 insertions(+), 19 deletions(-)
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
index f102eeb..b37212e 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml
@@ -22,7 +22,7 @@
document.getElementById("gridPanel").innerHTML = ' 详细信息 ';//重置grid
SetCols();
gridList();
-
+
}
@@ -46,7 +46,7 @@
var ct11 = document.getElementById("date4");
var cols = new Array();
- var collast = { label: "主键", name: "ID", hidden: true, key: true };
+ var collast = { label: "主键", name: "ID", hidden: true , key: true };
cols.push(collast);
var collast = { label: '单据号', name: 'Code', width: 120, align: 'left' };
cols.push(collast);
@@ -56,8 +56,8 @@
//cols.push(collast);
//var collast = { label: '维护人名称', name: 'MUSERName', width: 80, align: 'left' };
//cols.push(collast);
- var collast = { label: '是否合并拣料', name: 'IsNew', width: 80, align: 'left' };
- cols.push(collast);
+ //var collast = { label: '是否合并拣料', name: 'IsNew', width: 80, align: 'left' };
+ //cols.push(collast);
var collast = { label: '占料状态', name: 'IsOccupy', width: 80, align: 'left' };
cols.push(collast);
var cols1 = new Array();
@@ -231,17 +231,30 @@
shrinkToFit: false,//宽度自适应
autowidth: true,
gridComplete: function () {
- // debugger;
- //var PickID = $("#PickID").val();
- // if (PickID!='') {
- // var PickID = PickID.split(',');
- // for (var i = 0; i < PickID.length; i++) {
- // //$("#gridList").jqGrid('setSelection', PickID[i]);
- // $("#gridList").jqGrid('setSelection', PickID[i]);
-
- // }
- // }
+
+ var strIds = $("#gridList").jqGrid("getDataIDs");
+
+ for (var i = 0; i < strIds.length; i++) {
+ var strValue = $("#gridList").jqGrid("getCell", strIds[i], "IsOccupy");//得到单元格数据
+ if (strValue == "已占料") {
+ $("#" + strIds[i]).find("td").css("background-color", "yellow");
+ }
+ }
},
+ //onLoadComplete: function(data) {
+ // // 设置行选中
+ // var PickID = $("#PickID").val();
+ // if (PickID != '') {
+ // var PickID = PickID.split(',');
+ // for (var i = 0; i < PickID.length; i++) {
+ // //$("#gridList").jqGrid('setSelection', PickID[i]);
+ // // $("#gridList").jqGrid('setSelection', PickID[i]);
+ // $('#gridList').jqGrid('setSelectionState', PickID[i], true);
+ // // $('#gridList').jqGrid('setSelectionState', '17140e8d-5c4d-4f29-9913-5efc256f6e7f', true);
+
+ // }
+ // }
+ //},
rowNum: 10000,
autoScroll: true,
sortname: 'Code',
@@ -580,13 +593,19 @@
function btnMaterial() {
debugger;
//var ISFlag = false;
+ $("#PickID").val('');
var sign = '';
var objCode = '';
var PickIDs = '';
var arr = [];
mark = '拣料';
flag = '1';
+
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
+ if (objList.length<=0) {
+ $.modalAlert("请先选择单据！", "warning");
+ return;
+ }
for (var i = 0; i < objList.length; i++) {
var objArr = '';
var rowId = objList[i];
@@ -596,8 +615,11 @@
return;
}
PickIDs += "'" + rowId + "',";
- objCode += "'" + rowData.Code + "',";
- objArr += "'" + rowData.Code + "',";
+ if (rowData.Code!=undefined) {
+ objCode += "'" + rowData.Code + "',";
+ objArr += "'" + rowData.Code + "',";
+ }
+
objArr = objArr.slice(0, objArr.length - 1);
objArr = "" + objArr + "|";
arr.push(objArr);
@@ -613,7 +635,7 @@
});
if (sign == '0') {
// PickID = PickIDs;
- //$("#PickID").val(PickIDs);
+ $("#PickID").val(PickIDs);
gridList2(flag);
}
if (sign == '1') {
@@ -621,7 +643,10 @@
return;
}
if (sign == '2') {
- //$("#PickID").val(PickIDs);
+ $("#PickID").val(PickIDs);
+ // $.modalAlert("所选单据已占料,可直接打印！", "warning");
+ $.modalMsg("所选单据已占料,可直接打印！", "warning");
+
gridList3();
}
@@ -804,7 +829,10 @@
var rowId = objList[i];
var rowData = $("#gridList").jqGrid('getRowData', rowId);
//if (rowData.IsOccupy == "已占料") {
+ if (rowData.Code!=undefined) {
objCode += "'" + rowData.Code + "',";
+ }
+
// ISFlag = ISFlag + 1;
//}
}
@@ -831,7 +859,7 @@
url: "/WMS/PickMaterial/DelPickLog?" + Math.random(),
param: { objCode: JSON.stringify(objCode) },
success: function () {
- $.currentWindow().$("#gridList").trigger("reloadGrid");
+ $.currentWindow().$("#gridList").trigger("reloadGrid");
}
})
}