From 29432fad316ff3618161825665436764347e6217 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 30 十二月 2025 10:20:58 +0800
Subject: [PATCH] 全部扫码校验模块优化，扫描物料条码方法增加递入参数，出库模块增加先进先出功能
---
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_Check_PDA.html | 4
WebTM/views/WMS扫码模块/委外补料/Kf_EntrustReplenishOutBill_Check_PDA.html | 139 ++++++
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_Check_PDA.html | 131 ++++++
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Check_PDA.html | 139 ++++++
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_Check_PDA.html | 4
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBill_Check_PDA.html | 139 ++++++
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs | 2
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Check_PDA.html | 469 +++++++++++++++++++++--
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_Check_PDA.html | 139 ++++++
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_Check_PDA.html | 4
10 files changed, 1,052 insertions(+), 118 deletions(-)
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
index 99b05fd..b54fb47 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Check_PDA.html"
@@ -888,6 +888,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1068,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1115,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html"
index feda1fc..4e01ca4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<!--<div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
- </button>
- </div>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>-->
<div class="layui-col-xs2" style="float: right;">
<button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
</div>
</div>
</div>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_OtherOutBill_Check_PDA";
var ModRightName = "CE_OtherOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_OtherOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html"
index 563c980..722d345 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\350\241\245\346\226\231/Kf_EntrustReplenishOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<!--<div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
- </button>
- </div>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>-->
<div class="layui-col-xs2" style="float: right;">
<button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
</div>
</div>
</div>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_EntrustReplenishOutBill_Check_PDA";
var ModRightName = "CE_EntrustReplenishOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html"
index 5357fab..e2e725a 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\247\224\345\244\226\351\242\206\346\226\231/Kf_EntrustOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<!--<div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
- </button>
- </div>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>-->
<div class="layui-col-xs2" style="float: right;">
<button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
</div>
</div>
</div>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_EntrustOutBill_Check_PDA";
var ModRightName = "CE_EntrustOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_EntrustOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html"
index e8ed329..7bd02b4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\345\205\245\345\272\223/Kf_ProductInBill_Check_PDA.html"
@@ -888,6 +888,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_ProductInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1068,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1115,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_ProductInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html"
index 6e26c99..58f9fc6 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\241\245\346\226\231/Kf_MateReplenishOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -147,6 +148,15 @@
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
</div>
</div>
</div>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_MateReplenishOutBill_Check_PDA";
var ModRightName = "CE_MateReplenishOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MateReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MateReplenishOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html"
index 800a3e7..3d7d37b 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html"
@@ -57,6 +57,32 @@
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
</div>
<div class="layui-col-xs6">
+ <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+ <div class="layui-col-xs6">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:56px;padding-left:0px;">璋冨叆浠撳簱</label>
+ </div>
+ <div class="layui-col-xs5">
<input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
</div>
@@ -65,10 +91,10 @@
</div>
</div>
<div class="layui-col-xs6">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:56px;padding-left:0px;">璋冨叆浠撲綅</label>
</div>
- <div class="layui-col-xs6">
+ <div class="layui-col-xs5">
<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
@@ -81,7 +107,8 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +123,10 @@
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<!--<div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
- </button>
- </div>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>-->
<div class="layui-col-xs2" style="float: right;">
<button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -156,6 +183,15 @@
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
</div>
</div>
</div>
@@ -322,10 +358,13 @@
var HBillNo = $('#HBillNo').val()
var HBillType = '1207'
var HMaker = sessionStorage["HUserName"]
- var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
+ var HStockInOrgID = sessionStorage["OrganizationID"] //璋冨叆缁勭粐ID
+ var HStockOutOrgID = sessionStorage["OrganizationID"] //璋冨嚭缁勭粐ID
+ var HStockOrgID = sessionStorage["OrganizationID"] //鐧诲叆缁勭粐ID
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_MoveStockBill_Check_PDA";
var ModRightName = "CE_MoveStockCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -432,6 +471,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -452,6 +493,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -505,8 +570,179 @@
//#region 鍩虹璧勬枡閫夋嫨
- //#region 浠撳簱
- //鎵弿浠撳簱鏉＄爜
+ //#region 璋冨嚭浠撳簱
+ //鎵弿璋冨嚭浠撳簱鏉＄爜
+ $('#HSCWHName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HSCWHName = $('#HSCWHName').val()
+ if (HSCWHName == '') {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg("璋冨嚭浠撳簱鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HSCWHName, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HSCWHID").val(result.data[0].HItemID);
+ $("#HSCWHName").val(result.data[0].HName);
+ $("#HOutStockPlaceID").val(result.data[0].HSPID);
+ $("#HOutStockPlaceName").val(result.data[0].HSPName);
+ if (result.data[0].HSPFlag == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSCWHName").select();
+ $("#HSCWHName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨嚭浠撳簱鎸夐挳
+ form.on('submit(HSCWHID-BT)', function () {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HSCWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨嚭浠撲綅
+ //鎵弿璋冨嚭浠撲綅鏉＄爜
+ $('#HOutStockPlaceName').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ //璋冨嚭浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ var sHSCWHID = $("#HSCWHID").val()
+ var HOutStockPlaceName = $('#HOutStockPlaceName').val()
+ if (HOutStockPlaceName == '') {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ layer.msg("璋冨嚭浠撲綅鏉＄爜涓虹┖锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HOutStockPlaceName").select();
+ $("#HOutStockPlaceName").focus();
+ });
+ return;
+ }
+
+ layer.load(3);
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": HOutStockPlaceName, "HWhID": sHSCWHID, "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $("#HOutStockPlaceName").val(result.data[0].HName);
+ $("#HOutStockPlaceID").val(result.data[0].HItemID);
+ $("#HSCWHName").val(result.data[0].HWhName);
+ $("#HSCWHID").val(result.data[0].HWHID);
+ //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ }
+ else {
+ playSound();
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ layer.msg(result.Message, {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HOutStockPlaceName").select();
+ $("#HOutStockPlaceName").focus();
+ });
+ }
+ layer.closeAll("loading");
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+ });
+
+ //璋冨嚭浠撲綅鎸夐挳
+ form.on('submit(HSCSpID-BT)', function () {
+ //璋冨嚭浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撲綅鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HSCWHID").val() + '&Type=HOSpID&HOrgID=' + HStockOutOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ });
+
+ //#endregion
+
+ //#region 璋冨叆浠撳簱
+ //鎵弿璋冨叆浠撳簱鏉＄爜
$('#HWHName').on('keydown', function (event) {
if (event.keyCode == 13) {
var HWHName = $('#HWHName').val()
@@ -518,7 +754,7 @@
$("#HStockPlaceName").val("");
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
- layer.msg("浠撳簱鏉＄爜涓虹┖锛�", {
+ layer.msg("璋冨叆浠撳簱鏉＄爜涓虹┖锛�", {
icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HWHName").select();
@@ -532,7 +768,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+ data: { "HBarCode": HWHName, "HStockOrgID": HStockInOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HWHID").val(result.data[0].HItemID);
@@ -547,6 +783,7 @@
$("#HStockPlaceName").removeAttr("disabled");
$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
+ element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -573,7 +810,7 @@
}
});
- //浠撳簱鎸夐挳
+ //璋冨叆浠撳簱鎸夐挳
form.on('submit(HWHID-BT)', function () {
layer.open({
type: 2
@@ -582,7 +819,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -592,11 +829,11 @@
//#endregion
- //#region 浠撲綅
- //鎵弿浠撲綅鏉＄爜
+ //#region 璋冨叆浠撲綅
+ //鎵弿璋冨叆浠撲綅鏉＄爜
$('#HStockPlaceName').on('keydown', function (event) {
if (event.keyCode == 13) {
- //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
}
@@ -608,7 +845,7 @@
$("#HWHName").val("");
$("#HStockPlaceID").val("0");
$("#HStockPlaceName").val("");
- layer.msg("浠撲綅鏉＄爜涓虹┖锛�", {
+ layer.msg("璋冨叆浠撲綅鏉＄爜涓虹┖锛�", {
icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
}, function () {
$("#HStockPlaceName").select();
@@ -622,13 +859,14 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+ data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockInOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HStockPlaceName").val(result.data[0].HName);
$("#HStockPlaceID").val(result.data[0].HItemID);
$("#HWHName").val(result.data[0].HWhName);
$("#HWHID").val(result.data[0].HWHID);
+ element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
//鍏夋爣鏄剧ず鍒版潯鐮佷笂
$("#HBarCode").select();
$("#HBarCode").focus();
@@ -653,9 +891,9 @@
}
});
- //浠撲綅鎸夐挳
+ //璋冨叆浠撲綅鎸夐挳
form.on('submit(HSpID-BT)', function () {
- //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+ //璋冨叆浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
}
@@ -666,7 +904,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockInOrgID + '', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -809,14 +1047,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -907,6 +1164,28 @@
$('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
HInterID = $('#HInterID').val()
+ //璋冨叆缁勭粐涓嶅悓鏃讹紝娓呯┖璋冨叆浠撳簱浠撲綅
+ if (HStockInOrgID != $('#HStockInOrgID').val())
+ {
+ HStockInOrgID = $('#HStockInOrgID').val()
+ $("#HWHID").val("0");
+ $("#HWHName").val("");
+ $("#HStockPlaceID").val("0");
+ $("#HStockPlaceName").val("");
+ $("#HStockPlaceName").removeAttr("disabled");
+ $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ //璋冨嚭缁勭粐涓嶅悓鏃讹紝娓呯┖璋冨嚭浠撳簱浠撲綅
+ if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
+ HStockOutOrgID = $('#HStockOutOrgID').val()
+ $("#HSCWHID").val("0");
+ $("#HSCWHName").val("");
+ $("#HOutStockPlaceID").val("0");
+ $("#HOutStockPlaceName").val("");
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+
//鏉＄爜鏍稿鏍囪
if (result.data.hSourceBarCodeFlagField) {
$("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
@@ -927,6 +1206,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1004,6 +1284,12 @@
//鎵潯鐮�
function GetMeesageByBarCode(obj) {
//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HSCWHName").val() == '') {
+ $("#HSCWHID").val("0");
+ }
+ if ($("#HOutStockPlaceName").val() == '') {
+ $("#HOutStockPlaceID").val("0");
+ }
if ($("#HWHName").val() == '') {
$("#HWHID").val("0");
}
@@ -1013,6 +1299,8 @@
var sOldBarCode = $('#HBarCode').val()
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
+ var sHSCWHID = $("#HSCWHID").val()
+ var sHSCSPID = $("#HOutStockPlaceID").val()
var sHWHID = $("#HWHID").val()
var sHSPID = $("#HStockPlaceID").val()
var sHQty = $("#HQty").val()
@@ -1106,39 +1394,45 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHSCWHID, "HSPID": sHSCSPID, "HSCWHID": sHWHID, "HSCSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
if (result.data.hBarTypeField == '浠撳簱鏉＄爜') {
- $("#HWHName").val(result.data.hWhNameField);
- $("#HWHID").val(result.data.hWhIDField);
- $("#HStockPlaceName").val(result.data.hSPNameField);
- $("#HStockPlaceID").val(result.data.hSPIDField);
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
+ $("#HOutStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceID").val(result.data.hSPIDField);
if (result.data.hSPFlagField == 0) {
- $("#HStockPlaceName").attr("disabled", "disabled");
- $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
}
else {
- $("#HStockPlaceName").removeAttr("disabled");
- $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
}
return;//缁撴潫
}
else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
- $("#HStockPlaceName").val(result.data.hSPNameField);
- $("#HStockPlaceID").val(result.data.hSPIDField);
- $("#HWHName").val(result.data.hWhNameField);
- $("#HWHID").val(result.data.hWhIDField);
+ $("#HOutStockPlaceName").val(result.data.hSPNameField);
+ $("#HOutStockPlaceID").val(result.data.hSPIDField);
+ $("#HSCWHName").val(result.data.hWhNameField);
+ $("#HSCWHID").val(result.data.hWhIDField);
return;//缁撴潫
}
else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
$('#HInterID').val(result.data.hInterIDField)
$('#HBillNo').val(result.data.hBillNoField)
+ $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField)
+ $("#HStockOutOrgName").val(result.data.hStockOutOrgNameField)
+ $("#HStockInOrgID").val(result.data.hStockInOrgIDField)
+ $("#HStockInOrgName").val(result.data.hStockInOrgNameField)
$("#HBillNo").attr("disabled", "disabled");
$('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
$('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
HInterID = $('#HInterID').val()
+ HStockInOrgID = $('#HStockInOrgID').val()
+ HStockOutOrgID = $('#HStockOutOrgID').val()
//鏉＄爜鏍稿鏍囪
if (result.data.hSourceBarCodeFlagField) {
$("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
@@ -1153,6 +1447,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1193,6 +1488,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHSCWHID, "HSPID": sHSCSPID, "HSCWHID": sHWHID, "HSCSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1280,6 +1621,13 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
@@ -1356,9 +1704,34 @@
//浠ヤ笂涓簂ayui妯″潡
//姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
- //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撳簱淇℃伅
- function GetHWHValue(obj)
- {
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撳簱淇℃伅
+ function GetHSCWHNAMEValue(obj) {
+ if (obj.length > 0) {
+ $("#HSCWHName").val(obj[0].HName);
+ $("#HSCWHID").val(obj[0].HItemID);
+ $("#HOutStockPlaceName").val(obj[0].HSPName);
+ $("#HOutStockPlaceID").val(obj[0].HSPID);
+ if (obj[0].HSPFlag == 0) {
+ $("#HOutStockPlaceName").attr("disabled", "disabled");
+ $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ }
+ else {
+ $("#HOutStockPlaceName").removeAttr("disabled");
+ $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+ }
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨嚭浠撲綅淇℃伅
+ function GetHOutStockPlaceIDValue(obj) {
+ if (obj.length > 0) {
+ $("#HOutStockPlaceName").val(obj[0].HName);
+ $("#HOutStockPlaceID").val(obj[0].HItemID);
+ $("#HSCWHName").val(obj[0].HWhName);
+ $("#HSCWHID").val(obj[0].HWHID);
+ }
+ }
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨叆浠撳簱淇℃伅
+ function GetHWHValue(obj) {
if (obj.length > 0) {
$("#HWHName").val(obj[0].HName);
$("#HWHID").val(obj[0].HItemID);
@@ -1374,7 +1747,7 @@
}
}
}
- //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖浠撲綅淇℃伅
+ //鐐瑰嚮鎸夐挳閫夋嫨鍚� 杩斿洖璋冨叆浠撲綅淇℃伅
function GetHSpValue(obj) {
if (obj.length > 0) {
$("#HStockPlaceName").val(obj[0].HName);
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html"
index 7906e9e..6abe91c 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\207\207\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Check_PDA.html"
@@ -888,6 +888,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_POStockInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1068,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1115,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_POStockInBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html"
index c4cf852..7271b31 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Check_PDA.html"
@@ -81,7 +81,8 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
<li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
- <li lay-id="3" style="padding:1px;">鏉＄爜淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">涓嬫灦淇℃伅</li>
+ <li lay-id="4" style="padding:1px;">鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--琛ㄥご淇℃伅-->
@@ -96,10 +97,10 @@
<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
<!--<div class="layui-col-xs2">
- <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
- </button>
- </div>-->
+ <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+ </button>
+ </div>-->
<div class="layui-col-xs2" style="float: right;">
<button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
</div>
@@ -147,6 +148,15 @@
<div class="layui-col-xs12">
<div class="layui-form-item" style="padding:0px;margin:0px"></div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+ </div>
+ </div>
+ </div>
+ <!--涓嬫灦淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-row">
+ <div class="layui-col-xs12">
+ <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+ <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
</div>
</div>
</div>
@@ -296,6 +306,7 @@
var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
var OperationType = 1 //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
var listOption = [];
+ var FIFOListOption = [];
var columns = "";
var HModName = "Kf_SellOutBill_Check_PDA";
var ModRightName = "CE_SellOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -397,6 +408,8 @@
]];
listOption.data = data;
table.render(listOption);
+ FIFOListOption.data = data;
+ table.render(FIFOListOption);
//鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
layer.closeAll("loading");
}
};
+
+ //涓嬫灦淇℃伅
+ FIFOListOption = {
+ elem: '#FIFOList-table'
+ //, toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: '涓嬫灦鏁伴噺', title: '涓嬫灦鏁伴噺', width: 90 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 150 }
+ , { field: '浠撲綅', title: '浠撲綅', width: 150 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: '鎺у埗鍊�', title: '鎺у埗鍊�', width: 150 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
}
//#region 鐐瑰嚮琛岄�変腑楂樹寒
@@ -774,14 +811,33 @@
form.on('submit(cmdCancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- if (OperationType == 2) {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
- }
- else {
- parent.location.href = "../../../views/index_Mobile.html";
- }
+ //鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬侊紙鏇存柊 HlineStatus =1锛�
+ $.ajax({
+ type: "Get",
+ url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ if (OperationType == 2) {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.location.reload(); //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ }
+ else {
+ parent.location.href = "../../../views/index_Mobile.html";
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
});
})
@@ -888,6 +944,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_SellOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1067,7 +1124,7 @@
type: "GET",
url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
playSound_OK();
@@ -1114,6 +1171,7 @@
layer.confirm(result.data.hRemarkField, {
icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
btn2: function () {
+ location.replace('Kf_SellOutBill_Check_PDA.html?OperationType=1&HInterID=0');
}//鍏抽棴
}
, function () {
@@ -1154,6 +1212,52 @@
$("#HQty").val("");
//鏄剧ず琛ㄤ綋鏄庣粏
DisBillEntryList();
+ }
+ //鍚敤鍏堣繘鍏堝嚭浠呮彁绀烘帶鍒讹紝鏉＄爜涓嶅湪鍏堣繘鍏堝嚭鍒楄〃涓椂鎻愮ず
+ else if (result.count == 2) {
+ playSound();
+ element.tabChange('tab-Kf_MateReplenishOutBill_Check_PDA', '2');
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鍏佽', '涓嶅厑璁�'],
+ btn2: function () {
+ }//鍏抽棴
+ }
+ , function () {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ //娓呯┖鏁伴噺
+ $("#HQty").val("");
+ layer.closeAll();
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ DisBillEntryList();
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ },
+ complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+ error: function (err) {
+ playSound();
+ layer.msg("閿欒锛�" + err, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HBarCode").select();
+ $("#HBarCode").focus();
+ });
+ }
+ });
+ });//娓呯┖
}
else {
playSound();
@@ -1241,6 +1345,13 @@
listOption.totalRow = true;
table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
table.render(listOption);
+ if (result.data.FIFOlist.length != 0) {
+ if (result.data.FIFOlist[0].HMaterID != 0) {
+ FIFOListOption.data = result.data.FIFOlist;
+ table.cache['FIFOList-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(FIFOListOption);
+ }
+ }
//鏉＄爜淇℃伅
$("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
index b8aa324..0fbed46 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_xiaoweizutuo.aspx.designer.cs"
@@ -11,7 +11,7 @@
{
- public partial class xmlLBM_EquipFileMainBill
+ public partial class xmlLBM_xiaoweizutuo
{
/// <summary>
--
Gitblit v1.9.1