From c23f30741bb2d3f01b12d78cffd52dfdf19c37f4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 23 五月 2024 10:54:18 +0800
Subject: [PATCH] 报工平台优化
---
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CodingReport.html | 2
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 1
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 45 ++++++++++++++++------
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 58 +++++++++++++++++++++++++++-
WebTM/layuiadmin/PlateBinding.js | 2
6 files changed, 91 insertions(+), 18 deletions(-)
diff --git a/WebTM/layuiadmin/PlateBinding.js b/WebTM/layuiadmin/PlateBinding.js
index 768f26b..a78f6c2 100644
--- a/WebTM/layuiadmin/PlateBinding.js
+++ b/WebTM/layuiadmin/PlateBinding.js
@@ -32,7 +32,7 @@
}
//鍏敤閮ㄥ垎 ======End========
} else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
}, error: function () {
layer.alert("鍙戠敓閿欒!", { icon: 5 });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 5e7f7f9..632f839 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -618,6 +618,7 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
+ var index = layer.load();
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
if (!AllowLoadData())//鏁版嵁楠岃瘉
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 42c97ac..8f5008a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -786,6 +786,7 @@
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
+ var index = layer.load();
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
if (!AllowLoadData())//鏁版嵁楠岃瘉
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 ae5a4b7..02119f0 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"
@@ -14,6 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/PlateBinding.js"></script>
<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -132,7 +133,7 @@
<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="" id="" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -374,6 +375,9 @@
//var linterid = 11880;
//var HSouceBillType = 3722;
+ get_Display_UserList();
+ get_ConfigFileInfo_EquipFile();
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
var ajaxLoad = layer.load();
@@ -409,7 +413,7 @@
layer.close(ajaxLoad);
}
});
- if (HSouceBillType == 3722 || HSouceBillType == 4610) {
+ if (HSouceBillType == 3722 || HSouceBillType == 4610 || HSouceBillType == 3772) {
$("#HSourceBillType").val(HSouceBillType);
//鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
GetICMOBillValue(linterid);
@@ -579,7 +583,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "HChecker": sessionStorage["HUserName"] },
+ data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -629,6 +633,14 @@
$("#HMaterID").val(data.HMaterID);
$("#HMaterModel").val(data.HMaterModel);
$("#HICMOEntryID").val(data.HICMOEntryID);
+
+ if (HSouceBillType == "3772") {
+ $("#HQty").val(data.HDatePlanQty);
+ $("#HProcExchBillNo").val(data.HSourceBillNo);
+ $("#HProcExchInterID").val(data.HSourceInterID);
+ $("#HProcExchEntryID").val(data.HSourceEntryID);
+ }
+
} else {
layer.alert(result.Message, { icon: 5 });
}
@@ -641,6 +653,46 @@
}
//#endregion
+ //鏌ヨ鐢ㄦ埛鍏宠仈淇℃伅
+ function get_Display_UserList() {
+ var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"] + "'";
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HCheckManID").val(data1.data[0]["HEmpID"]);
+ $("#HCheckManName").val(data1.data[0]["璐ㄦ鍛�"]);
+ $("#HGroupID").val(data1.data[0]["HGroupID"]);
+ $("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
+ layer.close(ajaxLoad);
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+
+ });
+ }
+
+ //#region 鏍规嵁骞虫澘缁戝畾锛岃嚜鍔ㄥ甫鍑哄熀纭�璧勬枡淇℃伅
+ function get_ConfigFileInfo_EquipFile() {
+ var objdata = get_ConfigFileInfo();
+ $("#HProcID").val(objdata.HProcID); //宸ュ簭ID
+ $("#HProcNo").val(objdata.HProcName); //宸ュ簭鍚嶇О
+ $("#HSourceID").val(objdata.HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(objdata.HSourceName); //鐢熶骇璧勬簮鍚嶇О
+ }
+ //#endregion
+
//#region 閫夋嫨鐢熶骇璧勬簮鏂规硶
function get_checkSource() {
layer.open({
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_CodingReport.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_CodingReport.html"
index 2364000..885c083 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_CodingReport.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_CodingReport.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>褰撳墠宸ュ崟(鎵爜姹囨姤)</title>
+ <title>褰撳墠宸ュ崟(璧嬬爜)</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
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 8715d94..5c99646 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"
@@ -15,6 +15,7 @@
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/echarts.min.js"></script>
+ <script src="../../../layuiadmin/PlateBinding.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -199,7 +200,7 @@
<div style="margin-left:25%;">
<dl>
<dd>
- <h2><span>閮ㄩ棬<span style="margin-left:10px;" id="HDepName"></span></span></h2>
+ <h2><span>閮ㄩ棬:<span style="margin-left:10px;" id="HDepName"></span></span></h2>
<h3><span>鐝粍:<span style="margin-left:10px;" id="HGroupName"></span></span></h3>
<h3><span>鎿嶄綔鍛�:<span style="margin-left:10px;" id="HEmpName"></span></span></h3>
<h3><span>璐熻矗浜�:<span style="margin-left:10px;" id="HManagerName"></span></span></h3>
@@ -310,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 銆愪华琛ㄧ洏銆�
@@ -712,6 +713,7 @@
$('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳绂佺敤
get_Display_OutBillList();
get_Display_UserList();
+ get_ConfigFileInfo_EquipFile();
MaxBillNO();
//鏌ヨ
get_FastQuery();
@@ -852,16 +854,16 @@
$("#HDeptID").val(data1.data[0]["HDeptID"]);
$("#HDeptName").val(data1.data[0]["杞﹂棿"]);
- $("#HProcName").val(data1.data[0]["宸ュ簭"]);
- $("#HProcID").val(data1.data[0]["HProcID"]);
- $("#HSourceID").val(data1.data[0]["HSourceID"]);
- $("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
+ //$("#HProcName").val(data1.data[0]["宸ュ簭"]);
+ //$("#HProcID").val(data1.data[0]["HProcID"]);
+ //$("#HSourceID").val(data1.data[0]["HSourceID"]);
+ //$("#HSourceName").val(data1.data[0]["鐢熶骇璧勬簮"]);
$("#HEmpID").val(data1.data[0]["HEmpID"]);
$("#HEmpName").val(data1.data[0]["璐ㄦ鍛�"]);
$("#HGroupID").val(data1.data[0]["HGroupID"]);
$("#HGroupName").val(data1.data[0]["鐢熶骇鐝粍"]);
- $("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
- $("#HCenterName").val(data1.data[0]["宸ヤ綔涓績"]);
+ //$("#HCenterID").val(data1.data[0]["HWorkCenterID"]);
+ //$("#HCenterName").val(data1.data[0]["宸ヤ綔涓績"]);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -876,6 +878,23 @@
});
}
+
+ //#region 鏍规嵁骞虫澘缁戝畾锛岃嚜鍔ㄥ甫鍑哄熀纭�璧勬枡淇℃伅
+ function get_ConfigFileInfo_EquipFile() {
+ var objdata = get_ConfigFileInfo();
+ $("#HProcID").val(objdata.HProcID); //宸ュ簭ID
+ $("#HProcName").val(objdata.HProcName); //宸ュ簭鍚嶇О
+ //$("#HEquipID").val(objdata.HEquipID); //璁惧ID
+ $("#HEquipCode").text(objdata.HEquipName); //璁惧鍚嶇О
+ $("#HSourceID").val(objdata.HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(objdata.HSourceName); //鐢熶骇璧勬簮鍚嶇О
+ //$("#HGroupID").val(objdata.HGroupID); //鐝粍ID
+ //$("#HGroupName").val(objdata.HGroupName); //鐝粍鍚嶇О
+ $("#HCenterID").val(objdata.HWorkCenterID); //宸ヤ綔涓績ID
+ $("#HCenterName").val(objdata.HWorkCenterName); //宸ヤ綔涓績鍚嶇О
+
+ }
+ //#endregion
//鏌ヨ褰撳墠鐢ㄦ埛浠婂ぉ鐨勫嚭绔欏崟鐨勬暟鎹�
function get_Display_OutBillList() {
@@ -912,7 +931,7 @@
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill_CurrentWork/SNHBardCodeList",
async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
--
Gitblit v1.9.1