From 308d8c5f65c7d6e4ed0e82fdd9b361f84c6f8db4 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期四, 02 九月 2021 14:13:25 +0800
Subject: [PATCH] 修改工序进站保存浏览报错问题，工序进站批量保存功能
---
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 20 ++
WebTM/views/车间管理/工序进站接收单/Sc_StationInBill_Mul.html | 392 +++++++++++++++++++++++++++++--------------------------
2 files changed, 223 insertions(+), 189 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index a4039a8..62fc164 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -367,6 +367,7 @@
<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">
</form>
</div>
</div>
@@ -394,10 +395,17 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
var HBillNo = params[params[3]];//鍗曟嵁鍙�
}
- /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+ function consoleParams() {
+ console.log(OperationType);
+ console.log(linterid);
+ console.log(HSouceBillType);
+ console.log(HBillNo);
+ console.log("-----");
+ }
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
+ consoleParams();
//鑾峰彇鏈�澶у崟鎹彿
var ajaxLoad = layer.load();
$.ajax({
@@ -419,7 +427,8 @@
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
$('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
}
- else if(OperationType == 3){
+ else if (OperationType == 3) {
+ consoleParams();
$("#eventType").val("Modify");
RoadBillMain(linterid);
$('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
@@ -429,6 +438,7 @@
//RoadBillSub(linterid);
}
else if (OperationType == 4) {
+ consoleParams();
RoadBillMain(linterid);
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
@@ -499,6 +509,7 @@
} else if (OperationType == 3) {
Pub_Close(1);
} else if (OperationType == 4) {
+ Pub_Close(2);
Pub_Close(1);
}
});
@@ -525,7 +536,7 @@
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
- location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+ location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
}
//#endregion
@@ -641,9 +652,6 @@
}
});
}
- //#endregion
- //#region 淇濆瓨鍚庢祻瑙堟柟娉�
-
//#endregion
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html"
index b5cb541..8cce20f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Sc_StationInBill_Mul.html"
@@ -27,7 +27,6 @@
<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>
<button type="button" id="set_SaveBarCode" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBarCode" style="display:none;">鎵爜淇濆瓨</button>
</div>
@@ -40,12 +39,12 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
<div class="layui-input-inline">
- <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ユ祦姘村彿" autocomplete="off" class="layui-input">
+ <input type="text" name="HProcNo" id="HProcNo" placeholder="璇疯緭鍏ユ祦姘村彿" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<h2 style="float: left;">宸茶繘绔�</h2>
- <input type="text" name="HBarCode" id="HBarCode" value="0" style="width: 30px; border: none; text-align: center; font-size: 24px; ">
+ <input type="text" name="HMainEntryRow" id="HMainEntryRow" value="0" style="width: 30px; border: none; text-align: center; font-size: 24px; ">
<h2 style="float: right;">寮犲崟鎹�</h2>
</div>
</div>
@@ -56,7 +55,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏉″舰鐮�</label>
<div class="layui-input-inline">
- <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇疯緭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -74,8 +73,8 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>涓诲崟鎹彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="text" class="layui-input" name="HMainBillNo" id="HMainBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -87,7 +86,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹鏁伴噺</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HQty" id="HQty">
</div>
</div>
</div>
@@ -115,8 +114,8 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹浜�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HCheckManName" id="HCheckManName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HCheckManID" id="HCheckManID" value="0">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HEmpID" id="HEmpID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkEmp" id="get_checkEmp" style="width: 40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -221,9 +220,27 @@
</div>
</div>
</div>
- <input type="hidden" name="HReportType" id="HReportType" value="1">
- <input type="hidden" name="HBillType" id="HBillType" value="3717">
- <input type="hidden" name="HSourceBillType" id="HSourceBillType" value="0">
+ <input type="hidden" name="HBillNo" id="HBillNo" value="">
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+ <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+ <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID" value="0">
+ <input type="hidden" name="HICMOBillNo" id="HICMOBillNo" value="">
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ <input type="hidden" name="HMaterName" id="HMaterName" value="">
+ <input type="hidden" name="HMaterNumber" id="HMaterNumber" value="">
+ <input type="hidden" name="HMaterModel" id="HMaterModel" value="">
+ <input type="hidden" name="HPieceQty" id="HPieceQty" value="0">
+ <input type="hidden" name="HPlanQty" id="HPlanQty" value="0">
+ <input type="hidden" name="HProcExchBillNo" id="HProcExchBillNo" value="">
+ <input type="hidden" name="HICMOQty" id="HICMOQty" value="0">
+ <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+ <input type="hidden" name="HOrderProcNO" id="HOrderProcNO" value="">
+ <input type="hidden" name="HProcName" id="HProcName" value="">
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <input type="hidden" name="HCenterName" id="HCenterName" value="">
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+ <input type="hidden" name="eventType" id="eventType" value="Add">
</form>
</div>
</div>
@@ -241,7 +258,7 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -249,7 +266,9 @@
, table = layui.table
, form = layui.form
, laydate = layui.laydate
- , element = layui.element;
+ , element = layui.element
+ , util = layui.util;
+ var HMainEntryRow = 1;//鍗曟嵁鍙峰悗缂�
//鍒濆琛ㄦ牸鏁版嵁
var option1 = {
@@ -262,18 +281,26 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HBadReasonNumber', title: '鍗曟嵁鍙�' }
- , { field: 'HBadReasonHName', title: '鏁伴噺' }
- , { field: 'HCheckMan', title: '娴佽浆鍗�' }
- , { field: 'HGroupName', title: '鐢熶骇璁㈠崟' }
- , { field: 'HSourceName', title: '浜у搧浠ｇ爜' }
- , { field: 'HSourceName', title: '浜у搧鍚嶇О' }
- , { field: 'HSourceName', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�' }
+ , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ , { field: 'HQty', title: '鏁伴噺' }
+ , { field: 'HProcExchBillNo', title: '娴佽浆鍗�' }
+ , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟' }
+ , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
+ , { field: 'HMaterName', title: '浜у搧鍚嶇О' }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
, { field: 'HSourceName', title: '鐢熶骇璧勬簮' }
- , { field: 'HSourceName', title: '鐢熶骇鐝粍' }
- , { field: 'HSourceName', title: '鎺ユ敹浜�' }
- , { field: 'HSourceName', title: '鍒跺崟浜�' }
- , { field: 'HSourceName', title: '鍒跺崟鏃ユ湡' }
+ , { field: 'HGroupName', title: '鐢熶骇鐝粍' }
+ , { field: 'HEmpName', title: '鎺ユ敹浜�' }
+ , { field: 'HMaker', title: '鍒跺崟浜�' }
+ , {
+ field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', templet: function (d) {
+ if (d.HMakeDate == null) {
+ return "";
+ }
+ return util.toDateString(d.HMakeDate, "yyyy-MM-dd HH:mm:ss");
+ }
+ }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
]]
, text: {
@@ -284,10 +311,10 @@
option1.data = [];
table.render(option1);
- //#endregion
+ //#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -303,61 +330,36 @@
}
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
- //var ajaxLoad = layer.load();
- //$.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // data: { "HBillType": '3717' },
- // success: function (d) {
- // //console.log(d.data);
- // $("#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"]);
- // layer.close(ajaxLoad);
- // }
- //});
- }
- else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
- $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3717' },
+ data: { "HBillType": '3790' },
success: function (d) {
//console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HMainInterID").val(d.data[0].HInterID);
+ $("#HMainBillNo").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"]);
layer.close(ajaxLoad);
}
});
- if (HSouceBillType == 3722) {
- $("#HSourceBillType").val(HSouceBillType);
- //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- GetICMOBillValue(linterid);
- } else {
- layer.alert("婧愬崟绫诲瀷鏃犳晥锛�", { icon: 5 });
- }
+ }
+ else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+
}
else if (OperationType == 3) {//缂栬緫
- $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+
}
else if (OperationType == 4) {//娴忚
- $("#HItemID").val(linterid);//
- //缂栬緫鍜屾祻瑙堢姸鎬佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //#endregion
+ //#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -374,84 +376,71 @@
});
//#endregion
- //#region 閫夋嫨妫�楠屽憳鎸夐挳
+ //#region 閫夋嫨鎺ユ敹浜烘寜閽�
form.on('submit(get_checkEmp)', function () {
get_checkEmp();
});
//#endregion
- //#region 鎵笉鑹潯鐮�
+ //#region 鎵潯褰㈢爜(娴佽浆鍗�)
$('#HBarCode').on('keydown', function (event) {
if (event.keyCode == 13) {
+ if ($("#HProcNo").val() == "") {
+ layer.msg("璇疯緭鍏ユ祦姘村彿锛�", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
+ if ($("#HQty").val() == "") {
+ layer.msg("璇峰厛濉啓鎺ユ敹鏁伴噺锛�", { icon: 7 });
+ $("#HBarCode").val("");
+ return;
+ }
if ($("#HSourceID").val() == 0) {
- layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇烽�夋嫨鐢熶骇璧勬簮锛�", { icon: 7 });
$("#HBarCode").val("");
return;
}
if ($("#HGroupID").val() == 0) {
- layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 7 });
$("#HBarCode").val("");
return;
}
- if ($("#HCheckManID").val() == 0) {
- layer.msg("璇烽�夋嫨妫�楠屽憳锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ if ($("#HEmpID").val() == 0) {
+ layer.msg("璇烽�夋嫨鎺ユ敹浜猴紒", { icon: 7 });
$("#HBarCode").val("");
return;
}
- //鑾峰彇涓嶈壇鍘熷洜id
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Sc_QualityReportBill/get_HBadReasonID",
- type: "GET",
- data: { "HBadReasonNumber": $("#HBarCode").val() },
- success: function (result) {
- if (result.count == 1) {
- $("#HBadReasonNumber").val($("#HBarCode").val());
- $("#HBadReasonID").val(result.data[0].HItemID);
- layer.close(ajaxLoad);
- //鎵爜淇濆瓨
- $("#set_SaveBarCode").click();
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
- $("#HBarCode").val("");
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- $("#HBarCode").val("");
- }
- });
+ txtHBarCode_KeyDown($("#HBarCode").val());
}
});
//#endregion
- //#region 鎵爜淇濆瓨
- form.on('submit(set_SaveBarCode)', function (data) {
- var sMainStr = JSON.stringify(data.field);
- var oMain = sMainStr + ';' + OperationType;
- var ajaxLoad = layer.load();
- $("#HBarCode").val("");
+ //#region 鎻愪氦鎸夐挳(淇濆瓨)
+ form.on('submit(set_SaveBarCode)', function (data) {//鎻愪氦
+ var oMain = data.field;
+ var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
+ url: GetWEBURL() + "/Cj_StationInBill/AddBill",
async: true,
data: { "oMain": oMain },
dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- layer.close(ajaxLoad);
- layer.msg("鎵爜鎴愬姛");
+ success: function (result) {
+ if (result.count == 1) {
+ layer.close(index);
+ layer.msg("鎵爜杩涚珯鎴愬姛锛�",{ icon: 6 });
+ $("#HMainEntryRow").val(HMainEntryRow);
+ HMainEntryRow++;
+ //鍔犺浇鏄庣粏淇℃伅
get_BarCodeDetail();
- get_BarCodeDetailSum();
}
else {
- layer.close(ajaxLoad);
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
},
error: function (err) {
- layer.close(ajaxLoad);
+ layer.close(index);
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
@@ -475,51 +464,36 @@
layer.confirm('纭畾鍒犻櫎' + rowData.HBadReasonNumber + '鍚楋紵', function (index) {
var ajaxLoad = layer.load();
//閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/Sc_QualityReportBill/del_BarCodeDetail',
- type: "GET",
- data: { "HItemID": rowData.HItemID },
- success: function (result) {
- if (result.count == 1) {
- get_BarCodeDetail();
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ //$.ajax({
+ // url: GetWEBURL() + '/Sc_QualityReportBill/del_BarCodeDetail',
+ // type: "GET",
+ // data: { "HItemID": rowData.HItemID },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // get_BarCodeDetail();
+ // layer.close(ajaxLoad);
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(result.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
layer.close(index);
});
}
});
//#endregion
-
- //#region 淇濆瓨鎻愪氦
- form.on('submit(btnSave)', function (data) {//鎻愪氦
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "HChecker": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 6 });
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 7 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ //#region 娴佹按鍙峰洖杞︽柟娉�
+ $('#HProcNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ $("#HBarCode").focus();
+ }
});
//#endregion
@@ -535,39 +509,6 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "../../user/login.html"; });
}
- }
- //#endregion
-
- //#region 鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
- function GetICMOBillValue(hmainid) {
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Sc_QualityReportBill/get_ICMOBillStatus_Tmp",
- type: "GET",
- data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType },
- success: function (result) {
- var data = result.data[0];
- if (result.count == 1) {
- $("#HICMOBillNo").val(data.HICMOBillNo);
- $("#HICMOInterID").val(data.HICMOInterID);
- $("#HMaterNumber").val(data.HMaterNumber);
- $("#HMaterName").val(data.HMaterName);
- $("#HMaterID").val(data.HMaterID);
- $("#HMaterModel").val(data.HMaterModel);
- } else {
- layer.alert(result.Message, { icon: 5 });
- }
- layer.close(ajaxLoad);
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
- //#endregion
-
- //#region 杩斿洖鐢熶骇浠诲姟鍗曡〃浣撲俊鎭�
- function GetICMOBillDetail(hmainid) {
}
//#endregion
@@ -637,8 +578,8 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HCheckManName").val(checkStatus.data[0].HName);
- $("#HCheckManID").val(checkStatus.data[0].HItemID);
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -646,13 +587,13 @@
}
//#endregion
- //#region 鎵笉鑹潯鐮佸悗璋冪敤鐨勬樉绀烘壂鎻忚褰曟柟娉�
+ //#region 鎵爜淇濆瓨鍚庤皟鐢ㄧ殑鏄剧ず鏄庣粏淇℃伅鏂规硶
function get_BarCodeDetail() {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_QualityReportBill/get_BarCodeDetail',
+ url: GetWEBURL() + '/Cj_StationInBill/get_BarCodeDetail',
type: "GET",
- data: { "HInterID": $("#HInterID").val() },
+ data: { "HMainInterID": $("#HMainInterID").val() },
success: function (data1) {
if (data1.count == 1) {
option1.data = data1.data;
@@ -671,6 +612,91 @@
}
//#endregion
+ //#region 鑾峰彇娴佽浆鍗′俊鎭�
+ function txtHBarCode_KeyDown(HBarCode) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ $("#HICMOInterID").val(data.hicmointerid);
+ $("#lngICMOEntryID").val(data.lngICMOEntryID);
+ $("#HICMOBillNo").val(data.浠诲姟鍗曞彿);
+ $("#HMaterID").val(data.HMaterID);
+ $("#HMaterName").val(data.浜у搧);
+ $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
+ $("#HMaterModel").val(data.瑙勬牸鍨嬪彿);
+ $("#HPieceQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HPlanQty").val(data.娴佽浆鍗℃暟閲�);
+ $("#HProcExchBillNo").val(data.鍗曟嵁鍙�);
+ $("#HICMOQty").val(data.浠诲姟鍗曟暟閲�);
+ $("#lngBillKey").val(data.hmainid);
+ $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+ layer.close(index);
+ $("#HProcNo").attr("readonly", "readonly");
+ $("#HProcNo").css("background-color", "#efefef4d");
+ txtHProcNo_KeyDown(HBarCode, $("#HProcNo").val());
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇娴佹按鍙蜂俊鎭�
+ function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+ type: "GET",
+ data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+ success: function (result) {
+ if (result.count == 1) {
+ var data = result.data[0];
+ $("#lngBillSubKey").val(data.hsubid);
+ $("#HProcName").val(data.宸ュ簭);
+ $("#HProcID").val(data.HProcID);
+ $("#HCenterName").val(data.宸ヤ綔涓績);
+ $("#HCenterID").val(data.HCenterID);
+ layer.close(index);
+ //鑾峰彇鍗曟嵁ID
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3790' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val($("#HMainBillNo").val() + "-" + HMainEntryRow);
+ layer.close(ajaxLoad);
+ //淇濆瓨
+ $("#set_SaveBarCode").click();
+ }
+ });
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
//#endregion
--
Gitblit v1.9.1