From 92d3128fcd8e322f91020f988fe383fcb6caef13 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 29 十二月 2025 16:32:48 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html | 36 +-
WebTM/WebTM.csproj.user | 2
/dev/null | 26 --
WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html | 143 ++++++++++++++
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_Check_PDA.html | 131 ++++++++++++-
WebTM/views/模治具管理/模具投产验收单/Sc_MouldBatchWorkCheckBillEdit.html | 152 ++++++++++++++
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillListLink.html | 54 ++---
WebTM/layuiadmin/Scripts/webConfig.js | 48 +---
WebTM/WebTM.csproj | 8
9 files changed, 465 insertions(+), 135 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 67b4e22..dd69725 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -472,7 +472,6 @@
<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" />
@@ -2702,13 +2701,6 @@
<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 8a2285a..1aa955e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -10,7 +10,7 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 880ca0d..cc6fe6e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,35 +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/"; //鐜嬩华鏈湴閰嶇疆*/
->>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
- //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/"; //鏉ㄤ箰鏈湴閰嶇疆
-<<<<<<< HEAD
- // var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
-=======
-
- /*var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
->>>>>>> a8bfa0587bde2b16c87964720263ba3a0754e1f6
- /* var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- //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/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
@@ -44,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
@@ -55,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/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index 95640e0..7e13a3d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -138,7 +138,7 @@
<div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MaterialUpperBill_PDA">
<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="2" style="padding:1px;">鐗╂枡鏉＄爜淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍗曟嵁淇℃伅-->
@@ -481,6 +481,7 @@
var data = [];
listOption.cols = [[
{ field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡鏉＄爜', title: '鐗╂枡鏉＄爜', width: 100 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
@@ -777,10 +778,76 @@
});
return;
}
+ else {
+ GetMeesageByCarBarCode();
+ }
}
});
+ //鎵潯鐮�
+ function GetMeesageByCarBarCode(obj) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ var sHWHID = $("#HWHID").val()
+ var sHSPID = $("#HStockPlaceID").val()
+ var sHQty = $("#HQty").val()
+ var sSourceBillType = "-1"
+ var sCarBarCode = $("#HCarBarCode").val()
+ //todo 娌℃湁鍐�*鍒犻櫎鏉＄爜鐨勫姛鑳斤紝鍚庣画鑻ユ湁闇�瑕佸啀瀹屽杽
+ if (sCarBarCode == '') {
+ playSound();
+ layer.msg("灏忚溅鏉＄爜涓虹┖锛岃鎵弿灏忚溅鏉＄爜锛�", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HCarBarCode").select();
+ $("#HCarBarCode").focus();
+ });
+ return;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_WorkShop_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillType": sSourceBillType, "HCarBarCode": sCarBarCode, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ playSound_OK();
+ if (sBarCode.startsWith("GXLX")) {
+ $("#HMainSourceBillNo").val(sBarCode);
+ $("#HSourceBillNo").val(sBarCode);
+ }
+ if (HSourceFlag != true) {
+ HSourceFlag = true;
+ }
+ element.tabChange('tab-Kf_MaterialUpperBill_PDA', '2');
+ //鏄剧ず琛ㄤ綋鏄庣粏
+ 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();
+ });
+ }
+ });
+ layer.closeAll("loading");
+
+ }
//#endregion
@@ -1241,6 +1308,7 @@
else {
listOption.cols = [[
{ field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡鏉＄爜', title: '鐗╂枡鏉＄爜', width: 100 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
@@ -1256,7 +1324,80 @@
}
//#endregion
+ //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+ function DisBillEntryList_CarMaterial() {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
+ success: function (result) {
+ var data = [];
+ var col = [];
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in result.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(result.list[key].ColmCols)) {
+ titleData[key] = result.list[key].ColmCols;
+ }
+ }
+
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+
+ if (data[i].name == '鏁伴噺' || data[i].name == '婧愬崟鏁伴噺' || data[i].name == '鏉＄爜涓暟') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+ } else if (data[i].name == '鐗╂枡浠ｇ爜') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
+ } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+ }
+ }
+ }
+ }
+ columns = col;
+ listOption.cols = [columns];
+ listOption.data = result.data;
+ listOption.totalRow = true;
+ table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ table.render(listOption);
+ }
+ else {
+ listOption.cols = [[
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+ , { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 }
+ ]];
+ listOption.data = data;
+ table.render(listOption);
+ }
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ }
+
+ //#endregion
});
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/\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"
deleted file mode 100644
index 2270bca..0000000
--- "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"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘�<%@ 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"
deleted file mode 100644
index b792947..0000000
--- "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"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰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"
deleted file mode 100644
index b8aa324..0000000
--- "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"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘�//------------------------------------------------------------------------------
-// <鑷姩鐢熸垚>
-// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
-// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
-// </鑷姩鐢熸垚>
-//------------------------------------------------------------------------------
-
-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\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html"
index fbfa9ef..32d4b5f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\225\344\272\247\351\252\214\346\224\266\345\215\225/Sc_MouldBatchWorkCheckBillEdit.html"
@@ -29,6 +29,7 @@
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
<li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
</ul>
<div class="layui-tab-content">
<!--鍩烘湰淇℃伅-->
@@ -93,7 +94,8 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;" readonly>
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" disabled>>
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" disabled>
+ >
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -174,6 +176,32 @@
</div>
</div>
</div>
+ <!--闄勪欢淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-upload">
+ <button type="button" class="layui-btn" id="testList">
+ 閫夋嫨鏂囦欢
+ </button><input class="layui-upload-file" type="file" accept=""
+ name="file" multiple="">
+ <div class="layui-upload-list">
+ <table class="layui-table" lay-filter="mainTable">
+ <thead>
+ <tr>
+ <th>鏂囦欢鍚�</th>
+ <th>鍥剧墖</th>
+ <th>澶у皬</th>
+ <th>鐘舵��</th>
+ <th>鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody id="ProImgByList" class="ProImgByList">
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
@@ -197,7 +225,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
//#region 鍏叡鍙橀噺
@@ -206,7 +234,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , upload = layui.upload;
var HModName = "Sc_MouldUpperBillEdit";
var option = [];
//璁板綍缁勭粐鐨勫��
@@ -249,6 +278,15 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
});
+ document.getElementById('testList').addEventListener('click', function () {
+ // 瑙﹀彂鏂囦欢杈撳叆妗嗙殑鐐瑰嚮浜嬩欢
+ document.getElementById('HBillNo').click();
+ if ($("#HBillNo").val() == "" || $("#HBillNo").val() == null || $("#HBillNo").val() == undefined) {
+ layer.msg('璇峰厛杈撳叆鐗╂枡浠ｇ爜绛変俊鎭悗鍦ㄤ笂浼犲浘鐗囷紒', { time: 3 * 1000, icon: 3 });
+ }
+ });
+ PicUpload();
+
}
else if (OperationType == 2) {
//绂佺敤缁勭粐閫夐」
@@ -263,10 +301,15 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
}
});
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
}
else if (OperationType == 3) {
//绂佺敤缁勭粐閫夐」
RoadBillMain(linterid);
+ //鏂囦欢閫夋嫨鍒濆鍖�
+ PicUpload();
+ getFile();
}
//#region 鍒濆鍖栫粍缁�
@@ -589,7 +632,110 @@
})
}
+ //#region 鏂囦欢涓婁紶
+ function PicUpload() {
+ //澶氬浘鐗囦笂浼�
+ //澶氭枃浠跺垪琛ㄧず渚�
+ var ProImgByList = $('#ProImgByList')
+ , uploadListIns = upload.render({
+ elem: '#testList'
+ , url: GetWEBURL() + "/Gy_Mater/UploadFile"
+ , accept: 'file'
+ , multiple: true
+ , auto: false
+ //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+ , data: { "HNumber": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+ , choose: function (obj) {
+ var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+ //璇诲彇鏈湴鏂囦欢
+ obj.preview(function (index, file, result) {
+ var tr = $(['<tr id="upload-' + index + '">'
+ , '<td>' + file.name + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
+ , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+ , '<td>绛夊緟涓婁紶</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+
+ //鍗曚釜閲嶄紶
+ tr.find('.demo-reload').on('click', function () {
+ obj.upload(index, file);
+ return false;
+ });
+
+ //鍒犻櫎
+ tr.find('.demo-delete').on('click', function () {
+ delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+ tr.remove();
+ uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+ });
+
+ ProImgByList.append(tr);
+
+ });
+ }
+ , done: function (res, index, upload) {
+ if (res.code == 1) { //涓婁紶鎴愬姛
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+ tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+ return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+ }
+ this.error(index, upload);
+ }
+ , error: function (index, upload) {
+ var tr = ProImgByList.find('tr#upload-' + index)
+ , tds = tr.children();
+ tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+ tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+ }
+ });
+ }
+ //#endregion
+ //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+ function getFile() {
+ var ProImgByList = $('#ProImgByList')
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Mater/Filelist',
+ type: "GET",
+ data: { "HNumber": $("#HBillNo").val() },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var index = 0;
+ for (var i = 0; i < data1.data.length; i++) {
+ var tr = $(['<tr id="upload-' + i + '">'
+ , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+ , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+ , '<td>' + data1.data[i].HFileName + '</td>'
+ , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
+ , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+ , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+ , '<td style="display:none">' + data1.data[i].url + '</td>'
+ , '<td>'
+ , '<button class="layui-btn layui-btn-xs demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+ , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+ , '</td>'
+ , '</tr>'].join(''));
+
+ $('#ProImgByList').append(tr);
+ }
+
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
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/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
index 05f91da..111cff2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
@@ -351,7 +351,7 @@
//鑷姩鎵撳嵃
if (option.data.length > 0) {
- get_BatchPrint();
+ get_BatchPrint(HICMOInterID, HICMOEntryID);
}
}
else {
@@ -369,18 +369,18 @@
//鎵归噺鎵撳嵃
var time;
var num = 0;
- function get_BatchPrint() {
+ function get_BatchPrint(HICMOInterID, HICMOEntryID) {
//鎵撳嵃闂撮殧
var HTime = $("#HTime").val();
time = setInterval(function () {
- dy_PL(option.data);
+ dy_PL(HICMOInterID, HICMOEntryID, option.data);
}, HTime*1000);
}
- function dy_PL(rest) {
- var HItemID = rest[num].HBarCodeID.toString();
- var sWhere = "select top 1 HBarCode 鏉＄爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HItemID = " + HItemID
+ function dy_PL(HICMOInterID, HICMOEntryID,rest) {
+ //var HItemID = rest[num].HBarCodeID.toString();
+ var sWhere = "select top 1 a.HItemID,HBarCode 鏉＄爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HSourceInterID = " + HICMOInterID + " and a.HSourceEntryID = " + HICMOEntryID + " and a.HPrintQty = 0 order by a.HItemID asc";
$.ajax({
type: "GET",
@@ -427,18 +427,18 @@
num++;
}
- //var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + HInterID ;
- //$.ajax({
- // type: "GET",
- // url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // async: false,
- // data: { "sWhere": sql },
- // success: function (result) {
- // if (result.data.code != 1) {
- // layer.alert("鏇存柊鎵撳嵃鏃ユ湡寮傚父锛�" + result.data.Message);
- // }
- // }
- //})
+ var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + data.data[0].HItemID;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sql },
+ success: function (result) {
+ //if (result.data.code != 1) {
+ // layer.alert("鏇存柊鎵撳嵃鏃ユ湡寮傚父锛�" + result.data.Message);
+ //}
+ }
+ })
} else {
layer.msg("鏌ユ棤鏁版嵁!");
--
Gitblit v1.9.1