From 60df023da9dadd8833ebf2828b6e5ae6b408534a Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 27 六月 2024 14:19:19 +0800
Subject: [PATCH] PDA上料防错单模块界面增加流水号、工序，增加根据流水号带出对应清单；PDA进站单增加上料防错扫码功能
---
WebTM/WebTM.csproj.user | 4
WebTM/views/Baseset/基础资料/Gy_ProcessList.html | 134 ++++++++
WebTM/views/index_Mobile.html | 4
WebTM/views/WMS扫码模块/上料防错单/Sc_MaterToSourceBill_PDA.html | 199 ++++++++++++
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 500 ++++++++++++++++++++++++++++++---
WebTM/WebTM.csproj | 1
6 files changed, 783 insertions(+), 59 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index bc96cbf..a1904aa 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -151,6 +151,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyTypeList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GroupList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_Source.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ProcessList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_SupplierListNew.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f2f9ee5..abfa447 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
@@ -16,7 +16,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <StartPageUrl>views/user/login_pda.html</StartPageUrl>
+ <StartPageUrl>views/user/login.html</StartPageUrl>
<StartAction>SpecificPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcessList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcessList.html"
new file mode 100644
index 0000000..8ea14eb
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcessList.html"
@@ -0,0 +1,134 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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">
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 15px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护鍒�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+ </div>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script>
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ var params = getUrlVars();
+ var HStockOrgID = params[params[0]];
+
+ layui.use(['table', 'form', 'layer'], function () {
+ var table = layui.table
+ , form = layui.form
+ , layer = layui.layer;
+
+ //蹇�熸煡璇�
+ form.on('submit(HQuery)', function () {
+ RoadQuery($('#Value').val());
+ });
+ //杩斿洖
+ form.on('submit(FH)', function () {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetHProcValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ RoadQuery($('#Value').val());
+ table.render({
+ elem: '#mainTable'
+ , data: []
+ , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HItemID', width: 150, title: '宸ュ簭ID', hide: true }
+ , { field: 'HNumber', width: 150, title: '宸ュ簭浠ｇ爜' }
+ , { field: 'HName', width: 150, title: '宸ュ簭鍚嶇О', sort: true }
+ ]]
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
+ });
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ table.on('rowDouble(mainTable)', function (obj) {
+ var data = [];
+ data.push(obj.data);
+ parent.GetHProcValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ });
+ //#endregion
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ function RoadQuery(Where) {
+ var Value = Where;
+ if (Value == null) {
+ Value = '';
+ }
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/WEBSController/GetProcessList_Json",
+ async: true,
+ data: { "Process": Value, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+
+ }
+ });
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ };
+ });
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
index 3272eff..3ac7d42 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_MaterToSourceBill_PDA.html"
@@ -80,6 +80,37 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佹按鍙�</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HProcNo" id="HProcNo" lay-verify="HProcNo" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HProcNo-BT" class="layui-btn" id="HProcNo-BT" style="padding:0 10px">纭畾</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">宸ュ簭</label>
+ </div>
+ <div class="layui-col-xs10">
+ <div class="layui-col-xs10">
+ <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs2">
+ <button type="button" lay-submit="" lay-filter="HProcID-BT" class="layui-btn" id="HProcID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs2">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鐢熶骇璁惧</label>
</div>
<div class="layui-col-xs10">
@@ -437,6 +468,8 @@
$("#HMainSourceBillType").append(optionHtml);
layui.form.render('select');
$("#HMainSourceBillType").attr("disabled", "disabled");
+ $("#HProcName").attr("disabled", "disabled");
+ $('#HProcID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
else {
$("#HMainSourceBillType").empty();
@@ -452,9 +485,14 @@
$("#HICMOInterID").val(d.data[0].HICMOInterID);
$("#HICMOEntryID").val(d.data[0].HICMOEntryID);
$("#HICMOBillNo").val(d.data[0].HICMOBillNo);
+ $("#HProcID").val(d.data[0].HProcID);
+ $("#HProcName").val(d.data[0].HProcName);
$("#HSourceBillNo").val(d.data[0].HMainSourceBillNo);
$("#HSourceBillNo").attr("disabled", "disabled");
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HProcNo").val(d.data[0].HProcNo);
+ $("#HProcNo").attr("disabled", "disabled");
+ $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
}
else {
@@ -468,6 +506,76 @@
//#endregion
//#region 鍩虹璧勬枡閫夋嫨
+
+ //#region 宸ュ簭
+ //鎵弿宸ュ簭鏉＄爜
+ $('#HProcName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HProcName = $('#HProcName').val()
+ if (HProcName == '') {
+ playSound();
+ $("#HProcID").val("0");
+ $("#HProcName").val("");
+ layer.msg("宸ュ簭鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HProcName").select();
+ $("#HProcName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetProcess_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HProcName, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HProcID").val(result.data[0].HInterID);
+ $("#HProcName").val(result.data[0].HName);
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HProcID").val("0");
+ $("#HProcName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HProcName").select();
+ $("#HProcName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //宸ュ簭鎸夐挳
+ form.on('submit(HProcID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcessList.html?HStockOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
//#region 鐢熶骇璁惧
//鎵弿鐢熶骇璁惧鏉＄爜
@@ -703,6 +811,10 @@
$("#HGroupID").val("0");
data.field.HGroupID = $('#HGroupID').val()
}
+ if ($("#HProcName").val() == '') {
+ $("#HProcID").val("0");
+ data.field.HProcID = $('#HProcID').val()
+ }
var sMainStr = JSON.stringify(data.field);
var sSubStr = table.cache['wl-table'];
@@ -852,11 +964,21 @@
$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$("#HMainSourceBillType").attr("disabled", "disabled");
form.render('select');
- element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
- $("#HBarCode").select();
- $("#HBarCode").focus();
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
+ //婧愬崟锛氬伐搴忔祦杞崱
+ if (HSourceBillType == "3772") {
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+ $("#HProcNo").select();
+ $("#HProcNo").focus();
+ }
+ else {
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
+ $("#HProcNo").attr("disabled", "disabled");
+ $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
}
else {
playSound();
@@ -876,6 +998,66 @@
//#endregion
+ //#region 娴佹按鍙峰洖杞�
+
+ //娴佹按鍙峰洖杞�
+ $('#HProcNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByProcNo();
+ }
+ });
+
+ //娴佹按鍙锋寜閽�
+ form.on('submit(HProcNo-BT)', function (data) {
+ GetMeesageByProcNo();
+ });
+
+ //娴佹按鍙峰洖杞﹁繑鍥炰俊鎭�
+ function GetMeesageByProcNo(obj) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val()
+ var HProcNo = $("#HProcNo").val()
+ if ($("#HProcNo").val() == '') {
+ HProcNo = 0
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_ProcNo_MaterToSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HProcExchBillNo": HProcExchBillNo, "HProcNo": HProcNo, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ $("#HProcExchEntryID").val(result.data[0].HProcExchEntryID);
+ $("#HProcID").val(result.data[0].HProcID);
+ $("#HProcName").val(result.data[0].HProcName);
+ $("#HProcName").attr("disabled", "disabled");
+ $('#HProcID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HProcNo").attr("disabled", "disabled");
+ $('#HProcNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '2');
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-Sc_MaterToSourceBill_PDA', '1');
+ $("#HProcNo").select();
+ $("#HProcNo").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
+ //#endregion
//#region 鎵弿鐗╂枡鏉＄爜
@@ -1085,6 +1267,13 @@
//浠ヤ笂涓簂ayui妯″潡
//姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖宸ュ簭淇℃伅
+ function GetHProcValue(obj) {
+ if (obj.length > 0) {
+ $("#HProcName").val(obj[0].HName);
+ $("#HProcID").val(obj[0].HInterID);
+ }
+ }
//鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖鐢熶骇璁惧淇℃伅
function GetHEquipNameValue(obj) {
if (obj.length > 0) {
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index a6160ce..5896799 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -163,13 +163,13 @@
</a>
</dd>-->
<dd>
- <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA_QiaoYi.html?type=jzd" target="main_self_frame" style="color: aqua;">
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html?type=jzd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭杩涚珯鎺ユ敹鍗�
</a>
</dd>
<dd>
- <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA_QiaoYi.html?type=czd" target="main_self_frame" style="color: aqua;">
+ <a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html?type=czd" target="main_self_frame" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
宸ュ簭鍑虹珯姹囨姤鍗�
</a>
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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
index 4204dcc..5f68f5a 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/MES_StationInBill_PDA.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/MES_StationInBill_PDA.html"
@@ -113,11 +113,11 @@
<div style="background-color:#0085E8;">
<span style="color: white;" class="jzd"><i class="layui-icon layui-icon-form"></i>宸ュ簭杩涚珯鎺ユ敹鍗�</span>
</div>
- <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
- <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">鏂板</button>
+ <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
+ <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" id="Add">鏂板</button>
<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
- <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
- <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+ <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" id="Saver">淇濆瓨</button>
+ <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger" id="Cancel">閫�鍑�</button>
</div>
<div class="layui-form-item">
<div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -129,7 +129,7 @@
<th>鏉″舰鐮�</th>
<td class="bz_td">
<input type="text" name="HBarCode" class="layui-input" id="HBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;">
- <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" style="line-height: 30px;">纭畾</button>
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin" id="QueDin" style="line-height: 30px;">纭畾</button>
</td>
</tr>
<tr>
@@ -173,7 +173,7 @@
<tr>
<th>鎺ユ敹浜�</th>
<td class="bz_td">
- <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" >
+ <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎺ユ敹浜轰唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
</td>
<td class="bz_td">
<input type="text" name="HEmpName" class="layui-input" id="HEmpName" placeholder="閫夋嫨鎺ユ敹浜�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
@@ -334,36 +334,60 @@
</tbody>
</table>
</div>
- <!--<div class="layui-tab-item">
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炶</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <!--涓婃枡闃查敊-->
+ <div class="layui-tab-item">
+ <table style="width:80%;">
+ <tbody>
+ <tr>
+ <th>閰嶄欢鏉＄爜</th>
+ <td class="bz_td">
+ <input type="text" name="HMaterBarCode" id="HMaterBarCode" lay-verify="HMaterBarCode" placeholder="璇疯緭鍏ユ潯褰㈢爜鍚庡洖杞�" style="border-radius: 50px;" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="HMaterBarCode-BT" style="line-height: 30px;">纭畾</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="layui-form-item" style="padding: 0px; margin: 0px">
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius layui-btn-danger" id="cmdDelete">鍒犺</button>
</div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
- <script type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </script>
- </div>-->
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<ul class="layui-tab-title">
<li class="layui-this">鍗曟嵁淇℃伅</li>
<li>鍒跺崟淇℃伅</li>
- <!--<li>鏄庣粏淇℃伅</li>-->
+ <li>涓婃枡闃查敊</li>
</ul>
</div>
- </div>
+ </div>
<!--闅愯棌瀛楁-->
- <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+ <input type="hidden" name="HICMOEntryID" id="HICMOEntryID">
<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
<input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
<input type="hidden" name="eventType" id="eventType" value="Add">
<input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+ <input type="hidden" name="HMaterToSourceInterID" id="HMaterToSourceInterID" value="0"><!--涓婃枡闃查敊鍗旾D-->
+ <input type="hidden" name="HMaterToSourceBillNo" id="HMaterToSourceBillNo"><!--涓婃枡闃查敊鍗曞崟鎹彿-->
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
+ </div>
</form>
</div>
</div>
@@ -382,8 +406,10 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ var HMaker = sessionStorage["HUserName"]
var params = get_UrlVars();
var option = [];
+ var listOption = [];
var titleData = [];
var upload = layui.upload;
//#region 鍒濆鍖栭〉闈�
@@ -417,6 +443,82 @@
//});
//#endregion
+ //#region 鎻愮ず闊�
+
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ set_ClearBill();
+
+ function set_ClearBill() {
+ //榛樿鏄剧ず椤甸潰
+ element.tabChange('TabTest', '1');
+ set_InitGrid(); //鍒濆鍖栬〃鏍�
+
+ var data = [];
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+
+ //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+ var pFocus = $("#HBarCode");
+ pFocus.select();
+ pFocus.focus(); //鑾峰彇鍏夋爣
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ listOption = {
+ elem: '#wl-table'
+ //, toolbar: '#toolbarDemo'
+ , totalRow: true
+ , height: 'full-60'
+ , cellMinWidth: 90
+ , limit: 50
+ };
+ }
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(wl-table)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ $(".layui-table-body tr ").attr({ "style": "background:" }); //鍏朵粬tr鎭㈠鍘熸牱
+ obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click'); //閫変腑琛屾牱寮�
+ obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click"); //閫変腑radio鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ })
+ //#endregion
+
+ //#endregion
+
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
@@ -447,6 +549,7 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HBillNo = params[params[3]];//鍗曟嵁鍙�
var closeType = params[params[4]]; //鍏抽棴绫诲瀷
+ $("#HMaterToSourceInterID").val(params[params[5]]); //涓婃枡闃查敊鍗旾D
}
//鍒ゆ柇鏄惁鏂板
@@ -611,7 +714,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
+ location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '& HSouceBillType=& HBillNo=& closeType=2&HMaterToSourceInterID=' + $("#HMaterToSourceInterID").val());
}
//#endregion
@@ -625,33 +728,71 @@
data: { "HInterID": linterid },
success: function (result) {
var data = result.data[0];
- txtHBarCode_KeyDown(data.HBarCode);
- txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
- form.val("formData", { //HGroupName
+ form.val("formData", {
"HInterID": data.HInterID,
"HBillNo": data.HBillNo,
- "HBarCode": data.HBarCode,
+ "HDate": formatDate(data.HDate),
+ "HICMOBillNo": data.HICMOBillNo,
+ "HICMOInterID": data.HICMOInterID,
+ "HICMOEntryID": data.HICMOEntryID,
+ "HProcExchBillNo": data.HProcExchBillNo,
+ "HProcExchHinteID": data.HProcExchInterID,
"HProcNo": data.HProcNo,
"HQty": data.HQty,
- "HGroupID": data.HGroupID,
- "HGroupName": data.HGroupName,
"HSourceID": data.HSourceID,
"HSourceName": data.HSourceName,
+ "HCenterID": data.HCenterID,
+ "HCenterName": data.HCenterName,
+ "HGroupID": data.HGroupID,
+ "HGroupName": data.HGroupName,
"HEmpID": data.HEmpID,
+ "HEmpNumber": data.HEmpNumber,
"HEmpName": data.HEmpName,
- "HRemark": data.HRemark
+ "HProcID": data.HProcID,
+ "HProcName": data.HProcName,
+ "HMaterID": data.HMaterID,
+ "HMaterNumber": data.HMaterNumber,
+ "HMaterName": data.HMaterName,
+ "HMaterModel": data.HMaterModel,
+ "HPlanQty": data.HPlanQty,
+ "HICMOQty": data.HICMOQty,
+ "HOrderProcNO": data.HOrderProcNO,
+ "lngBillKey": data.HProcExchInterID,
+ "lngBillSubKey": data.HProcExchEntryID,
+ "HPRDOrgID": data.HPRDORGID,
+ "HPRDOrg": data.HPRDOrg,
+ "HRemark": data.HRemark,
+ "HMaker": data.HMaker,
+ "HChecker": data.HChecker,
+ "HCloseMan": data.HCloseMan,
+ "HUpDater": data.HUpDater,
+ "HDeleteMan": data.HDeleteMan,
+ "HMakeDate": data.HMakeDate == null ? "" : Pub_Format(data.HMakeDate, "yyyy-MM-dd hh:mm:ss"),
+ "HCheckDate": data.HCheckDate == null ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss"),
+ "HCloseDate": data.HCloseDate == null ? "" : Pub_Format(data.HCloseDate, "yyyy-MM-dd hh:mm:ss"),
+ "HUpDateDate": data.HUpDateDate == null ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
+ "HDeleteDate": data.HDeleteDate == null ? "" : Pub_Format(data.HDeleteDate, "yyyy-MM-dd hh:mm:ss")
});
- if (data.鏄惁瀹℃牳 == "true") {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
- } else {
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
- }
- if (OperationType == 3) {
- $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
- $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
- }
+ $("#HBarCode").attr("readonly", "readonly");
+ $("#HBarCode").css("background-color", "#efefef4d");
+ $('#QueDin').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ $('#SerialNum-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+
+ //if (data.鏄惁瀹℃牳 == "true") {
+ // $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ // $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+ //} else {
+ // $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ // $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+ //}
+ //if (OperationType == 3) {
+ // $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+ // $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+ //}
//PicUpload();
layer.close(index);
}
@@ -1011,7 +1152,7 @@
case "GXLX":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HICMOInterID": data.hicmointerid,
- "lngICMOEntryID": data.HICMOEntryID,
+ "HICMOEntryID": data.HICMOEntryID,
"HICMOBillNo": data.浠诲姟鍗曞彿,
"HMaterID": data.HMaterID,
"HMaterName": data.浜у搧,
@@ -1025,8 +1166,7 @@
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
"HPRDOrg": data.缁勭粐,
- "HPRDOrgID": data.缁勭粐,
- "HQty": data.娴佽浆鍗℃暟閲�,
+ "HPRDOrgID": data.缁勭粐
});
if (data.鎺掑簭鍙� == "涔斾竴") {
@@ -1154,11 +1294,12 @@
});
function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+ var sHBillNo = $('#HBillNo').val();
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ url: GetWEBURL() + "/Cj_StationInBill/HProcNo_KeyDown",
type: "GET",
- data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ data: { "HBillNo": sHBillNo, "HProcExchBillNo": sBillNo, "HProcNo": sProcNo, "HMaker": HMaker },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
@@ -1167,10 +1308,16 @@
"HProcName": data.宸ュ簭,
"HProcID": data.HProcID,
"HCenterName": data.宸ヤ綔涓績,
- "HCenterID": data.HCenterID
+ "HCenterID": data.HCenterID,
+ "HQty": data.HQty,
+ "HMaterToSourceInterID": data.HMaterToSourceInterID,
+ "HMaterToSourceBillNo": data.HMaterToSourceBillNo
});
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
+ $('#SerialNum-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
layer.close(index);
}
else {
@@ -1448,7 +1595,7 @@
}
, end: function () {
var sProcNo = $('#HProcNo').val();
- var sBillNo = $('#HBarCode').val();
+ var sBillNo = $('#HProcExchBillNo').val();
if (sProcNo != "") {
txtHProcNo_KeyDown(sBillNo, sProcNo);
}
@@ -1464,9 +1611,262 @@
form.on('submit(btnSearchSup)', function () {
layer.msg('绂佹閫夋嫨');
});
- //浠ヤ笂涓簂ayui妯″潡
+
+
+ //#region 鎵弿閰嶄欢鏉＄爜
+
+ //鎵弿閰嶄欢鏉＄爜
+ $('#HMaterBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus(); //鑾峰彇鍏夋爣
+ }
+ });
+
+ //鏉＄爜鎸夐挳
+ form.on('submit(HMaterBarCode-BT)', function (data) {
+ GetMeesageByBarCode();
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus(); //鑾峰彇鍏夋爣
+ });
+
+ //鎵潯鐮�
+ function GetMeesageByBarCode(obj) {
+ var sOldBarCode = $('#HMaterBarCode').val()
+ var HDeleteFlag = sOldBarCode.substring(0, 1);
+ var sBarCode = sOldBarCode.slice(1);
+ var HMaterToSourceInterID = $('#HMaterToSourceInterID').val()
+ var HMaterToSourceBillNo = $('#HMaterToSourceBillNo').val()
+
+ if (HDeleteFlag == "*") {
+ if (sBarCode == "") {
+ playSound();
+ layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ return;
+ }
+ else {
+ $('#HMaterBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/set_DelStationInBillSub_BindBarCodeTemp_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillType": '3786', "HBarCode": sBarCode },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ playSound_OK();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg('閿欒' + err, {
+ icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ else {
+ var sBarCode = $('#HMaterBarCode').val()
+ if (sBarCode == '') {
+ playSound();
+ layer.msg("鏉＄爜涓虹┖锛岃鎵弿鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ return;
+ }
+ if (sBarCode != "") {
+ $('#HMaterBarCode').val("");
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MaterToSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillNo": HMaterToSourceBillNo, "HBillType": '3786', "HBarCode": sBarCode, "HMaker": HMaker },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ element.tabChange('TabTest', '3');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HMaterBarCode").select();
+ $("#HMaterBarCode").focus();
+ });
+ }
+ });
+ layer.closeAll("loading");
+ }
+ }
+
+ //#endregion
+
+ //#region 鏄剧ず涓婃枡闃查敊鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ var HMaterToSourceInterID = $('#HMaterToSourceInterID').val()
+ var HMaterToSourceBillNo = $('#HMaterToSourceBillNo').val()
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_MaterToSource_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillNo": HMaterToSourceBillNo, "HBillType": '3786' },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+
+ if (data[i].name == '搴斿彂鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 90, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 200 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏉＄爜鏁伴噺', title: '鏉＄爜鏁伴噺', width: 100 }
+ , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
+
+ //#region 鍒犺
+
+ form.on('submit(cmdDelete)', function () {
+ var checkStatus = table.checkStatus('wl-table')
+ , data = checkStatus.data;
+ if (checkStatus.data.length == 1) {
+ layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+ var HBarCode = data[0].鏉＄爜缂栧彿
+ var HMaterToSourceInterID = $('#HMaterToSourceInterID').val()
+
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelStationInBillSub_BindBarCodeTemp_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HMaterToSourceInterID, "HBillType": '3786', "HBarCode": HBarCode },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ });
+ }
+ else {
+ playSound();
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ layer.closeAll("loading");
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+
+ //#endregion
+
});
+ //浠ヤ笂涓簂ayui妯″潡
+
//杩斿洖鐢熶骇鐝粍
function GetProductionTeamValue(obj) {
$("#HGroupName").val(obj[0].鐝粍);
--
Gitblit v1.9.1