From 8b2aacd9782c5a11c10eb959ebe2793a832af334 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 06 九月 2022 10:20:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html | 59 +++++++++--
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssue.html | 223 ++++++++++++++++++++++++++++++++++++++++++++
WebTM/views/PublicPage/GroupInformation.html | 2
WebTM/WebTM.csproj | 1
4 files changed, 269 insertions(+), 16 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d53e4ab..f0d1e69 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -995,6 +995,7 @@
<Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Sc_StationOutBill_Mul.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBillList.html" />
+ <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssue.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeIssueBillList.html" />
<Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
diff --git a/WebTM/views/PublicPage/GroupInformation.html b/WebTM/views/PublicPage/GroupInformation.html
index b446efe..d712074 100644
--- a/WebTM/views/PublicPage/GroupInformation.html
+++ b/WebTM/views/PublicPage/GroupInformation.html
@@ -134,8 +134,6 @@
// });
// }
//});
-
-
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html"
new file mode 100644
index 0000000..f8158ee
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssue.html"
@@ -0,0 +1,223 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>宸ュ簭娴佽浆鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <style>
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">纭</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label">鐝粍</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HGroupName" id="HGroupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHGroup" id="btnSearchHGroup" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs12 layui-inline">
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHSource" id="btnSearchHSource" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ </script>
+ <input id="HItemID" name="HItemID" type="hidden" />
+ </form>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--琛屼笅鎷夐�夋嫨(鏄惁濮斿)-->
+ <script type="text/html" id="isEntrust">
+ <select name="isEntrust" lay-filter="isEntrust" id="isEntrust{{d.LAY_TABLE_INDEX+1}}">
+ <option value="false">鍚�</option>
+ <option value="true">鏄�</option>
+ </select>
+ </script>
+ <script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙fā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var linterid = params[params[0]];//婧愬崟id
+ $("#HItemID").val(linterid);
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ form.on('submit(btnSearchHSource)', function () {//鐢熶骇璧勬簮
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐢熶骇璧勬簮'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+ form.on('submit(btnSearchHGroup)', function () {//鐝粍
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鐝粍'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../PublicPage/GroupInformation.html"', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].HName);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ })
+ });
+ //淇濆瓨鎻愪氦
+ form.on('submit(btnSave)', function (data) {//鎻愪氦
+ var HGroupID = $("#HGroupID").val();
+ var HSourceID = $("#HSourceID").val();
+ if (HGroupID == 0 || HSourceID == 0) {
+ layer.msg("璇烽�夋嫨鐝粍鍜岀敓浜ц祫婧�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LEMS/MES_Sc_ProcessExchangeIssue",
+ async: true,
+ data: { "HGroupID": HGroupID, "HSourceID": HSourceID, "HEntryId": $("#HItemID").val() },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+
+ //瀹氫箟鍏ㄥ眬鍙橀噺HMainMaterID
+ var subProcName, subProcNumber, subProcID,
+ subWorkCenterName, subWorkCenterNumber, subWorkCenterID,
+ subSupName, subSupNumber, subSupID,
+ HReasonName, ReasonID, EmpName,
+ ZRProcName, QRName;
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index 424bc1e..4789b29 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -92,6 +92,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Issue"><i class="layui-icon layui-icon-file-b"></i>涓嬭揪</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-file-b"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>宸ュ簭鍑虹珯姹囨姤鍗�</button>-->
@@ -152,6 +153,9 @@
break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
+ break;
+ //涓嬭揪
+ case 'set_Issue': set_Issue();
break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
@@ -292,7 +296,9 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'hmainid', title: 'hmainid', width: 90, hide: true}
+ , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
+ , { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
+ , { field: '涓嬭揪鐘舵��', title: '涓嬭揪鐘舵��' }
, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
, { field: '绫诲瀷', title: '绫诲瀷' }
, {
@@ -305,10 +311,10 @@
}
, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
- , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true}
+ , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
- , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true}
- , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true}
+ , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
+ , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
, { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
, { field: '娴佹按鍙�', title: '娴佹按鍙�' }
@@ -317,17 +323,17 @@
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true}
+ , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
, { field: '瀛愪欢浠g爜', title: '瀛愪欢浠g爜' }
, { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
, { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
, { field: '鎵瑰彿', title: '鎵瑰彿' }
, { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
- , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true}
+ , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
, { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true}
+ , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
, { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
, { field: '鍗曚綅', title: '鍗曚綅' }
, { field: '璁惧妯″叿浠g爜', title: '璁惧妯″叿浠g爜' }
@@ -349,8 +355,8 @@
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- , { field: 'HBillType', title: 'HBillType', width: 80, hide: true}
- , { field: 'hsubid', title: 'hsubid', width: 80, hide: true}
+ , { field: 'HBillType', title: 'HBillType', width: 80, hide: true }
+ , { field: 'hsubid', title: 'hsubid', width: 80, hide: true }
, { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
, { field: '婧愬崟瀹㈡埛缂栫爜', title: '婧愬崟瀹㈡埛缂栫爜', width: 80 }
, { field: '鍖呰鏍囪瘑', title: '鍖呰鏍囪瘑', width: 80 }
@@ -363,10 +369,10 @@
function get_Display(sWhere) {
sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
var ajaxLoad = layer.load();
- $.ajax({
+ $.ajax({
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -381,7 +387,7 @@
layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- });
+ });
DisPlay_HideColumn();
}
@@ -501,7 +507,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
- data: { "HModName": HModName+"_Sec", "user": sessionStorage["HUserName"] },
+ data: { "HModName": HModName + "_Sec", "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.data.length != 0) {
@@ -613,6 +619,31 @@
}
//#endregion
+ //#region 涓嬭揪
+ function set_Issue() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 0) {
+ layer.msg('璇烽�夋嫨闇�瑕佷笅杈剧殑鏁版嵁锛�');
+ return;
+ }
+ var linterid = "";
+ for (var i = 0; i < data.length; i++) {
+ linterid += data[i].hmainid + "-" + data[i].HEntryID + ",";
+ }
+ linterid = linterid.substring(0, linterid.length - 1);
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ //, area: ['30%', '40%']
+ , area: ['100%', '100%']
+ , title: '宸ュ簭鍒楄〃-涓嬭揪'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssue.html?linterid=' + linterid
+ })
+ }
+ //#endregion
+
//鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
@@ -711,7 +742,7 @@
, content: '../../杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=2&HBillNo=' + HBillNo + '&HProcNo=' + HProcNo
})
}
-
+
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
}
--
Gitblit v1.9.1