From d54fc5fd8eb915769cafd2b638648388eeb6391c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 02 七月 2024 21:49:45 +0800
Subject: [PATCH] 修复生产质量汇报单批量保存,更改异常反馈单消息模版
---
WebTM/WebTM.csproj.user | 9 ++--
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 10 +++--
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 48 +++++++++++++++++++-----
3 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 98df84b..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,9 +1,9 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -16,8 +16,9 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login.html</StartPageUrl>
- <StartAction>SpecificPage</StartAction>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
<NativeDebugging>False</NativeDebugging>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 13b9033..7fed1d3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -540,7 +540,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_Sc_ICMOBillStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"HSourceBill": HSourceBill
},
@@ -573,7 +573,7 @@
{
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_ErrMsgBackType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"TypeName": HType
},
@@ -601,7 +601,7 @@
{
type: "GET",
url: GetWEBURL() + "/Sc_MESTransFerWorkBill/Get_UserSuperiors", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
+ async: false,
data: {
"HName": sessionStorage["HUserName"]
},
@@ -1127,7 +1127,9 @@
//鎶ュ伐澶紓甯歌烦杞嚜鍔ㄧ敓鎴愬唴瀹�
function generateString(Datetime, Person, HSourceName, HICMOBillNo, HType) {
// 鎷兼帴瀛楃涓�
- var result = '鍗曟嵁鍙蜂负:' + $("#HBillNo").val() + ',鍒跺崟鏃ユ湡涓�:' + Datetime + ', ' + Person + '鍦�' + HSourceName + '涓婄敓浜у伐鍗曚负' + HICMOBillNo + ', 鍙戠敓寮傚父绫诲瀷涓�:' + HType;
+ var result = '寮傚父绫诲瀷:' + HType + ',璁㈠崟鍙�:' + HICMOBillNo + ',娴佽浆鍗″彿:' + HICMOBillNo
+ + ', 浜у搧缂栫爜:' + $("#HMaterNumber").val() + ',浜у搧鍚嶇О:' + $("#HMaterName").val() + ',瑙勬牸鍨嬪彿:' + $("#HMaterModel").val()
+ + ',鍙戦�佷汉:' + Person + ',鍙戠敓鏃堕棿:' + Datetime + ',鐢熶骇璧勬簮:' + HSourceName;
return result;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
index 002a012..7e58fb4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html"
@@ -83,12 +83,12 @@
<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
+ <!--<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="HBadReasonHQty" id="HBadReasonHQty" value="0">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -383,7 +383,7 @@
//var HSouceBillType = 3722;
get_Display_UserList();
- get_ConfigFileInfo_EquipFile();
+ //get_ConfigFileInfo_EquipFile();
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
@@ -398,9 +398,12 @@
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HMaker").val(sessionStorage["HUserName"]);
$("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
$("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HProcID").val(sessionStorage["HProcID"]); //宸ュ簭ID
+ $("#HProcNo").val(sessionStorage["HProcName"]); //宸ュ簭鍚嶇О
+ $("#HSourceID").val(sessionStorage["HSource"]); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(sessionStorage["HSourceID"]); //鐢熶骇璧勬簮鍚嶇О
layer.close(ajaxLoad);
}
});
@@ -417,10 +420,7 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
- $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
- $("#HMaker").val(sessionStorage["HUserName"]);
- $("#HGroupID").val(sessionStorage["HGroupID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍ID
- $("#HGroupName").val(sessionStorage["HGroup"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鐝粍
+ $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
layer.close(ajaxLoad);
}
});
@@ -470,7 +470,31 @@
//#region 鎵归噺淇濆瓨鎸夐挳
- form.on('submit(btnSumSave)', function () {
+ form.on('submit(btnSumSave)', function (data) {
+ var sMainStr = JSON.stringify(data.field);
+ var oMain = sMainStr + ';' + OperationType;
+ var ajaxLoad = layer.load();
+ $("#HBarCode").val("");
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
+ async: true,
+ data: { "oMain": oMain },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(ajaxLoad);
+ }
+ else {
+ layer.close(ajaxLoad);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(ajaxLoad);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
get_SumSave();
});
//#endregion
@@ -601,7 +625,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"],"HBadReasonHQty": $("#HBadReasonHQty").val() },
+ data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"]/*,"HBadReasonHQty": $("#HBadReasonHQty").val()*/ },
success: function (result) {
if (result.count == 1) {
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -686,6 +710,10 @@
$("#HCheckManName").val(data1.data[0]["璐ㄦ鍛�"]);
$("#HGroupID").val(data1.data[0]["HGroupID"]);
$("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
+ $("#HProcID").val(data1.data[0]["HProcID"]); //宸ュ簭ID
+ $("#HProcNo").val(data1.data[0]["宸ュ簭"]); //宸ュ簭鍚嶇О
+ $("#HSourceID").val(data1.data[0]["HSourceID"]); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]); //鐢熶骇璧勬簮鍚嶇О
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
--
Gitblit v1.9.1