From 6da8ec145234ae84d541576ef9013402a6744398 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 27 六月 2023 15:15:52 +0800
Subject: [PATCH] PDA销售出库扫码模块优化（增加先进先出扫码功能，单据ID获取方法修改等）
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html | 47 +
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 1197 +++++++++++++++++++++++++++++++-------------------------
2 files changed, 692 insertions(+), 552 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 947183e..1a9cb66 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -49,15 +49,15 @@
</div>
<div class="layui-tab layui-col-xs12" lay-filter="tab-SellOutBill">
<ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">婧愬崟淇℃伅</li>
- <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鐗╂枡娓呭崟</li>
- <li lay-id="4" style="padding:1px;">鏄庣粏娓呭崟</li>
- <li lay-id="5" style="padding:1px;">婧愬崟鎵捐揣</li>
- <li lay-id="6" style="padding:1px;">鏃ュ織</li>
+ <li lay-id="1" style="padding:1px;" class="layui-this">閫夋嫨婧愬崟</li>
+ <li lay-id="2" style="padding:1px;">琛ㄥご淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">鏄庣粏淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <!--<li lay-id="5" style="padding:1px;">婧愬崟鎵捐揣</li>-->
+ <li lay-id="5" style="padding:1px;">鏃ュ織</li>
</ul>
<div class="layui-tab-content">
- <!--婧愬崟淇℃伅-->
+ <!--閫夋嫨婧愬崟-->
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
<div class="layui-row">
@@ -103,14 +103,14 @@
<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;">FIFOWH</label><!--鍏堣繘鍏堝嚭浠撳簱-->
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label><!--鍏堣繘鍏堝嚭浠撳簱-->
</div>
<div class="layui-col-xs8">
- <input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
- <input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
+ <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs2">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT" disabled:"disabled">...</button>
</div>
</div>
</div>
@@ -125,7 +125,7 @@
</div>
</div>
</div>
- <!--鍗曟嵁淇℃伅-->
+ <!--琛ㄥご淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
@@ -238,30 +238,22 @@
</div>
</div>
- <!--鐗╂枡娓呭崟-->
+ <!--鏄庣粏淇℃伅-->
<div class="layui-tab-item">
- <div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
-
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="FIFOlist-table" lay-filter="FIFOlist-table"></table>
+ </div>
<!--鏄庣粏娓呭崟-->
-
- <div class="layui-tab-item">
+ <!--<div class="layui-tab-item">
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
- </div>
+ </div>-->
<!--婧愬崟鎵捐揣-->
- <div class="layui-tab-item">
+ <!--<div class="layui-tab-item">
<table class="layui-hide" id="zh-table" lay-filter="zh-table"></table>
- </div>
+ </div>-->
<!--鏃ュ織-->
<div class="layui-tab-item">
<div class="layui-row">
@@ -269,7 +261,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鏉＄爜鏁伴噺</label>
</div>
<div class="layui-col-xs8 layui-input-inline mobile">
- <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarcodeQtys" id="HBarcodeQtys" lay-verify="HBarcodeQtys" value="0" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-row">
@@ -344,7 +336,13 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+ var HInterID = $('#HInterID').val()
+ var HBillNo = $('#HBillNo').val()
+ var HBillType = '1205'
+ var HMaker = sessionStorage["HUserName"]
var HStockOrgID = sessionStorage["OrganizationID"]
+ var HSourceFlag = sessionStorage["SourceFlag"];
+ var OperationType = 0;//鎿嶄綔绫诲瀷
var option = [];
//鍏夋爣榛樿鍦ㄦ簮鍗曞彿浣嶇疆涓�
$("#HSourceBillNo").focus();
@@ -369,10 +367,85 @@
none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔簮鍗曞彿锛�'
}
};
+
+ //鏄庣粏淇℃伅
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+
+ //涓嬫灦淇℃伅
+ var FIFOlistOption = {
+ elem: '#FIFOlist-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HWhName', title: '浠撳簱', width: 150 }
+ , { field: 'HSPName', title: '浠撲綅', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+
+ var listOption1 = {
+ elem: '#mx-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+
+
//鍒濆鍔犺浇琛ㄦ牸
ZHOption.data = [];
table.render(ZHOption);
-
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
//$("#HWHID").val(sessionStorage["HWHID"]);
@@ -393,7 +466,6 @@
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
$("#HDate").val(formatDate(sessionStorage["HDate"]));
- var HSourceFlag = sessionStorage["SourceFlag"];
// 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
function formatDate(date) {
@@ -453,7 +525,6 @@
}, function () { window.location.href = "../../user/login.html"; });
}
-
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -465,9 +536,12 @@
}
return vars;
}
+ //var params = getUrlVars();
+ //var HInterID_Temp = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
var params = getUrlVars();
- var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ var OperationType = params[params[0]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷 1鏂板 2浠庣紦瀛樺垪琛ㄤ腑杩斿洖
+ var HInterID_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
//鍒濆鍖栬〃鍗曟彃浠�
@@ -481,12 +555,52 @@
});
}
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ //鍒ゆ柇鏄惁鏂板
+ if (HInterID != 0) {
+ HSourceFlag = true;
+ }
+ //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+ else if (OperationType == 2) {
+ RoadBillMain(HInterID_Temp);
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+ //$('#QueDin2').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ //document.getElementById("QueDin2").disabled = true; //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ HSourceFlag = true;
+ }
+ else {
+ OperationType = 1;
+ //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ if (d.count == 1) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
+ HInterID = $('#HInterID').val()
+ HBillNo = $('#HBillNo').val()
+ }
+ else {
+ layer.msg(d.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }
+ });
+ HSourceFlag = false;
+ }
+
+ function RoadBillMain(HInterID_Temp)//鍔犺浇琛ㄥご
{
$.ajax({
- url: GetWEBURL() + "/Web/GetPonderationBill",
type: "GET",
- data: { "HInterID": linterid },
+ url: GetWEBURL() + "/Web/GetPonderationBill",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID_Temp },
success: function (d) {
// console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
@@ -544,8 +658,9 @@
}
else {
$.ajax({
- url: GetWEBURL() + "/SellOut/get_GetXs_SeOutStockBillList",
type: "GET",
+ url: GetWEBURL() + "/SellOut/get_GetXs_SeOutStockBillList",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -566,103 +681,104 @@
}
}
- function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
- {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- var sInterID = $("#HInterID").val();
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
- //, toolbar: '#toolbarDemo'
- , page: true
- , limit: 100
- , defaultToolbar: []
- , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150 }
- , { field: 'HAuxQty', 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 }
- ]]
- // , data: [linterid]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- });
+ //function RoadBillSub(HInterID_Temp)//鍔犺浇琛ㄤ綋
+ //{
+ // var sInterID = $("#HInterID").val()
+ // var sBillNo = $("#HBillNo").val()
+ // var HBillType = '1205'
+ // var sHStockOrgID = sessionStorage["OrganizationID"];
- //$.ajax({
- // url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
- // type: "GET",
- // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- // success: function (result) {
- // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // listOption.data = result.data.list;
- // table.render(listOption);
- // listOption1.data = result.data.list2;
- // table.render(listOption1);
+ // //$("#HInterID").val(HInterID_Temp);//淇敼鏃朵富琛↖D
+ // ////缂栬緫鍔犺浇鏁版嵁
+ // //var sInterID = $("#HInterID").val();
+ // //table.render({
+ // // elem: '#wl-table'
+ // // //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
+ // // , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
+ // // //, toolbar: '#toolbarDemo'
+ // // , page: true
+ // // , limit: 100
+ // // , defaultToolbar: []
+ // // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // // , cols: [[
+ // // { type: 'radio' }
+ // // , { field: 'HQty', title: '鏁伴噺', width: 150 }
+ // // , { field: 'HAuxQty', 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 }
+ // // ]]
+ // // // , data: [HInterID_Temp]
+ // // , height: 500
+ // // , done: function () {
+ // // layer.closeAll("loading");
+ // // }
+ // //});
- // //console.log(result.data.list2);
- // 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);
- // //return;
- // }
- // else {
- // layer.msg(result.Message);
- // }
- // layer.closeAll("loading");
- // }
- //});
- }
+ // //$.ajax({
+ // // url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ // // type: "GET",
+ // // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ // // success: function (result) {
+ // // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // // listOption.data = result.data.list;
+ // // table.render(listOption);
+ // // listOption1.data = result.data.list2;
+ // // table.render(listOption1);
+
+ // // //console.log(result.data.list2);
+ // // 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);
+ // // //return;
+ // // }
+ // // else {
+ // // layer.msg(result.Message);
+ // // }
+ // // layer.closeAll("loading");
+ // // }
+ // //});
+ //}
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-
-
-
-
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("");
- $("#HBillNo").val("");
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
- async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBillType": '1205' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
- //$("#HInterID").val('132522535');
- //$("#HBillNo").val('421458026');
- set_InitGrid();
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new-----涓嶄細璧�
- RoadBillMain(linterid);
- RoadBillSub(linterid);
- }
+ ////鍒ゆ柇鏄惁鏂板
+ //if (HInterID_Temp == null || HInterID_Temp == 0) {
+ // //鑾峰彇鏈�澶у崟鎹彿 new
+ // $("#HInterID").val("");
+ // $("#HBillNo").val("");
+ // $.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ // async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ // data: { "HBillType": '1205' },
+ // success: function (d) {
+ // //console.log(d.data);
+ // $("#HInterID").val(d.data[0].HInterID);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
+ // //$("#HInterID").val('132522535');
+ // //$("#HBillNo").val('421458026');
+ // set_InitGrid();
+ // }
+ // });
+ //}
+ //else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new-----涓嶄細璧�
+ // RoadBillMain(HInterID_Temp);
+ // //鏄剧ず琛ㄤ綋鏄庣粏
+ // DisBillEntryList();
+ // //RoadBillSub(HInterID_Temp);
+ //}
form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
@@ -694,7 +810,7 @@
// }
// })
//});
- form.on('submit(HWHID_FIFO-BT)', function () {//閫夋嫨鍏堣繘鍏堝嚭浠撳簱
+ form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨鍏堣繘鍏堝嚭浠撳簱
layer.open({
type: 2
, area: ['100%', '100%']
@@ -833,11 +949,37 @@
})
});
+ //閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
+ var sInterID = $("#HInterID").val()
+ var HBillType = '1205'
+ $.ajax(
+ {
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+ async: true,
+ data: { "HInterID": sInterID, "HBillType": HBillType },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ }
+ else {
+ layer.msg(data.Message, { icon: 2 });
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ });
+ }
+ });
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile.html";
});
})
+
//缂栬緫
//form.on('submit(cmdModify)', function () {//缂栬緫
@@ -877,10 +1019,9 @@
//})
form.on('submit(cmdModify)', function () {//缂栬緫
- //var sSubStr = table.cache['wl-table'];
var checkStatus = table.checkStatus('wl-table')
, data = checkStatus.data;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ if (checkStatus.data.length === 1) {
layer.open({
type: 2
, area: ['100%', '100%']
@@ -894,100 +1035,62 @@
//$(".layui-btn").removeClass("layui-btn-disabled");
}
, end: function () {
- //鍒锋柊椤甸潰,
- //location.reload();
- var sInterID = $("#HInterID").val()
- table.render({
- elem: '#wl-table'
- //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
- , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- //, toolbar: '#toolbarDemo'
- , page: true
- , limit: 100
- , defaultToolbar: []
- , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
- ]]
- // , data: [linterid]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- })
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
}
})
+ }
+ else {
+ layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+ }
// }
});
- //鍒犻櫎
+ //鍒犻櫎鍔熻兘鎺т欢
form.on('submit(cmdDelete)', function () {//鍒犻櫎
- //var checkStatus = table.checkStatus('wl-table')
- //, data = checkStatus.data;
- //// console.log(data);
- //var sInterID = $('#HInterID').val()
- //var sMaterID = data[0].HMaterID
- //var sBillType = '1205'
- //var sAuxPropID = data[0].HAuxPropID
- ////var sMTONo = data[0].HMTONo
- //var sMTONo = ''
- //var sSourceInterID = data[0].HSourceInterID
- //var sSourceEntryID = data[0].HSourceEntryID
- //$.ajax(
- // {
- // type: "Get",
- // //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // url: GetWEBURL() + "/SellOut/Delete_Json",
- // async: true,
- // data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- // table.render({
- // elem: '#wl-table'
- // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- // , cellMinWidth: 80
- // , toolbar: '#toolbarDemo'
- // , defaultToolbar: []
- // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- // , cols: [[
- // { type: 'radio' }
- // , { field: 'HQty', title: '鏁伴噺', width: 80 }
- // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
- // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
- // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
- // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
- // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- // , { field: 'HBatchNo', title: '鎵规', width: 100 }
- // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
- // , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
- // , { field: 'HWHID', title: 'ck', width: 100 }
- // ]]
- // //, height: 500
- // })
- // }
- // else {
- // layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // },
- // error: function (err) {
- // layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // }
- // });
+ 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 = '1205';
+ var sHStockOrgID = sessionStorage["OrganizationID"]
+ $.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('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+ }
});
@@ -1027,7 +1130,7 @@
type: "POST",
// url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "oMain": sMainStr },
dataType: "json",
success: function (data) {
@@ -1041,7 +1144,8 @@
}//鍏抽棴
}, function () {
//sessionStorage["SourceFlag"] = false;
- window.location.reload();
+ //window.location.reload();
+ location.replace('Kf_SellOutBill_Fast.html?OperationType=1&HInterID=0');
});//鏂板
}
else {
@@ -1067,16 +1171,6 @@
}
});
- //鎵潯鐮�-鐩存帴璋僿ebservice
- $('#HBarCode').on('keydown', function (event) {
- if (event.keyCode == 13) {
- GetMeesageByBarCode();
- }
- });
- //纭畾
- form.on('submit(QueDin)', function (data) {
- GetMeesageByBarCode();
- });
$('#HStockPlaceName').on('keydown', function (event) { //鎵粨浣�
@@ -1084,8 +1178,9 @@
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
$.ajax({
- url: GetWEBURL() + "/LookingFor/getSpName_Json",
type: "GET",
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -1114,8 +1209,9 @@
}
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
$.ajax({
- url: GetWEBURL() + "/LookingFor/getWHName_Json",
type: "GET",
+ url: GetWEBURL() + "/LookingFor/getWHName_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -1197,7 +1293,7 @@
// , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
// , { field: 'HBatchNo', title: '鎵规', width: 150 }
// ]]
- // // , data: [linterid]
+ // // , data: [HInterID_Temp]
// // , page: true
// , height: 500
// , done: function () {
@@ -1214,23 +1310,13 @@
// }
//});
- //鎵簮鍗�
- $('#HSourceBillNo').on('keydown', function (event) {
- if (event.keyCode == 13) {
- GetMeesageBySourceBillNo();
- }
- });
- //纭畾
- form.on('submit(QueDin2)', function (data) {
- GetMeesageBySourceBillNo();
- });
//鍒锋柊鏄庣粏椤电
table.render({
elem: '#mx-table'
// , url: 'http://localhost:8083/Web/SellOut/GetHBarCodeShowBillSub'
//, toolbar: '#toolbarDemo'
- // , where: { sMsg: linterid, sMsg2: lentryid }
+ // , where: { sMsg: HInterID_Temp, sMsg2: lentryid }
, cols: [[
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
]]
@@ -1274,8 +1360,9 @@
function GetSellOutFindSP() {
var HSourceBillNo = $('#HSourceBillNo').val();
$.ajax({
- url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
type: "GET",
+ url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HbillNo": HSourceBillNo },
success: function (result) {
if (result.count == 1) {
@@ -1292,6 +1379,190 @@
});
}
+
+
+
+
+
+
+
+
+ //#region 鎵弿婧愬崟鏉＄爜
+
+ //鎵簮鍗�
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+
+ //纭畾
+ form.on('submit(QueDin2)', function (data) {
+ GetMeesageBySourceBillNo();
+ });
+
+ //鎵弿婧愬崟鏉＄爜
+ function GetMeesageBySourceBillNo(obj) {
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HBillType = '1205'
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ var HSourceBillType = $("#HBillType").val()
+ var HMaker = sessionStorage["HUserName"]
+ var sHStockOrgID = sessionStorage["OrganizationID"];
+ var HFIFOWhID = $("#HFIFOWHID").val()
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_SellOut_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": HFIFOWhID, "HOWNERID": sHStockOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound1();
+ HSourceFlag = true;
+ $("#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");
+ }
+ layer.load(3);
+ element.tabChange('tab-SellOutBill', '2');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撳簱涓�
+ $("#HWHNAME").focus();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ }
+
+
+ //鍘熻皟鐢ㄦ柟娉�
+ ////鎵簮鍗�
+ //function GetMeesageBySourceBillNo(obj) {
+ // var HSourceBillNo = $('#HSourceBillNo').val()
+ // var sInterID = $("#HInterID").val()
+ // var sBillNo = $("#HBillNo").val()
+ // var HSourceBillType = $("#HBillType").val()
+ // var HBillType = '1205'
+ // var HFIFOWHID = $("#HFIFOWHID").val();//鍏堣繘鍏堝嚭浠撳簱ID
+ // var sMouldManagerCtl = 'N'
+ // var sFIFOCtl = 'N'
+ // if (HSourceBillNo == "" || sInterID <= 0) {
+ // layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ // }
+ // $.ajax({
+ // url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
+ // type: "GET",
+ // data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205', "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // //GetSellOutFindSP();
+ // $("#HSupID").val(result.data[0].HSupID);
+ // $("#HSupName").val(result.data[0].HSupName);
+ // //$("#HDeptID").val(result.data[0].HDeptID);
+ // //$("#HDeptName").val(result.data[0].HDeptName);
+ // HSourceFlag = true;
+ // element.tabChange('tab-SellOutBill', '2');
+ // //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ // $("#HWHNAME").focus();
+ // //table.reload('wl-table', {
+ // // where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // //});
+
+ // //table.render({
+ // // elem: '#wl-table'
+ // // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ // // , toolbar: '#toolbarDemo'
+ // // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // // , cols: [[
+ // // { type: 'radio' }
+ // // , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ // // , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ // // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
+ // // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ // // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ // // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ // // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ // // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ // // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ // // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ // // , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ // // ]]
+ // // , height: 500
+ // // , done: function () {
+ // // layer.closeAll("loading");
+ // // }
+ // //});
+
+ // $.ajax({
+ // url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ // type: "GET",
+ // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.list;
+ // table.render(listOption);
+ // listOption1.data = result.data.list2;
+ // table.render(listOption1);
+
+ // //console.log(result.data.list2);
+ // 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);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ // });
+ // $("#HSourceBillNo").attr("disabled", "true");
+ // }
+ // else {
+ // layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // }
+ // });
+ //}
+
+ //#endregion
+
+
+ //#region 鎵弿鐗╂枡鏉＄爜
+
+ //鎵潯鐮�
+ $('#HBarCode').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageByBarCode();
+ }
+ });
+
+ //纭畾
+ form.on('submit(QueDin)', function (data) {
+ GetMeesageByBarCode();
+ });
+
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sOldBarCode = $('#HBarCode').val()
@@ -1301,6 +1572,7 @@
var sBillType = '1205'
var sBillNo = $("#HBillNo").val()//鍗曟嵁鍙�
var sMaker = sessionStorage["HUserName"];
+ var sHStockOrgID = sessionStorage["OrganizationID"];
var sHWHID = $("#HWHID").val();//浠撳簱ID
var sHSPID = $("#HStockPlaceID").val();//浠撲綅ID
var sQty = $("#HQty").val()//鏁伴噺
@@ -1326,9 +1598,9 @@
}
$.ajax(
{
- type: "Get",
+ type: "GET",
url: GetWEBURL() + "/ProductIn/Delete_Json",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
dataType: "json",
success: function (data) {
@@ -1336,39 +1608,42 @@
playSound1();
//娓呯┖鏁伴噺
$("#HQty").val("");
- table.reload('wl-table', {
- where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- });
+ //table.reload('wl-table', {
+ // where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ //});
- //鍒锋柊鍒楄〃淇℃伅
- $.ajax({
- url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- listOption1.data = result.data.list2;
- table.render(listOption1);
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
- //console.log(result.data.list2);
- 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);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
+ ////鍒锋柊鍒楄〃淇℃伅
+ //$.ajax({
+ // url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ // type: "GET",
+ // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.list;
+ // table.render(listOption);
+ // listOption1.data = result.data.list2;
+ // table.render(listOption1);
+
+ // //console.log(result.data.list2);
+ // 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);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
}
else {
playSound();
@@ -1394,7 +1669,7 @@
{
type: "Get",
url: GetWEBURL() + "/POStockInBillList/SellOutBillSDeleCode",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBarCode": HBarCode, "HInterID": HInterID },
dataType: "json",
success: function (data) {
@@ -1402,33 +1677,37 @@
layer.msg(data.Message, { icon: 1, btn: ['纭'], time: 100000, title: "娓╅Θ鎻愮ず" });
//娓呯┖鏁伴噺
$("#HQty").val("");
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- , cellMinWidth: 80
- //, toolbar: '#toolbarDemo'
- , page: true
- , limit: 100
- , defaultToolbar: []
- , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 100 }
- , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
- , { field: 'HWHID', title: 'ck', width: 100 }
- ]]
- //, height: 500
- })
+
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+
+ //table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ // , cellMinWidth: 80
+ // //, toolbar: '#toolbarDemo'
+ // , page: true
+ // , limit: 100
+ // , defaultToolbar: []
+ // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 100 }
+ // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+ // , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+ // , { field: 'HWHID', title: 'ck', width: 100 }
+ // ]]
+ // //, height: 500
+ //})
}
else {
layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1461,8 +1740,9 @@
//}
//
$.ajax({
- url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle, "HCustom1": "", "HCustom2": "" },
//url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
//type: "GET",
@@ -1541,169 +1821,105 @@
element.tabChange('tab-SellOutBill', '3');
}
else {
- //$("#HSupName").val(result.data.HSupName);
- //$("#HSupID").val(result.data.HSupID);
- //$("#HDeptName").val(result.data.HDeptName);
- //$("#HDeptID").val(result.data.HDeptID);
- //$("#HSourceBillNo").val(result.data.HSourceBillNo);
HSourceFlag = true;
- //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- //if (result.data.HSourceBillType == "1402") {
- // $("#HBillType").val("1402");
-
- //}
- //else if (result.data.HSourceBillType == "1401") {
- // $("#HBillType").val("1401");
- //}
- //else if (result.data.HSourceBillType == "1601") {
- // $("#HBillType").val("1601");
- //}
$("#HNote").val(";鐗╂枡鏉＄爜");
element.tabChange('tab-SellOutBill', '3');
}
}
- //$("#HSupID").val(result.data.HSupID);
- //$("#HSupName").val(result.data.HSupName);
- //$("#HDeptID").val(result.data.HDeptID);
- //$("#HDeptName").val(result.data.HDeptName);
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ //$.ajax({
+ // url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ // type: "GET",
+ // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.list;
+ // table.render(listOption);
+ // listOption1.data = result.data.list2;
+ // table.render(listOption1);
- //table.render({
- // elem: '#wl-table'
- // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
- // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- // , cols: [[
- // { type: 'radio' }
- // , { field: 'HSNO', title: '搴忓彿', width: 60 }
- // , { field: 'HQty', title: '鏁伴噺', width: 80 }
- // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- // , { field: 'HBatchNo', title: '鎵规', width: 90 }
- // ]]
- // , height: 500
- // , done: function () {
+ // //console.log(result.data.list2);
+ // 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);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
// layer.closeAll("loading");
// }
//});
-
- $.ajax({
- url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- listOption1.data = result.data.list2;
- table.render(listOption1);
-
- //console.log(result.data.list2);
- 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);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
-
- //var count = 0;
- //var count1 = 0;
- //for (var i = 0; i < result.data.length; i++) {
- // count += result.data.HQty;
- // count1 += result.data.HPieceQty;
- //}
- //$("#HSumQtys").val(count);
- //$("#HBarCodeQtys").val(count1);
playSound1();
//娓呯┖鏁伴噺
$("#HQty").val("");
}
else {
- // $("#verifycode").click();
- //layer.msg(result.Message, { icon: 5 });
- //
playSound();
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- //11
}
layer.closeAll("loading");
},
error: function (err) {
playSound();
layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- //11
}
});
}
}
+ //#endregion
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
- var listOption = {
- elem: '#wl-table'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 90
- , limit: 3000
- , totalRow: true
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80, totalRow: true }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
- , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+ function DisBillEntryList() {
+ var sInterID = $("#HInterID").val()
+ var sBillNo = $("#HBillNo").val()
+ var HBillType = '1205'
+ 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);
+ FIFOlistOption.data = result.data.FIFOlist;
+ table.render(FIFOlistOption);
+
+ //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);
+ }
+ layer.closeAll("loading");
+ }
+ });
}
- var listOption1 = {
- elem: '#mx-table'
- , toolbar: '#toolbarDemo'
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
- , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
- //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }
+
+ //#endregion
+
function playSound() {
console.log("playSound");
//var audio = document.getElementById("cs");
@@ -1724,100 +1940,7 @@
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()
- var HBillType = '1205'
- var HWHID_FIFO = $("#HWHID_FIFO").val();//鍏堣繘鍏堝嚭浠撳簱ID
- var sMouldManagerCtl = 'N'
- var sFIFOCtl = 'N'
- if (HSourceBillNo == "" || sInterID <= 0) {
- layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- $.ajax({
- url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
- type: "GET",
- data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205', "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //GetSellOutFindSP();
- $("#HSupID").val(result.data[0].HSupID);
- $("#HSupName").val(result.data[0].HSupName);
- //$("#HDeptID").val(result.data[0].HDeptID);
- //$("#HDeptName").val(result.data[0].HDeptName);
- HSourceFlag = true;
- element.tabChange('tab-SellOutBill', '2');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HWHNAME").focus();
- //table.reload('wl-table', {
- // where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- //});
- //table.render({
- // elem: '#wl-table'
- // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- // , toolbar: '#toolbarDemo'
- // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- // , cols: [[
- // { type: 'radio' }
- // , { field: 'HSNO', title: '搴忓彿', width: 60 }
- // , { field: 'HQty', title: '鏁伴噺', width: 80 }
- // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- // , { field: 'HBatchNo', title: '鎵规', width: 90 }
- // ]]
- // , height: 500
- // , done: function () {
- // layer.closeAll("loading");
- // }
- //});
-
- $.ajax({
- url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
- type: "GET",
- data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- listOption.data = result.data.list;
- table.render(listOption);
- listOption1.data = result.data.list2;
- table.render(listOption1);
-
- //console.log(result.data.list2);
- 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);
- //return;
- }
- else {
- layer.msg(result.Message);
- }
- layer.closeAll("loading");
- }
- });
- $("#HSourceBillNo").attr("disabled", "true");
- }
- else {
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- }
- });
- }
});
@@ -1832,8 +1955,8 @@
}
function GetHFIFOWHNAMEValue(obj) //杩斿洖鍏堣繘鍏堝嚭浠撳簱
{
- $("#HWHNAME_FIFO").val(obj[0].HName);
- $("#HWHID_FIFO").val(obj[0].HItemID);
+ $("#HFIFOWHNAME").val(obj[0].HName);
+ $("#HFIFOWHID").val(obj[0].HItemID);
}
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
index 07999d1..1b7abee 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_FastList.html"
@@ -138,24 +138,41 @@
//window.close();//鍏抽棴褰撳墠椤�
})
+ //缂栬緫
form.on('submit(cmdModify)', function () {
var checkStatus = table.checkStatus('dj-table')
- , data = checkStatus.data;
- //ajaxLabelData = data;
- //layer.alert(rows);
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '閿�鍞嚭搴撳崟'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
- , resize: false
- , cancel: function () {
- $(".layui-btn").removeClass("layui-btn-disabled");
+ , data = checkStatus.data;
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": data[0].HInterID, "HBillNo": data[0].HBillNo, "HBillType": sBillType },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '閿�鍞嚭搴撳崟'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, 'yes']
+ //, content: ['../../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+ , resize: false
+ , cancel: function () {
+ $(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- })
+ });
});
form.on('submit(cmdRefresh)', function () {//鍒锋柊
--
Gitblit v1.9.1