From a217e1db5c79557d59f5ac82f53904b155e377e7 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 24 二月 2022 15:42:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 42 ++
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 42 ++
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 43 ++
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 43 ++
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 291 ++++++++++++-------
WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill.aspx.cs | 17 +
WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill.aspx | 28 +
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html | 42 ++
WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill.aspx.designer.cs | 26 +
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 51 +++
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 43 ++
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 2
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html | 40 ++
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 43 ++
WebTM/WebTM.csproj | 8
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 84 ++---
17 files changed, 687 insertions(+), 161 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d807ed0..6171e2d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -595,6 +595,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldDotCheckPlanBill.aspx" />
@@ -1048,6 +1049,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
<DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_ICStockBill.aspx.cs">
<DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
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 3f008d4..40543ac 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"
@@ -52,6 +52,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
@@ -150,6 +160,13 @@
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+
// 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
@@ -328,7 +345,33 @@
sWhere = "";
get_Display(sWhere);
}
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1243 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
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/HBarPlanPrint.html" "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/HBarPlanPrint.html"
index b48b294..7cb3600 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "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/HBarPlanPrint.html"
@@ -147,6 +147,9 @@
case "ICStockBill"://閿�鍞��璐у崟鎵撳嵃
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_ICStockBill.aspx?linterid=" + value, true, "");
break;
+ case "HGy_BarCodeBill"://鏉＄爜鎵撳嵃
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill.aspx?linterid=" + value, true, "");
+ break;
}
</script>
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_HGy_BarCodeBill.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_HGy_BarCodeBill.aspx"
new file mode 100644
index 0000000..6e65c25
--- /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_HGy_BarCodeBill.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HGy_BarCodeBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_HGy_BarCodeBill" %>
+
+<!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_IF_BarCodeBillList where hmainid=" + Request.Params["linterid"]+ "order by hmainid desc");
+ }
+</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_HGy_BarCodeBill.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_HGy_BarCodeBill.aspx.cs"
new file mode 100644
index 0000000..9ec5263
--- /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_HGy_BarCodeBill.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_HGy_BarCodeBill : 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_HGy_BarCodeBill.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_HGy_BarCodeBill.aspx.designer.cs"
new file mode 100644
index 0000000..c788b79
--- /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_HGy_BarCodeBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_HGy_BarCodeBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
index d1230d0..465881a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -189,7 +189,7 @@
, laydate = layui.laydate
, util = layui.util
//鏌ヨ鏉′欢
- var sWhere = " 瀹為檯浣嶇疆绫诲瀷=璐﹂潰浣嶇疆绫诲瀷 and 瀹為檯浣嶇疆=璐﹂潰浣嶇疆";
+ var sWhere = " HRealPotType=HBookPotType and HRealPot=HBookPot";
var option1 = [];
var option2 = [];
var option3 = [];
@@ -200,13 +200,13 @@
var col = [
{ type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', width: 200,hide: true}
- , { field: '鏉＄爜', title: '鍣ㄥ叿鏉＄爜', width: 200 }
- , { field: '鍣ㄥ叿缂栧彿', title: '鍣ㄥ叿缂栧彿', width: 200 }
- , { field: '鐩樼偣鏂规', title: '鐩樼偣鏂规', width: 200 }
- , { field: '瀹為檯浣嶇疆绫诲瀷', title: '瀹為檯浣嶇疆绫诲瀷', width: 200 }
- , { field: '瀹為檯浣嶇疆', title: '瀹為檯浣嶇疆', width: 200 }
- , { field: '璐﹂潰浣嶇疆绫诲瀷', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200 }
- , { field: '璐﹂潰浣嶇疆', title: '璐﹂潰浣嶇疆', width: 200 }
+ , { field: 'HBarCode', title: '鍣ㄥ叿鏉＄爜', width: 200 }
+ , { field: 'HMouldNo', title: '鍣ㄥ叿缂栧彿', width: 200 }
+ , { field: 'HStockCheck', title: '鐩樼偣鏂规', width: 200 }
+ , { field: 'HRealPotType', title: '瀹為檯浣嶇疆绫诲瀷', width: 200 }
+ , { field: 'HRealPot', title: '瀹為檯浣嶇疆', width: 200 }
+ , { field: 'HBookPotType', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200 }
+ , { field: 'HBookPot', title: '璐﹂潰浣嶇疆', width: 200 }
];
//#endregion
@@ -614,7 +614,7 @@
}
//璋冩嫧鏌ヨ
function db_Display() {
- var sWhere = " 瀹為檯浣嶇疆绫诲瀷=璐﹂潰浣嶇疆绫诲瀷 and 瀹為檯浣嶇疆绫诲瀷='浠撳簱' and 瀹為檯浣嶇疆!=璐﹂潰浣嶇疆";
+ var sWhere = " HRealPotType=HBookPotType and HRealPotType='浠撳簱' and HRealPot!=HBookPot";
var HItemID = $("#HItemID").val();//鐩樼偣
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -635,7 +635,7 @@
}
//鍑哄簱鏌ヨ
function ck_Display() {
- var sWhere = " 璐﹂潰浣嶇疆绫诲瀷='浠撳簱' and isnull(璐﹂潰浣嶇疆,'')!='' and (瀹為檯浣嶇疆绫诲瀷='渚涘簲鍟�' or 瀹為檯浣嶇疆绫诲瀷='瀹㈡埛') and isnull(瀹為檯浣嶇疆,'')!=''";
+ var sWhere = " HBookPotType='浠撳簱' and isnull(HBookPot,'')!='' and (HRealPotType='渚涘簲鍟�' or HRealPotType='瀹㈡埛') and isnull(HRealPot,'')!=''";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -656,7 +656,7 @@
}
//鍏ュ簱鏌ヨ
function rk_Display() {
- var sWhere = " (瀹為檯浣嶇疆绫诲瀷='渚涘簲鍟�' or 瀹為檯浣嶇疆绫诲瀷='瀹㈡埛') and (璐﹂潰浣嶇疆绫诲瀷='渚涘簲鍟�' or 璐﹂潰浣嶇疆绫诲瀷='瀹㈡埛') and 瀹為檯浣嶇疆!=璐﹂潰浣嶇疆";
+ var sWhere = " (HRealPotType='渚涘簲鍟�' or HRealPotType='瀹㈡埛') and (HBookPotType='渚涘簲鍟�' or HBookPotType='瀹㈡埛') and HRealPot!=HBookPot";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -677,7 +677,7 @@
}
//鐩樼泩鏌ヨ
function py_Display() {
- var sWhere = "isnull(璐﹂潰浣嶇疆,'')='' and isnull(瀹為檯浣嶇疆,'')!=''";
+ var sWhere = "isnull(HBookPot,'')='' and isnull(HRealPot,'')!=''";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -698,7 +698,7 @@
}
//鐩樹簭鏌ヨ
function pk_Display() {
- var sWhere = "isnull(璐﹂潰浣嶇疆,'')!='' and isnull(瀹為檯浣嶇疆,'')=''";
+ var sWhere = "isnull(HBookPot,'')!='' and isnull(HRealPot,'')=''";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -719,7 +719,7 @@
}
//閫�搴撴煡璇�
function tk_Display() {
- var sWhere = " 瀹為檯浣嶇疆绫诲瀷='浠撳簱' and isnull(瀹為檯浣嶇疆,'')!='' and (璐﹂潰浣嶇疆绫诲瀷='渚涘簲鍟�' or 璐﹂潰浣嶇疆绫诲瀷='瀹㈡埛')";
+ var sWhere = " HRealPotType='浠撳簱' and isnull(HRealPot,'')!='' and (HBookPotType='渚涘簲鍟�' or HBookPotType='瀹㈡埛')";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -746,13 +746,12 @@
function set_CheckBill2() {
var checkStatus = table.checkStatus('mainTable2')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
- var HItemID = data[0].HItemID.toString();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdMove", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID},
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -773,20 +772,19 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
//瀹℃牳 鍑哄簱
function set_CheckBill3() {
var checkStatus = table.checkStatus('mainTable3')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
- var HItemID = data[0].HItemID.toString();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID},
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -807,20 +805,19 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
//瀹℃牳 鍏堥��搴撳啀鍑哄簱
function set_CheckBill4() {
var checkStatus = table.checkStatus('mainTable4')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
- var HItemID = data[0].HItemID.toString();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -841,20 +838,19 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
//瀹℃牳 鐩樼泩
function set_CheckBill5() {
var checkStatus = table.checkStatus('mainTable5')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
- var HItemID = data[0].HItemID.toString();
- $.ajax({
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ $.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -875,20 +871,19 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
//瀹℃牳 鐩樹簭
function set_CheckBill6() {
var checkStatus = table.checkStatus('mainTable6')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
- var HItemID = data[0].HItemID.toString();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -909,20 +904,19 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
//瀹℃牳 閫�搴�
function set_CheckBill7() {
var checkStatus = table.checkStatus('mainTable7')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
- var HItemID = data[0].HItemID.toString();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
$.ajax({
type: "GET",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID},
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -943,7 +937,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
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_BarCodeBillList.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_BarCodeBillList.html"
index 772c2eb..dfa129d 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_BarCodeBillList.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_BarCodeBillList.html"
@@ -28,11 +28,6 @@
<form class="layui-form" action="" lay-filter="component-form-group">
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span>鏇村</span>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">鏉＄爜缂栧彿</label>
<div class="layui-input-block">
@@ -48,6 +43,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -55,10 +51,9 @@
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" 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-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
@@ -89,134 +84,208 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
+ var option = [];
+ set_ClearBill();
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , limits: [50, 500, 5000, 20000]
- , limit: 50
- , cols: [[
- { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
- , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 160 }
- , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 160 }
- , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
- , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
- , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200 }
- , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160 }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160 }
- , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 200 }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
- , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
- , { field: '杩涙枡鏃ユ湡', title: '杩涙枡鏃ユ湡', width: 200 }
- , { field: '杩涙枡鏃ユ湡鍛�', title: '杩涙枡鏃ユ湡鍛�', width: 115 }
- , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115 }
- , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
- , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
- , { field: '杞﹂棿', title: '杞﹂棿', width: 115 }
- , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200 }
- , { field: '鎷栧彿', title: '鎷栧彿', width: 200 }
- , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200 }
- , { field: '澶囨敞', title: '澶囨敞', width: 200 }
- , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
- , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200 }
- , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115 }
- , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200 }
- , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200 }
- ]]
- };
-
- var index = layer.load(0);
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillList',
- type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- //閲嶇疆鎸夐挳
+ //#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HBarCode").val("");//鍗曟嵁绫诲瀷
- $("#HMaterName").val("");//鍗曟嵁鍙�
- $("#btnSearch").click();
+ $("#HBarCode").val("");
+ $("#HMaterName").val("");
+ sWhere = "";
+ get_Display(sWhere);
});
+ //#endregion
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HBarCode = $("#HBarCode").val();
- var HMaterName = $("#HMaterName").val();
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HBarCode = $("#HBarCode").val();//寮�濮嬫棩鏈�
+ var HMaterName = $("#HMaterName").val();//缁撴潫鏃ユ湡
if (HBarCode) {
- sWhere += " and 鏉＄爜缂栧彿 like '%" + HBarCode + "%'";
+ sWhere += " and 鏉＄爜缂栧彿 like '" + HBarCode + "'";
}
if (HMaterName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+ sWhere += " and 鐗╂枡鍚嶇О like'" + HMaterName + "'";
}
- var index = layer.load(0);
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '鏉＄爜绫诲瀷', title: '鏉＄爜绫诲瀷', width: 160 }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 160 }
+ , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+ , { field: 'HAuxPropID', title: 'HAuxPropID', width: 200 }
+ , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 160 }
+ , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 160 }
+ , { field: '鎵瑰彿', title: '鎵瑰彿', width: 160 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 200 }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 200 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
+ , { field: '杩涙枡鏃ユ湡', title: '杩涙枡鏃ユ湡', width: 200 }
+ , { field: '杩涙枡鏃ユ湡鍛�', title: '杩涙枡鏃ユ湡鍛�', width: 115 }
+ , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 115 }
+ , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+ , { field: '杞﹂棿', title: '杞﹂棿', width: 115 }
+ , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 200 }
+ , { field: '鎷栧彿', title: '鎷栧彿', width: 200 }
+ , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 200 }
+ , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+ , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 115 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200 }
+ , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 200 }
+ , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 200 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 115 }
+ , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 200 }
+ , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 200 }
+ ]]
+ };
+
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/Gy_BarCodeBillList/GetBarCodeBillList',
+ url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
layer.close(index);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(index);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- sWhere = "";
- $("#HBarCode").val("");//鍗曟嵁绫诲瀷
- $("#HMaterName").val("");//鍗曟嵁鍙�
+ }
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case 'btn-Delete':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ break;
+ case 'btn-view':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ break;
+ case 'btn-print':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ break;
+ //鍒锋柊
+ case 'btn-reload':
+ $("#HBarCode").val("");
+ $("#HMaterName").val("");
+ sWhere = "";
+ get_Display(sWhere);
+ break;
+ //閫�鍑烘寜閽�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ };
});
- //鐩戝惉琛屽弻鍑讳簨浠�
- table.on('rowDouble(mainTable)', function (obj) {
- layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
- });
-
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
-
+
//浠ヤ笂鏄痩ayui妯″潡
});
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_MouldFile.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_MouldFile.html"
index 376700b..a364a28 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_MouldFile.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_MouldFile.html"
@@ -867,7 +867,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../PublicPage/MouldMaintainRuleInterList.html', 'yes'],
+ content: ['Sc_MouldMaintainRuleBillList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 999b435..c1a2c0c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -50,6 +50,16 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -125,6 +135,11 @@
case 'get_Exit': Pub_Close(2);
break;
};
+ });
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
});
//閲嶇疆鎸夐挳
@@ -359,6 +374,34 @@
}
}
+
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 3710 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//laydate.render({
// elem: '#HDate'
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 6967be1..79cf64a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -57,12 +57,22 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<!--<div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>-->
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -204,6 +214,10 @@
};
});
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -1022,6 +1036,35 @@
sWhere = "";
get_Display(sWhere);
}
+
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1601 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#endregion
//鍒锋柊
function set_Refresh() {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
index b259ce2..bcfe89b 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBillList.html"
@@ -58,6 +58,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -129,6 +139,11 @@
set_ClearBill();
//#endregion
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -426,6 +441,34 @@
$("#HMangerID").val("");
sWhere = "";
}
+
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1103 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//#region 鍒锋柊
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
index 9fcef1b..724a6cd 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\200\200\346\226\231\351\200\232\347\237\245\345\215\225/Cg_POInStockBackBillList.html"
@@ -58,6 +58,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -127,6 +137,11 @@
set_ClearBill();
//#endregion
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -384,6 +399,33 @@
$("#HMangerID").val("");
sWhere = "";
}
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1105 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//#region 鍒锋柊
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 0eafc5a..dc06cef 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -57,6 +57,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
@@ -194,6 +204,10 @@
};
});
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -1008,6 +1022,34 @@
sWhere = "";
get_Display(sWhere);
}
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2,"HBillType":1102 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#endregion
//鍒锋柊
function set_Refresh() {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index 4c3c689..f95ce24 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -58,6 +58,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -124,6 +134,11 @@
set_ClearBill();
//#endregion
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -390,6 +405,34 @@
set_ClearQuery();
get_Display(sWhere);
}
+
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1402 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
index 5354e04..cb22f52 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\200\200\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBackBillList.html"
@@ -58,6 +58,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -128,6 +138,10 @@
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
@@ -390,7 +404,33 @@
}
//#endregion
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1403 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 968eb9f..0f29387 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -58,6 +58,16 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -127,6 +137,11 @@
set_ClearBill();
//#endregion
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -384,6 +399,33 @@
$("#HMangerID").val("");
sWhere = "";
}
+ //閲嶆柊鍚屾鎸夐挳
+ function set_ResCnz() {
+ var HBillno2 = $('#HBillno2').val();
+ $.ajax({
+ url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+ type: "GET",
+ data: { "HBillNo": HBillno2, "HBillType": 1401 },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
//#endregion
//#region 鍒锋柊
--
Gitblit v1.9.1