From e1aa3d69d50d8b268a21450058a6ff0619d485af Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 05 六月 2024 16:46:08 +0800
Subject: [PATCH] 斯莫尔当前工单优化
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 4 +-
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html | 8 ++--
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 55 ++++++++++++++++++++++++---
WebTM/views/IpadIndex.html | 6 +-
WebTM/Properties/PublishProfiles/JFTM.pubxml | 2
WebTM/views/生产管理/工单/Sc_CurrentTicket.html | 4 +-
6 files changed, 61 insertions(+), 18 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
index 3d16ad8..70a8712 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缂栫爜\鍙戝竷\layui</PublishUrl>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 26dd9af..1d7633e 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1057,7 +1057,7 @@
}
- //褰撳墠宸ュ崟(璧嬬爜)鎸夐挳鐐瑰嚮浜嬩欢
+ //褰撳墠宸ュ崟(姹囨姤)鎸夐挳鐐瑰嚮浜嬩欢
function CodingReport(event, obj) {
if (wktag == 0) {
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
@@ -1071,7 +1071,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CodingReport.html?OperationType=2&linterid=&HSouceBillType=',
+ content: '杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html?OperationType=2&linterid=&HSouceBillType=',
end: function () {
},
@@ -1331,7 +1331,7 @@
<div class="layui-col-sm12 layui-col-md4" onclick="CodingReport(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-console imgicon"></span>
- <span class="imgtitle">褰撳墠宸ュ崟(璧嬬爜)</span>
+ <span class="imgtitle">褰撳墠宸ュ崟(姹囨姤)</span>
</div>
</div>
</div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
index 94c45de..1482835 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\267\245\345\215\225/Sc_CurrentTicket.html"
@@ -462,8 +462,8 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
- Pub_Close(1);
- window.parent.location.reload();
+ Pub_Close(2);
+ //window.parent.location.reload();
});
//鍒锋柊
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
index 7ba9ffd..e7da65b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_SwipeCardStart.html"
@@ -168,7 +168,7 @@
//#region 鍒濆鍖栫晫闈�
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
- $("#HBarCode").focus();
+ $("#HBardCode").focus();
var params = get_UrlVars();
if (typeof (params[params[0]]) != "undefined") {
@@ -206,7 +206,7 @@
if (result.code == "2") {
layer.close(index);
- layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
parent.GetSwipeCardStart({ "data": 0 });
setTimeout(function () {
var index2 = parent.layer.getFrameIndex(window.name);
@@ -253,7 +253,7 @@
}, 30000);
})
} else {
- layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
parent.GetSwipeCardStart({ "data": 0 });
setTimeout(function () {
var index2 = parent.layer.getFrameIndex(window.name);
@@ -265,7 +265,7 @@
else {
layer.close(index);
- layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
parent.GetSwipeCardStart({ "data": 0 });
setTimeout(function () {
var index2 = parent.layer.getFrameIndex(window.name);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 59b25e3..1c6e3ce 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -207,13 +207,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">骞呭</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index 5c99646..0cd7ef9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -311,11 +311,11 @@
//鍒濆鍖栫晫闈�
set_ClearBill();
- //$("#HEquipName").text(HEquipName);//璁惧鍚嶇О
- //$("#HEquipCode").text(HEquipCode);//璁惧缂栧彿
- //$("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
- //$("#HManagerName").text(HManagerName);//璐熻矗浜�
- //$("#HGroupName").text(HGroupName);//鐝粍
+ $("#HEquipName").text(HEquipName);//璁惧鍚嶇О
+ $("#HEquipCode").text(HEquipCode);//璁惧缂栧彿
+ $("#HEmpName").text(HEmpName);//鎿嶄綔鍛�
+ $("#HManagerName").text(HManagerName);//璐熻矗浜�
+ $("#HGroupName").text(HGroupName);//鐝粍
//#endregion
//#region 銆愪华琛ㄧ洏銆�
@@ -691,7 +691,7 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {//鎻愪氦
- Pub_Close(2);
+ Pub_Close(1);
})
@@ -711,6 +711,7 @@
$("#HPRDOrgID").val(sessionStorage["OrganizationID"]);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
$('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳绂佺敤
+ //get_Display();
get_Display_OutBillList();
get_Display_UserList();
get_ConfigFileInfo_EquipFile();
@@ -801,6 +802,43 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
+
+
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_CurrentTicket/list',
+ type: "GET",
+ async: false,
+ data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
+ $("#HICMOBillNo").text(data.HSourceBillNo);//宸ュ崟鍙�
+ $("#HICMOBillStatus").text('');//褰撳墠鐘舵��
+ $("#HMaterNumber").text(data.HMaterNumber);//浜у搧浠ｇ爜
+ $("#HMaterName").text(data.HMaterName);//浜у搧鍚嶇О
+ $("#HMaterModel").text(data.HModel);//瑙勬牸鍨嬪彿
+ $("#HPlanQty").text(data.HPlanQty);//璁″垝鏁伴噺
+ $("#HReportQty").text(data.HRelationQty);//姹囨姤鎬绘暟
+ $("#HPickMtrlStatus").text('');//棰嗘枡鐘舵��
+ $("#HFCheckNum").text(data.棣栨娆℃暟);//棣栨娆℃暟
+ $("#HPrCheckNum").text(data.杩囩▼妫�娆℃暟);//杩囩▼妫�娆℃暟
+ $("#HPPCheckNum").text(data.宸℃娆℃暟);//宸℃娆℃暟
+ HFinishRate = data.瀹屾垚鐜�;//瀹屾垚鐜�
+ HQualifiedRate = data.鍚堟牸鐜�;//鍚堟牸鐜�
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
//#region 鏌ヨ
function get_PanelDisplay(sWhere) {
@@ -969,10 +1007,15 @@
//淇濆瓨
function Saver(data) {
+ if ($("#HProcExchBillNo").val() == "") {
+ layer.msg("璇锋壂娴佽浆鍗★紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
if ($("#HQty").val() == 0) {
layer.msg("鏁伴噺涓嶈兘涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
+
var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";Add";
var index = layer.load();
$.ajax({
--
Gitblit v1.9.1