From 9bd056f8b625d5cd8f0456b70706da142696d904 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 12 一月 2026 09:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Check_PDA.html | 139 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 125 insertions(+), 14 deletions(-)
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);
--
Gitblit v1.9.1