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_MaterialHandingEdit.html | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
index 03c91e1..bd421ee 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -82,7 +82,7 @@
</button>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡绠�绉�</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<input type="hidden" name="HUserID" id="HUserID" value="0">
@@ -97,6 +97,12 @@
</div>
</div>
<div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaterName0" id="HMaterName0" readonly>
+ </div>
+ </div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏈�灏忓寘瑁�</label>
<div class="layui-input-inline">
@@ -524,8 +530,10 @@
function set_ClearBill() {
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
-
//$("#HSupID").val(sessionStorage["HUserName"]);
+ $("#HUseFlag").val('true');
+ $("#checkboxHUseFlag").prop("checked", true);
+ form.render('checkbox');
FetchSupInfo();
//$("#HCheckEmp").val(sessionStorage["HUserName"]);
//$("#HCheckTime").val(Format(new Date(), "yyyy-MM-dd"));
@@ -558,12 +566,19 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(data) {
- if ($("#HInBoxPackQty").val() < $("#HMinPackQty").val()) {
+ var checkValue = parseFloat($("#HInBoxPackQty").val());
+ var checkValue_1 = parseFloat($("#HMinPackQty").val());
+
+ if (isNaN(checkValue) || isNaN(checkValue_1)) {
+ layer.alert("鍖呰鏁板繀椤讳负鏁板瓧");
+ return false;
+ }
+
+ if (checkValue < checkValue_1) {
layer.alert("鏍囧噯鍖呰鏁颁笉鍏佽灏忎簬鏈�灏忓寘瑁呮暟");
return false;
}
- else
- return true;
+ return true;
}
//淇濆瓨HMaker
@@ -594,8 +609,13 @@
return;
}
}
+ if ($("#HMaterID").val() == 0 || $("#HMaterID").val() == null || $("#HMaterID").val() == undefined) {
+ layer.msg("鐗╂枡淇℃伅鏈牎楠屾垚鍔燂紝涓嶅厑璁镐繚瀛橈紒");
+ return;
+ }
+
var HMaterID = $('#HMaterNumber').val();
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ';' + sessionStorage["OrganizationID"];
//var sMainSub = sMainStr + ";" + HMaterID;
var itID = $('#HitemID').val();
var index = layer.load();
@@ -752,8 +772,10 @@
// 鐗╂枡鏍￠獙
function get_MaterialCheck(param = 0) {
var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterID = $("#HMaterID").val();
var user = sessionStorage["HUserName"];
var OrganizationID = sessionStorage["OrganizationID"];
+ var SupID = $("#HSupID").val();
$.ajax({
type: "GET",
@@ -763,7 +785,8 @@
"HMaterID": HMaterNumber,
"user": user,
"param": param,
- "OrganizationID": OrganizationID
+ "OrganizationID": OrganizationID,
+ "SupID": SupID
},
success: function (data) {
var responseData = data;
@@ -785,7 +808,7 @@
return;
}
if (responseData === 1) {
- layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾户缁紵', {
+ layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾‘璁ゅ惎鐢ㄥ苟灏嗗巻鍙茬殑鍚敤缁欏彇娑堬紵', {
icon: 3,
title: '鎻愮ず'
}, function (index) {
@@ -794,8 +817,12 @@
});
} else if (responseData.code === "1") {
- $("#HMaterName").val(responseData.data[0]["HName"]);
+ $("#HMaterName0").val(responseData.data[0]["HName"]);
+ $("#HMaterName").val(responseData.data[0]["HSubjoin"]);
$("#HModel").val(responseData.data[0]["HModel"]);
+ $("#HMaterID").val(responseData.data[0]["HItemID"]);
+
+
form.render('select');
} else {
layer.msg(responseData.Message || "鐗╂枡淇℃伅涓嶅瓨鍦�", { time: 5000 });
@@ -813,6 +840,9 @@
function FetchSupInfo() {
var sWhere = "";
//var sWhere = " and 渚涘簲鍟嗗悕绉� ='" + sessionStorage["HUserName"] + "'";
+ if (sessionStorage["HSupIDs"].length < 1000) {
+ sWhere = " and HItemID in (" + sessionStorage["HSupIDs"] + ")";
+ }
$.ajax({
url: GetWEBURL() + "/Gy_Supplier/list",
type: "GET",
--
Gitblit v1.9.1