From 8f37e4d6d63ba23c0aebdccf2284baa79b3424c7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 29 十二月 2025 12:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj.user | 3
WebTM/views/Baseset/HBarPlanPrint.html | 3
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 101 ++++
WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html | 103 ++++
WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html | 103 ++++
WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html | 100 ++++
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.designer.cs | 26 +
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillList.html | 100 ++++
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx | 29 +
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 101 ++++
WebTM/views/领料发货/领料出库/Kf_StockOutRequestBillList.html | 101 ++++
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 103 ++++
WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html | 102 ++++
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 100 ++++
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_Check_PDA.html | 131 +++++
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillListLink.html | 54 -
WebTM/layuiadmin/Scripts/webConfig.js | 44 -
WebTM/views/基础资料/公用基础资料/xmlLBM_xiaoweizutuo.aspx.cs | 17
WebTM/WebTM.csproj | 8
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html | 103 ++++
20 files changed, 1,354 insertions(+), 78 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 536cd79..e79fbbe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,6 +472,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
@@ -2699,6 +2700,13 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_xiaoweizutuo.aspx.designer.cs">
+ <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index fa4693e..1aa955e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
@@ -11,9 +10,7 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-=======
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
->>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index aaa5f62..cc6fe6e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,31 +1,17 @@
锘�
function GetWEBURL() {
- //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
+ //var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- /* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
-<<<<<<< HEAD
- var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
-
- //var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
-// var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
-=======
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- /* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
->>>>>>> 2ed130171719a0848e8356d28055eb1bdf649d01
- //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:81/API/"; //闄堥晲鍝叉湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
+ //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
@@ -40,8 +26,8 @@
//var WEBURL = "http://192.168.1.237:9003/API"; //澶忓疂鍐呯綉
//var WEBURL = "http://60.190.4.42:9003/API"; //澶忓疂澶栫綉
//var WEBURL = "http://192.168.60.12/API"; //涓帶
- //var WEBURL = "http://192.168.6.5:8082/API/"; //鑸滄垚
- /*var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌*/
+ //var WEBURL = "http://192.168.6.5:8082/API/"; //鑸滄垚
+ //var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌
//var WEBURL = "http://36.134.2.30:200/WEBS-API/"; //閲戝竻
//var WEBURL = "http://172.16.1.85/API/"; //杩﹀崡
return WEBURL
@@ -51,9 +37,3 @@
return GetWEBURL()
}
-
-//function GetWEBURL1() {
-// //var WEBURL = 'http://192.168.16.80:8011/'; //鍔炲叕瀹ゆ湇鍔″櫒
-// var WEBURL = 'http://localhost:9011/WebAPI';
-// return WEBURL
-//}
\ No newline at end of file
diff --git a/WebTM/views/Baseset/HBarPlanPrint.html b/WebTM/views/Baseset/HBarPlanPrint.html
index b829d70..33719f5 100644
--- a/WebTM/views/Baseset/HBarPlanPrint.html
+++ b/WebTM/views/Baseset/HBarPlanPrint.html
@@ -70,6 +70,9 @@
case "HDepartMent"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_Gy_Department_Edit.aspx?linterid=" + value, true, "");
break;
+ case "HGy_BarCodeBill_xiaowei"://閮ㄩ棬鍩虹璧勬枡鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../grf/" + OpenTmp + ".grf", "xmlLBM_xiaoweizutuo.aspx?linterid=" + value, true, "");
+ break;
//case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
// CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
// break;
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_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\351\242\206\346\226\231/Kf_MateOutBill_Check_PDA.html"
index 9057020..3ffa531 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\351\242\206\346\226\231/Kf_MateOutBill_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\351\242\206\346\226\231/Kf_MateOutBill_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_MateOutBill_Check_PDA";
var ModRightName = "CE_MateOutCheck"; //妯″潡鏉冮檺鍙傛暟
@@ -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_MateOutBill_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_MateOutBill_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_MateOutBill_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/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index e423f49..f1ac0ce 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -241,6 +241,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-audit" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
@@ -389,6 +390,9 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
@@ -706,6 +710,103 @@
});
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
//鏉＄爜鏄庣粏
function get_BarCodeDetail() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index ac23e03..ceae6c4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -249,6 +249,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
@@ -331,6 +332,9 @@
break;
//缂栬緫
case 'btn-Edit': set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎
case 'btn-Delete': set_DeleteBill();
@@ -662,6 +666,103 @@
});
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_MoveStockRequestBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
//鏂板
function set_AddNew() {
layer.open({
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
index 64f2cfa..d78a453 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillList.html"
@@ -240,6 +240,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -313,6 +314,9 @@
break;
//缂栬緫鎸夐挳
case 'btn-Edit': set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -631,6 +635,102 @@
});
}
+ // 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
//鏂板
function set_AddNew() {
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index 08ab6b6..132fa23 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
@@ -172,6 +172,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_WMSSub" id="btn_WMSSub"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -469,6 +470,9 @@
//缂栬緫鎸夐挳
case 'btn_Edit': btn_Edit();
break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
+ break;
//鍒犻櫎鎸夐挳
case 'btn_Delete': btn_Delete();
break;
@@ -493,6 +497,7 @@
//浣滃簾鎸夐挳 锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
case 'btn_Drop': set_DropBill(1);
break;
+
//鍙嶄綔搴熸寜閽�
case 'btn_DeDrop': set_DropBill(2);
break;
@@ -1083,6 +1088,104 @@
}
//#endregion
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//#region 鑷畾涔夎繃婊や笅鎷夋
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
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" "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"
new file mode 100644
index 0000000..2270bca
--- /dev/null
+++ "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"
@@ -0,0 +1,29 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipFileMainBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
+ SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack 鏍堟澘鐮�,HBarCode 涓鐮�,b.hnumber 鐗╂枡浠ｇ爜,b.hname 鐗╂枡鍚嶇О from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
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.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.cs"
new file mode 100644
index 0000000..b792947
--- /dev/null
+++ "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.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_xiaoweizutuo : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
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"
new file mode 100644
index 0000000..b8aa324
--- /dev/null
+++ "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"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_EquipFileMainBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html"
index ec0776c..ba9c847 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillListLink.html"
@@ -426,40 +426,30 @@
case 'btn-print':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var ModRightName = 'Gy_BarCodeBillList_Print';
- $.ajax({
- url: GetWEBURL() + 'Gy_BarCodeBillList/GetBarCodeBillPermission',
- type: "GET",
- async: false,
- data: { "user": sessionStorage["HUserName"]},
- success: function (res) {
- if (res.data == 1) {
- if (checkStatus.data.length > 0) {
- var rows = '';
- for (var i = 0; i < data.length; i++) {
- rows += data[i].HItemID.toString() + ',';
- }
- rows = rows.substring(rows.length - 1, 0);
- layer.open({
- type: 2
- , area: ['40%', '80%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
- }
+
+ if (checkStatus.data.length > 0) {
+ var rows = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].HItemID.toString() + ',';
}
- else {
- layer.alert(get_MessageError("鏃犳墦鍗版潈闄�!", sessionStorage["HTranSlate"]), { icon: 5 });
- }
+ rows = rows.substring(rows.length - 1, 0);
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
+ , resize: false
+ })
}
- });
+ else {
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
+ }
+
+
+
break;
case 'btn-print-zx':
PrintZX();
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
index 37fe9f7..1a72627 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Kf_ICStockBillMainList.html"
@@ -211,6 +211,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -316,6 +317,9 @@
}
});
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//瀹℃牳
case 'btn-Audit': set_AuditBill();
@@ -758,6 +762,102 @@
}
}
+ // 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
index cf3afc8..35919cf 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBillList.html"
@@ -206,6 +206,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-WmsSub" lay-event="btn-WmsSub"><i class="layui-icon layui-icon-form"></i>鏄庣粏</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Exit" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -355,6 +356,9 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -843,6 +847,104 @@
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//鍏抽棴 [1 鍏抽棴銆�2 鍙嶅叧闂璢
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index c9b879e..7115fde 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -203,6 +203,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-BarCodeDetail" lay-event="btn-BarCodeDetail"><i class="layui-icon layui-icon-form"></i>鏉＄爜鏄庣粏</button>
@@ -279,6 +280,9 @@
break;
//缂栬緫鎸夐挳
case 'btn-Edit': set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -600,6 +604,102 @@
}
+ // 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
//鑾峰彇缁勭粐
function Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
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_SellOutBillList.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_SellOutBillList.html"
index ac03c71..d08aa2e 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_SellOutBillList.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_SellOutBillList.html"
@@ -259,6 +259,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(搴旀敹鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushSellOutChangeBills" id="btn-PushSellOutChangeBills"><i class="layui-icon layui-icon-delete"></i>澶氳涓嬫帹(閿�鍞皟浠峰崟)</button>
@@ -394,6 +395,9 @@
//缂栬緫
case 'btn-Edit':
set_ShowBill();
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//涓嬫帹(鐗规壒鐢宠鍗�)
case 'btn-PushExceptiveCheckRequestBill':
@@ -975,6 +979,105 @@
}
//#endregion
+
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
index 989ecb5..fc19d69 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_StockOutRequestBillList.html"
@@ -222,6 +222,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -298,6 +299,9 @@
break;
//鍒锋柊
case 'get_Refresh': set_Refresh();
+ break;
+ //鎵樻暟鍙樻洿
+ case "btn-tally": set_PalletChange();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
@@ -788,6 +792,103 @@
function set_Refresh() {
$("#btnSearch").click();
}
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_StockOutRequestBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
//闅愯棌鍒楄缃�
function get_HideColumn() {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index 2186ab0..300c08d 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -219,6 +219,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -354,6 +355,9 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
+ break;
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
@@ -936,6 +940,105 @@
}
//#endregion
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
+
//#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
function set_CloseBill(num) {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 257b0a2..799e3de 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -239,6 +239,7 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-tally" id="tally"><i class="layui-icon layui-icon-form"></i>鎵樻暟鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown_PayableBill" id="get_LookDown_PayableBill"><i class="layui-icon layui-icon-refresh-3"></i>涓嬫煡(搴斾粯鍗�)</button>
@@ -767,7 +768,9 @@
}
break;
-
+ //鎵樻暟鍙樻洿鎸夐挳
+ case "btn-tally": set_PalletChange();
+ break;
//鍒犻櫎鎸夐挳
case 'btn-Delete': set_DeleteBill();
break;
@@ -1043,6 +1046,104 @@
}
//#endregion
+ //#region 鎵樻暟鍙樻洿
+ function set_PalletChange() {
+ var checkStatus = table.checkStatus('mainTable');
+ var data = checkStatus.data;
+
+ if (data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繘琛屾墭鏁板彉鏇达紒');
+ return;
+ }
+ var rowData = data[0];
+ // 鑾峰彇褰撳墠鎵樻暟
+ var currentPallet = rowData.鎵樻暟 ;
+
+ // 鑷畾涔夊脊绐楀唴瀹�
+ var content = '<div style="padding: 20px;">' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">褰撳墠鎵樻暟</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="text" value="' + currentPallet + '" class="layui-input" readonly style="background-color:#f2f2f2;">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item">' +
+ '<label class="layui-form-label">鏂版墭鏁�</label>' +
+ '<div class="layui-input-block">' +
+ '<input type="number" id="newPalletValue" value="' + currentPallet + '" class="layui-input" placeholder="璇疯緭鍏ユ鏁存暟" min="1" step="1">' +
+ '</div>' +
+ '</div>' +
+ '<div class="layui-form-item" style="color: #999; font-size: 12px;">鎻愮ず锛氭墭鏁板繀椤讳负鏁存暟锛堝ぇ浜�0锛�</div>' +
+ '</div>';
+
+ layer.open({
+ type: 1,
+ title: '鎵樻暟鍙樻洿',
+ area: ['400px', '300px'],
+ content: content,
+ btn: ['淇濆瓨', '鍙栨秷'],
+ btnAlign: 'c',
+ yes: function (index, layero) {
+ var newValue = $('#newPalletValue').val();
+ var newPallet = parseInt(newValue);
+
+ // 楠岃瘉杈撳叆
+ if (!newValue) {
+ layer.msg('璇疯緭鍏ユ墭鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (isNaN(newPallet)) {
+ layer.msg('璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+ if (newPallet.toString() !== newValue) {
+ layer.msg('鎵樻暟涓嶈兘涓哄皬鏁帮紒', { icon: 2 });
+ $('#newPalletValue').focus();
+ return false;
+ }
+
+
+ // 淇濆瓨鏁版嵁
+ layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Kf_POStockInBill/UpdatePallet',
+ type: 'POST',
+ data: {
+ hmainid: rowData.hmainid,
+ hsubid: rowData.hsubid || 0,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ },
+ success: function (result) {
+ layer.closeAll('loading');
+ if (result.count == 1) {
+ layer.msg('鎵樻暟鍙樻洿鎴愬姛锛�', { icon: 1 });
+ layer.close(index);
+
+ window.$("#btnSearch").click();
+ } else {
+ layer.msg('淇濆瓨澶辫触锛�' + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.closeAll('loading');
+ layer.msg('璇锋眰澶辫触锛�', { icon: 5 });
+ }
+ });
+ },
+ success: function (layero, index) {
+ // 璁剧疆杈撳叆妗嗙劍鐐�
+ $('#newPalletValue').focus().select();
+ }
+ });
+ }
+
+ //#endregion
+
//#region 鍒锋柊
function get_Refresh() {
//set_ClearQuery();
--
Gitblit v1.9.1