From ca617cc9a6c40a59777cd1df6cf144611f53d226 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 07 十一月 2022 10:14:17 +0800
Subject: [PATCH] 工序流转卡列表增加了芯体物料代码 芯体规格型号
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 44 +++++++---
WebTM/views/质量管理/来料检验单/Kf_QCStockInCheckBill_Fast.html | 188 +++++++---------------------------------------
2 files changed, 59 insertions(+), 173 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
index 570512e..951803e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
@@ -36,7 +36,7 @@
<!--婧愬崟淇℃伅-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
- <div class="layui-row">
+ <!--<div class="layui-row">
<div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
</div>
@@ -45,13 +45,13 @@
<option value="1103">鏀舵枡閫氱煡鍗�</option>
</select>
</div>
- </div>
+ </div>-->
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鏉＄爜</label>
</div>
<div class="layui-col-xs8">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
@@ -998,22 +998,10 @@
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
- var sSubStr = table.cache['wl-table'];
var sBarCode = $('#HBarCode').val()
- var sInterID = $("#HInterID").val()
- var sBillNo = $("#HBillNo").val()
- var sQty = $("#HQty").val()
- var sHBillType = $("#HBillType").val() //婧愬崟绫诲瀷
- var sBillType = '1201'
- var sHWHID = $("#HWHID").val()
- var sHSPID = $("#HStockPlaceID").val()
- var sSourceBillNo = $("#HSourceBillNo").val()
- var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
- var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
+
- if (sQty == "") {
- sQty = 0;
- }
+
//鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
if (sBarCode == '') {
@@ -1024,149 +1012,33 @@
if (sBarCode != "") {
$('#HBarCode').val("");
}
- if (sQty != "") {
- $('#HQty').val("");
- }
- if (sHWHID == "184154") {
- if (sHSPID == "0") {
- playSound();
- layer.msg("浠撲綅涓虹┖锛岃閫夋嫨浠撲綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- $.ajax({
- url: GetWEBURL() + "/POStockInBill/get_CheckTypeByBarCode_Json",
- type: "GET",
- async: false,
- data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) {
- playSound1();
- if (result.data.HBarType == '浠撳簱鏉＄爜') {
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
- $("#HStockPlaceName").val("");
- $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
- element.tabChange('tab-POStockInBill', '2'); //璺宠浆椤电
- }
- else if (result.data.HBarType == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.HSPName);
- $("#HStockPlaceID").val(result.data.HSPID);
- $("#HWHNAME").val(result.data.HWhName);
- $("#HWHID").val(result.data.HWhID);
- $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
- element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
- }
- else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
- element.tabChange('tab-POStockInBill', '2');//璺宠浆椤电
- }
- else if (result.data.HBarType == '婧愬崟鏉＄爜') {
- $("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
- $("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.hSourceBillNoField);
- $("#HBillType").val(result.data.hSourceBillTypeField)
- sessionStorage["SourceFlag"] = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1102") {
- $("#HBillType").val("1102");
-
- }
- else if (result.data.HSourceBillType == "1103") {
- $("#HBillType").val("1103");
- }
- else {
- $("#HBillType").val("鎵嬪伐褰曞叆");
- }
- $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
- element.tabChange('tab-POStockInBill', '3');
- }
- else {
- if (HSourceFlag == true) {
- element.tabChange('tab-POStockInBill', '3');
- }
- else {
- $("#HSupName").val(result.data.hSupNameField);
- $("#HSupID").val(result.data.hSupIDField);
- //$("#HDeptName").val(result.data.HDept);
- //$("#HDeptID").val(result.data.HDeptID);
- //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
- //$("#HBillType").val(result.data.hSourceBillTypeField)
- HSourceFlag = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.hSourceBillTypeField == "1102") {
- $("#HBillType").empty();
- $("#HBillType").val("1102");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '閲囪喘璁㈠崟' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
- }
- if (result.data.hSourceBillTypeField == "1103") {
- $("#HBillType").empty();
- $("#HBillType").val("1103");
- var optionHtml = '';
- optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鏀舵枡閫氱煡鍗�' + "</option>";
- $("#HBillType").append(optionHtml);
- layui.form.render('select');
- $("#HBillType").attr("readonly", "readonly");
- }
- else {
- //$("#HBillType").val("-1");
- }
- $("#HSourceBillNo").attr("readonly", "readonly");
- $("#HNote").val(";鐗╂枡鏉＄爜");
- element.tabChange('tab-POStockInBill', '3');
- }
- }
-
- layer.load(3)
- $.ajax({
- url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1201', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- $("#HBarCode_B").val(result.data.list2[0].HBarCode);
- $("#HMaterName_B").val(result.data.list2[0].HMaterName);
- $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
- $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
- $("#HUnitName_B").val(result.data.list2[0].HUnitName);
- $("#HQty_B").val(result.data.list2[0].HQty);
- $("#HTMQty_B").val(result.data.list2[0].HTMQty);
- $("#HWHName_B").val(result.data.list2[0].HWHName);
- $("#HSPName_B").val(result.data.list2[0].HSPName);
-
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.list.length; i++) {
- count += result.data.list[i].HQty;
- count1 += result.data.list[i].HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
- }
- else {
- playSound();
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
+ element.tabChange('tab-POStockInBill', '2');
+ table.render({
+ elem: '#wl-table'
+ , cellMinWidth: 80
+ , totalRow: true
+ , url: GetWEBURL() + '/Kf_QCStockInCheckBill_Fast/BarCode_Json'
+ , where: { HBarCode: sBarCode }
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width: 200 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200 }
+ , { field: 'HBatchNo', title: '鎵规' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ // , data: [linterid]
+ // , page: true
+ , height: 500
+ , done: function () {
layer.closeAll("loading");
}
});
+
}
var listOption = {
elem: '#wl-table'
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_ProcessExchangeBill.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_ProcessExchangeBill.html"
index bdecb82..7992c4e 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_ProcessExchangeBill.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_ProcessExchangeBill.html"
@@ -158,17 +158,17 @@
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
- </div>
- </div>
- <div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
- <div class="layui-input-inline">
- <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
- </div>
- </div>-->
+ <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+ </div>
+ </div>-->
<div class="layui-col-xs3 layui-inline">
<label class="layui-form-label">妯″叿璁惧</label>
<div class="layui-input-inline">
@@ -179,12 +179,24 @@
</button>
</div>
</div>
- <!--<div class="layui-col-xs3 layui-inline">
- <label class="layui-form-label">鎴愬搧缂栧彿</label>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鑺綋鐗╂枡浠ｇ爜</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+ <input type="text" class="layui-input" name="HXTNumber" id="HXTNumber">
</div>
- </div>-->
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鑺綋瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HXTModel" id="HXTModel">
+ </div>
+ </div>
+ <!--<div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鎴愬搧缂栧彿</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<!--<div class="layui-col-xs3 layui-inline">
@@ -1890,6 +1902,8 @@
$("#HCusNumber").val(data.婧愬崟瀹㈡埛缂栫爜);
$("#HPickLabel").val(data.鍖呰鏍囪瘑);
$("#HPickLabelNumber").val(data.鍖呰鏍囪瘑缂栫爜);
+ $("#HXTNumber").val(data.鑺綋鐗╂枡浠ｇ爜);
+ $("#HXTModel").val(data.鑺綋瑙勬牸鍨嬪彿);
$("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
btnHMaterID = data.hmaterid;
--
Gitblit v1.9.1