From ee3c35b9a8e50af7bdcdd1218d181a0b4c8e66ba Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 21 十月 2025 09:32:49 +0800
Subject: [PATCH] 打印配置文件修改成惠康信息；通过送货物料信息带出供应商ID,送货数量为0不允许生成条码；送货物料列表改为模糊排序；送货物料编辑页面添加选供应商功能；标准包装列表添加导入功能；添加供应商列表
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html | 80 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 17 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 d90cfc8..a6cb116 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
@@ -296,13 +296,13 @@
if (HMaterNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 = '" + HMaterNumber + "'";
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
}
if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О = '" + HMaterName + "'";
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
}
if (HModel) {
- sWhere += " and 瑙勬牸鍨嬪彿 = '" + HModel + "'";
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
}
if (IsUse!=0) {
sWhere += " and 鏄惁鍚敤 = '" + IsUse + "'";
@@ -623,27 +623,41 @@
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"], "HMaterID": HMaterID},
+ 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("宸茬粡鍚敤锛屼笉鍑嗗啀娆″惎鐢紒", { icon: 5 });
+ // 娌℃湁澶氭潯璁板綍锛岀洿鎺ュ惎鐢�
+ callForEnable(InterID, HMaterID, HSupID, 0, num);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ },
+ error: function () {
+ layer.alert("妫�鏌ヨ褰曟暟閲忓け璐�!", { icon: 5 });
}
});
}
@@ -652,7 +666,39 @@
}
}
+ 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')
--
Gitblit v1.9.1