From d14c5dd9ebf781216f5b613f4f757f1d13e27c75 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期六, 13 九月 2025 22:20:22 +0800
Subject: [PATCH] 生成条码添加用户，组织，工号，条码日期；启用物料信息方法替换；新增物料信息添加物料名称显示，物料信息校验不成功不允许保存，添加供应商过滤
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
index 1c2839c..ad73dc5 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
@@ -193,6 +193,9 @@
// 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
+ if (sessionStorage["HSupIDs"].length < 1000) {
+ sWhere += " and HSupID in (" + sessionStorage["HSupIDs"] + ")";
+ }
$.ajax({
url: GetWEBURL() + '/MaterialHandingController/GetMaterialHandingList',
type: "GET",
@@ -619,27 +622,42 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].HItemID.toString();
- //閫昏緫瀹℃牳鏂规硶
+ var HMaterID = data[0].鐗╂枡ID.toString();
+ var FirstID = sessionStorage["HSupIDs"];
+ var HSupID = FirstID.split(",")[0];
+ /* var HSupID = "672189";*/
+
+ // 鍏堟鏌ユ槸鍚﹀瓨鍦ㄥ鏉¤褰�
$.ajax({
type: "GET",
- url: GetWEBURL() + "/MaterialHandingController/OpenMaterial", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "IsUse": num, "CurUserName": sessionStorage["HUserName"] },
+ url: GetWEBURL() + "/MaterialHandingController/CheckMaterialCount",
+ data: {
+ "HMaterID": HMaterID,
+ "HSupID": HSupID,
+ "HInterID": InterID
+ },
success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- //// 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- ////鍏抽棴褰撳墠frame
+ if (result.count > 0) {
+ // 瀛樺湪澶氭潯璁板綍锛屽脊鍑虹‘璁ゆ
+ layer.confirm('鍚屼竴渚涘簲鍟嗕笅鐨勮鐗╂枡瀛樺湪澶氭潯璁板綍锛屾槸鍚﹀皢鍏朵綑璁板綍璁剧疆涓烘湭鍚敤锛�', {
+ btn: ['纭畾', '鍙栨秷'],
+ title: "鍚敤纭"
+ }, function (index) {
+ //浼�1锛屼娇鐢╱pdate
layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- $("#btnSearch").trigger('click');
+ callForEnable(InterID, HMaterID, HSupID, 1, num);
+ }, function (index) {
+ //浼�0锛岀洿鎺ュ惎鐢�
+ layer.close(index);
+ //callForEnable(InterID, HMaterID, HSupID, 0, num);
});
-
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ // 娌℃湁澶氭潯璁板綍锛岀洿鎺ュ惎鐢�
+ callForEnable(InterID, HMaterID, HSupID, 0, num);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ },
+ error: function () {
+ layer.alert("妫�鏌ヨ褰曟暟閲忓け璐�!", { icon: 5 });
}
});
}
@@ -648,11 +666,47 @@
}
}
+ function callForEnable(InterID, HMaterID, HSupID, disableOthers, num) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/MaterialHandingController/OpenMaterial",
+ data: {
+ "HInterID": InterID,
+ "IsUse": num,
+ "CurUserName": sessionStorage["HUserName"],
+ "HMaterID": HMaterID,
+ "HSupID": HSupID,
+ "disableOthers": disableOthers
+ },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ // 鍏抽棴褰撳墠frame
+ layer.close(index);
+ // 淇敼鎴愬姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
+
function get_createBarCode() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
+ if (data[0].鏄惁鍚敤 != 'Y') {
+ layer.msg('璇峰厛鍚敤鍐嶇敓鎴愭潯鐮侊紒');
+ return;
+ }
if (checkStatus.data.length) {
//var linterIDArray[0] = data[0].HItemID;
var linterIDArray = []; var BarCodeArr = data[0].HItemID+',';
@@ -661,7 +715,8 @@
linterIDArray[i] = data[i].HItemID;
BarCodeArr = BarCodeArr + linterIDArray[i] + ',';
}
- BarCodeArr = BarCodeArr.substring(0, BarCodeArr.length-1);
+
+ BarCodeArr = BarCodeArr.substring(0, BarCodeArr.length - 1);
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -679,6 +734,8 @@
layer.msg('鑷冲皯閫夋嫨涓�琛屾暟鎹紒');
}
}
+
+
--
Gitblit v1.9.1