From dfb54ed17fbbf63a41c2b0c0a72e67f456517e2f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 27 十二月 2023 13:40:41 +0800
Subject: [PATCH] 委外入库扫码模块刷新列表方法修改；委外出库扫码模块界面增加加工单位，刷新列表方法修改
---
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 300 ++++++++++++++-----
WebTM/layuiadmin/Scripts/webConfig.js | 5
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 575 +++++++++++++++++++++++++++----------
3 files changed, 634 insertions(+), 246 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ab9d836..2e4e9d1 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/"; //闄堥洴闈欐湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
@@ -23,6 +23,7 @@
//var WEBURL = "http://192.168.0.244:8082/API/"; //甯呭▉鍐呯綉
//var WEBURL = "http://192.168.1.237:9003/API"; //澶忓疂鍐呯綉
//var WEBURL = "http://60.190.4.42:9003/API"; //澶忓疂澶栫綉
+ //var WEBURL = "http://192.168.60.12/API"; //涓帶
return WEBURL
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index a0e4aec..e644126 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -114,6 +114,20 @@
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍔犲伐鍗曚綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupID-BT">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:45px;padding-left:0px;">棰嗘枡浜�</label>
</div>
<div class="layui-col-xs6">
@@ -358,6 +372,34 @@
$("#HBillerID").hide();
var HSourceFlag = sessionStorage["SourceFlag"];
+ //鏄庣粏淇℃伅
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , totalRow: true
+ , limit: 100
+ , limits: [50, 500, 5000, 20000]
+ , page: true
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
@@ -376,18 +418,55 @@
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ //function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ //{
+ // $.ajax({
+ // url: GetWEBURL() + "/Web/GetPonderationBill",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // type: "GET",
+ // data: { "HInterID": linterid },
+ // success: function (d) {
+ // // console.log(d.data);
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // $("#HBillType").val(d.data[0].HSourceBillType == null ? "1604" : d.data[0].HSourceBillType);
+ // //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ // if (d.data[0].HSourceBillType == "1604") {
+ // $("#HBillType").empty();
+ // $("#HBillType").val("1604");
+ // var optionHtml = '';
+ // optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '濮斿璁㈠崟-鎶曟枡' + "</option>";
+ // $("#HBillType").append(optionHtml);
+ // layui.form.render('select');
+ // $("#HBillType").attr("readonly", "readonly");
+ // }
+ // else {
+ // //$("#HBillType").val("-1");
+ // }
+ // $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+ // $("#HSourceBillNo").attr("disabled", "true");
+ // HSourceFlag = true;
+ // $("#HDeptID").val(d.data[0].HDeptID);
+ // $("#HDeptName").val(d.data[0].HDeptName);
+ // //RoadSup();
+ // }
+ // })
+ //}
+
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
type: "GET",
- data: { "HInterID": linterid },
+ url: GetWEBURL() + '/WEBSController/GetSourceBill_Temp_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": linterid, "HBillType": '1211' },
success: function (d) {
- // console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
$("#HBillType").val(d.data[0].HSourceBillType == null ? "1604" : d.data[0].HSourceBillType);
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ //鑾峰彇婧愬崟绫诲瀷
if (d.data[0].HSourceBillType == "1604") {
$("#HBillType").empty();
$("#HBillType").val("1604");
@@ -398,79 +477,93 @@
$("#HBillType").attr("readonly", "readonly");
}
else {
- //$("#HBillType").val("-1");
+ $("#HBillType").empty();
+ $("#HBillType").val("-1");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
+
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
- $("#HSourceBillNo").attr("disabled", "true");
- HSourceFlag = true;
- $("#HDeptID").val(d.data[0].HDeptID);
- $("#HDeptName").val(d.data[0].HDeptName);
- //RoadSup();
+ //闈炲婧愬崟妯″紡
+ if (d.data[0].HMulSourceBill == 0) {
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ //$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ if (d.data[0].HDeptID != 0) {
+ $("#HDeptID").val(d.data[0].HDeptID);
+ $("#HDeptName").val(d.data[0].HDeptName);
+ }
+ $("#HSupID").val(d.data[0].HCusID);
+ $("#HSupName").val(d.data[0].HSupName);
+ //$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
})
}
- function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
- {
- var HSourceBillNo = $('#HSourceBillNo').val()
- var sInterID = $("#HInterID").val()
- var sBillNo = $("#HBillNo").val()
- var HSourceBillType = $("#HBillType").val()
- //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
- if (HSourceBillNo == "" || sInterID <= 0) {
- layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- else {
- $.ajax({
- url: GetWEBURL() + "/EntrustOut/get_GetWW_WWPPBomList",
- type: "GET",
- data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $("#HSupID").val(result.data[0].HSupID);
- $("#HSupName").val(result.data[0].HSupName);
- $("#HDeptID").val(result.data[0].HDeptID);
- $("#HDeptName").val(result.data[0].HDeptName);
- element.tabChange('tab-EntrustOutBill', '2');
- layer.load(3);
- }
- else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- layer.closeAll("loading");
- }
- });
- }
- }
+ //function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇渚涘簲鍟�
+ //{
+ // var HSourceBillNo = $('#HSourceBillNo').val()
+ // var sInterID = $("#HInterID").val()
+ // var sBillNo = $("#HBillNo").val()
+ // var HSourceBillType = $("#HBillType").val()
+ // //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ // if (HSourceBillNo == "" || sInterID <= 0) {
+ // layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ // }
+ // else {
+ // $.ajax({
+ // url: GetWEBURL() + "/EntrustOut/get_GetWW_WWPPBomList",
+ // type: "GET",
+ // data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // $("#HSupID").val(result.data[0].HSupID);
+ // $("#HSupName").val(result.data[0].HSupName);
+ // $("#HDeptID").val(result.data[0].HDeptID);
+ // $("#HDeptName").val(result.data[0].HDeptName);
+ // element.tabChange('tab-EntrustOutBill', '2');
+ // layer.load(3);
+ // }
+ // else {
+ // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // layer.closeAll("loading");
+ // }
+ // });
+ // }
+ //}
- function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
- {
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: linterid, HBillType: '1211', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
- }
+ //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+ //{
+ // table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: linterid, HBillType: '1211', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ // });
+ //}
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -498,7 +591,9 @@
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(linterid);
- RoadBillSub(linterid);
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ //RoadBillSub(linterid);
}
@@ -695,6 +790,57 @@
})
// }
});
+
+ //#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 sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var sMaterID = data[0].HMaterID
+ var sAuxPropID = data[0].HAuxPropID
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ var HBillType = '1211';
+ var sHStockOrgID = sessionStorage["OrganizationID"]
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
+ layer.close(index)
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+
+ //#endregion
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -991,57 +1137,60 @@
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侊紝鎴愬姛\n");
//element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
layer.load(3)
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150, totalRow: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
- //鏄庣粏娓呭崟
- $.ajax({
- url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1211', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- //data: { HBillID: sInterID, HBillType: '1211', sWhere: '' },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //listOption.data = result.data.list;
- table.render(result.data.list);
- $("#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);
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ //table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
+ // , cellMinWidth: 90
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150, totalRow: true }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+
+ ////鏄庣粏娓呭崟
+ //$.ajax({
+ // url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+ // type: "GET",
+ // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1211', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ // //data: { HBillID: sInterID, HBillType: '1211', sWhere: '' },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // //listOption.data = result.data.list;
+ // table.render(result.data.list);
+ // $("#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);
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
//娓呯┖鏁伴噺
$("#HQty").val("");
}
@@ -1062,63 +1211,169 @@
var audio = document.getElementById("cs2");
audio.play();
}
- //鎵簮鍗�
+ ////鎵簮鍗�
+ //function GetMeesageBySourceBillNo(obj) {
+ // var HSourceBillNo = $('#HSourceBillNo').val()
+ // var sInterID = $("#HInterID").val()
+ // var sBillNo = $("#HBillNo").val()
+ // var HSourceBillType = $("#HBillType").val();
+ // //
+ // $.ajax({
+ // //url: "http://61.130.49.162:9090/WMSAPI///EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
+ // url: GetWEBURL() + "/EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
+ // type: "GET",
+ // data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // playSound1();
+ // $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屾垚鍔焅n");
+ // HSourceFlag = true;
+ // element.tabChange('tab-EntrustOutBill', '2'); //璺宠浆椤电
+ // layer.load(3)
+
+ // //鏄剧ず琛ㄤ綋鏄庣粏
+ // DisBillEntryList();
+
+ // //table.render({
+ // // elem: '#wl-table'
+ // // // , url: 'http://61.130.49.162:9090/WMSAPI///EntrustOut/DisBillEntryList_Entrust_Webs_Json'
+ // // , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
+ // // , toolbar: '#toolbarDemo'
+ // // , totalRow: true
+ // // , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
+ // // , cols: [[
+ // // { type: 'radio' }
+ // // , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ // // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150, totalRow: true}
+ // // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // // , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ // // ]]
+ // // // , data: [linterid]
+ // // // , page: true
+ // // , height: 500
+ // // , done: function () {
+ // // layer.closeAll("loading");
+ // // }
+ // //});
+ // }
+ // else {
+ // playSound();
+ // $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屽け璐n");
+ // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // layer.closeAll("loading");
+ // }
+ // });
+ //}
+
+ //鎵弿婧愬崟鏉＄爜
function GetMeesageBySourceBillNo(obj) {
+ var HInterID = $("#HInterID").val()
+ var HBillNo = $("#HBillNo").val()
var HSourceBillNo = $('#HSourceBillNo').val()
- var sInterID = $("#HInterID").val()
- var sBillNo = $("#HBillNo").val()
- var HSourceBillType = $("#HBillType").val();
- //
+ var HSourceBillType = $("#HBillType").val()
+ var HMaker = sessionStorage["HUserName"];
+ var HStockOrgID = sessionStorage["OrganizationID"]
+ layer.load(3)
$.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
- url: GetWEBURL() + "/EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
type: "GET",
- data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_EntrustOut_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": '1211', "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": 0, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();
- $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屾垚鍔焅n");
HSourceFlag = true;
- element.tabChange('tab-EntrustOutBill', '2'); //璺宠浆椤电
- layer.load(3)
- table.render({
- elem: '#wl-table'
- // , url: 'http://61.130.49.162:9090/WMSAPI///EntrustOut/DisBillEntryList_Entrust_Webs_Json'
- , url: GetWEBURL() + '/EntrustOut/DisBillEntryList_Entrust_Webs_Json'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , where: { HBillID: sInterID, HBillType: '1211', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150, totalRow: true}
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ $("#HSupName").val(result.data.hSupNameField);
+ $("#HSupID").val(result.data.hSupIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
+
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+ $("#HBillType").attr("disabled", "disabled");
+ form.render('select');
+ if (result.data.hMulSourceFlagField == 0) {
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ //$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ element.tabChange('tab-EntrustOutBill', '2');
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
}
else {
playSound();
- $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屽け璐n");
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ element.tabChange('tab-EntrustOutBill', '1');
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
}
- layer.closeAll("loading");
+ }
+ });
+ layer.closeAll("loading");
+ }
+
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HBillType = '1211'
+ var sHStockOrgID = sessionStorage["OrganizationID"];
+
+ //鍒锋柊鍒楄〃淇℃伅
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": sHStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.Materlist;
+ table.render(listOption);
+ if (result.data.BarCodeDetailslist[0])
+ $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
+ $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.BarCodeDetailslist[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.BarCodeDetailslist[0].HUnitName);
+ $("#HQty_B").val(result.data.BarCodeDetailslist[0].HQty);
+ $("#HTMQty_B").val(result.data.BarCodeDetailslist[0].HTMQty);
+ $("#HWHName_B").val(result.data.BarCodeDetailslist[0].HWHName);
+ $("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
+
+ ////console.log(result.data.list2);
+ //var count = 0;
+ //var count1 = 0;
+ //for (var i = 0; i < result.data.Materlist.length; i++) {
+ // count += result.data.Materlist[i].HQty;
+ // count1 += result.data.Materlist[i].HPieceQty;
+ //}
+ //$("#HSumQtys").val(count);
+ //$("#HBarcodeQtys").val(count1);
+ ////return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
}
});
}
+ //#endregion
+
});
//浠ヤ笂涓篖ayUi妯″潡
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
index d7f9942..e024ee0 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html"
@@ -315,6 +315,35 @@
$("#HBillerID").hide();
+
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+ , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
+ , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
+ //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
@@ -337,6 +366,7 @@
function RoadBillMain(linterid) {
$.ajax({
url: GetWEBURL() + "/Web/GetPonderationBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
type: "GET",
data: { "HInterID": linterid },
success: function (d) {
@@ -408,7 +438,9 @@
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(linterid);
- RoadBillSub(linterid);
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ //RoadBillSub(linterid);
HSourceFlag = true;
}
@@ -577,6 +609,57 @@
})
});
+ //#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 sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var sMaterID = data[0].HMaterID
+ var sAuxPropID = data[0].HAuxPropID
+ var sMTONo = ''
+ var sSourceInterID = data[0].HSourceInterID
+ var sSourceEntryID = data[0].HSourceEntryID
+ var HBillType = '1210';
+ var sHStockOrgID = sessionStorage["OrganizationID"]
+ layer.load(3)
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
+ layer.close(index)
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
+ });
+
+ //#endregion
+
//鍏抽棴鎸夐挳
form.on('submit(Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -702,34 +785,37 @@
//娓呯┖鏁伴噺
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
- layer.load(3);
- element.tabChange('tab-Kf_EntrustInBill', '2');
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ DisBillEntryList();
+
+ ////鏄剧ず琛ㄤ綋鏄庣粏
+ //layer.load(3);
+ //element.tabChange('tab-Kf_EntrustInBill', '2');
+ //table.render({
+ // elem: '#wl-table'
+ // //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+ // , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
}
else {
playSound();
@@ -859,34 +945,37 @@
}
}
//鏄剧ず琛ㄤ綋鏄庣粏
- layer.load(3);
- element.tabChange('tab-Kf_EntrustInBill', '2');
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ DisBillEntryList();
+
+ ////鏄剧ず琛ㄤ綋鏄庣粏
+ //layer.load(3);
+ //element.tabChange('tab-Kf_EntrustInBill', '2');
+ //table.render({
+ // elem: '#wl-table'
+ // //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+ // , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true}
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
//娓呯┖鏁伴噺
$("#HQty").val("");
}
@@ -1062,33 +1151,37 @@
HSourceFlag = true;
layer.load(3);
element.tabChange('tab-Kf_EntrustInBill', '2');
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , totalRow: true
- , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+
+ //table.render({
+ // elem: '#wl-table'
+ // //, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+ // , url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , totalRow: true
+ // , where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ // , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ // ]]
+ // // , data: [linterid]
+ // // , page: true
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
}
else {
// $("#verifycode").click();
@@ -1101,6 +1194,45 @@
});
}
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+ function DisBillEntryList() {
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HBillType = '1210'
+ var sHStockOrgID = sessionStorage["OrganizationID"];
+
+ //鍒锋柊鍒楄〃淇℃伅
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": sHStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.Materlist;
+ table.render(listOption);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.Materlist.length; i++) {
+ count += result.data.Materlist[i].HQty;
+ count1 += result.data.Materlist[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarcodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ }
+ });
+ }
+
+ //#endregion
+
});
//浠ヤ笂涓簂ayui妯″潡
function GetHWHValue(obj) //杩斿洖璋冨叆浠撳簱
--
Gitblit v1.9.1