From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 416 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 265 insertions(+), 151 deletions(-)
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 495f989..99d775c 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"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -17,37 +18,45 @@
</head>
<body>
<div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
-
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
<form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div style="padding:20px;margin:0px 700px">
- <h1>鐩樼偣鍒嗘瀽琛�</h1>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鐩樼偣鏂规</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HItemID">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;margin-top:20px"><b>鐩樼偣鍒嗘瀽鍒楄〃</b></h1>
+
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐩樼偣鏂规</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HName" id="HName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HItemID" id="HItemID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceInterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
+ 鏌ヨ
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
+ 閲嶇疆
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnDel" id="btnDel">
+ 鍒犻櫎
+ </button>
+ </div>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch1" id="btnSearch1">
- 鏌ヨ
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch1" id="btnReSearch1">
- 閲嶇疆
- </button>
</div>
</div>
</div>
+
<div class="layui-tab layui-tab-card" style="margin-top:10px">
<ul class="layui-tab-title">
@@ -95,7 +104,7 @@
<script type="text/html" id="toolbarDemo2">
<div class="layui-btn-container">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check2"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check2" id="btn-Check2"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh2"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit2"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -104,7 +113,7 @@
<script type="text/html" id="toolbarDemo3">
<div class="layui-btn-container">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check3"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check3" id="btn-Check3"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh3"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit3"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -113,7 +122,7 @@
<script type="text/html" id="toolbarDemo4">
<div class="layui-btn-container">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check4"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check4" id="btn-Check4"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh4"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit4"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -122,7 +131,7 @@
<script type="text/html" id="toolbarDemo5">
<div class="layui-btn-container">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check5"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check5" id="btn-Check5"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh5"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit5"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -131,7 +140,7 @@
<script type="text/html" id="toolbarDemo6">
<div class="layui-btn-container">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check6"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check6" id="btn-Check6"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh6"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit6"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -140,7 +149,7 @@
<script type="text/html" id="toolbarDemo7">
<div class="layui-btn-container">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check7"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Check7" id="btn-Check7"><i class="layui-icon layui-icon-delete"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh7"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit7"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
@@ -164,7 +173,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
// #region 鍏ㄥ眬鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -183,8 +192,9 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
- var sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentID=m.HNowSupID";
+ var sWhere = " HRealPotType=HBookPotType and HRealPot=HBookPot";
var option1 = [];
var option2 = [];
var option3 = [];
@@ -193,38 +203,26 @@
var option6 = [];
var option7 = [];
var col = [
- { type: 'checkbox', fixed: 'left' }
- , { 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 }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ , { field: 'HItemID', title: 'HItemID', width: 200, hide: true, sort: true}
+ , { field: 'HBarCode', title: '鍣ㄥ叿鏉＄爜', width: 200, sort: true}
+ , { field: 'HMouldNo', title: '鍣ㄥ叿缂栧彿', width: 200, sort: true}
+ , { field: 'HStockCheck', title: '鐩樼偣鏂规', width: 200, sort: true}
+ , { field: 'HRealPotType', title: '瀹為檯浣嶇疆绫诲瀷', width: 200, sort: true}
+ , { field: 'HRealPot', title: '瀹為檯浣嶇疆', width: 200, sort: true}
+ , { field: 'HBookPotType', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200, sort: true}
+ , { field: 'HBookPot', title: '璐﹂潰浣嶇疆', width: 200, sort: true}
+ , { field: 'HOWNERName', title: '鐩樼偣缁勭粐', width: 200, sort: true}
+ , { field: 'HMakeDate', title: '鐩樼偣鏃ユ湡', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>", sort: true }
];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
- set_ClearBill();
+ set_ClearBill();
//#endregion
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
- //#region 澶村伐鍏锋爮浜嬩欢 姝ｅ父
- table.on('toolbar(mainTable1)', function (obj) {
- switch (obj.event) {
- //瀹℃牳
- case 'btn-Check1': set_CheckBill1();
- break;
- //鍒锋柊
- case 'btn-Refresh1': set_ClearQuery();;
- break;
- //閫�鍑烘寜閽�
- case 'btn-Exit1': Pub_Close1(2);
- break;
- };
- });
- //#endregion
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 澶村伐鍏锋爮浜嬩欢 璋冩嫧
table.on('toolbar(mainTable2)', function (obj) {
switch (obj.event) {
@@ -315,26 +313,75 @@
};
});
//#endregion
-
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch1)', function (data) {
var HItemID = $("#HItemID").val();//鐩樼偣
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
- type: "GET",
- data: { "sWhere": sWhere, "sID": HItemID },
- success: function (data1) {
- if (data1.count == 1) {
- option1.data = data1.list[0];
- table1.render(option1);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ if (HItemID) {
+ //鐩樼偣鍒嗘瀽鍒楄〃鍒ゆ柇褰撳墠閫夋嫨鐨勭洏鐐规柟妗堟槸鍚︾敓鎴愯繃鍗曟嵁
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/StockItemSubIsExistence',
+ type: "GET",
+ data: { "sID": HItemID },
+ success: function (data1) {
+ if (data1.count == 0) {
+ layer.confirm('鏆傛湭鐢熸垚杩囧搴旂洏鐐规柟妗堟暟鎹紝鏄惁鐢熸垚锛�', {
+ icon: 3,
+ title: "鎻愮ず",
+ btn: ['纭畾', '鍙栨秷'],
+ submit: function (index) {
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
+ type: "GET",
+ data: { "sWhere": sWhere, "sID": HItemID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option1.data = data1.list[0];
+ table1.render(option1);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ },
+ cancel: function (index, layero) {
+ layer.close(index);
+ location.reload();
+ }
+ });
+
+ }
+ else {
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
+ type: "GET",
+ data: { "sWhere": sWhere, "sID": HItemID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option1.data = data1.list[0];
+ table1.render(option1);
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
+ });
+
+ }
+ else {
+ layer.msg("璇烽�夋嫨鐩樼偣鏂规");
+ return;
+ }
});
// 閲嶇疆鎸夐挳
@@ -351,7 +398,7 @@
option1.data = data1.list[0];
table1.render(option1);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -359,12 +406,45 @@
});
});
+ //鍒犻櫎鎸夐挳
+ form.on('submit(btnDel)', function (data) {
+ var HItemID = $("#HItemID").val();//鐩樼偣
+ if (HItemID) {
+ layer.confirm('鏄惁鍒犻櫎鍏朵粬鏃犵敤鐨勫簱瀛橈紵', {
+ icon: 3,
+ title: "鎻愮ず",
+ btn: ['纭畾', '鍙栨秷'],
+ btn1: function (index) {
+ $.ajax({
+ url: GetWEBURL() + 'Gy_StockCheckItemBill/StockItemSubDel',
+ type: "GET",
+ anysc: false,
+ data: { "sID": HItemID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.msg(data1.Message, { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ })
+ }
+ })
+ }
+ else {
+ layer.msg("璇烽�夋嫨鐩樼偣鏂规");
+ return;
+ }
+ });
+
//鐩樼偣鏂规寮圭獥
form.on('submit(HSourceInterList)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim',
title: '鐩樼偣鏂规鍒楄〃',
closeBtn: 1,
shift: 2,
@@ -380,6 +460,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HItemID").val(checkStatus.data[0].hitemid);
+ $("#HName").val(checkStatus.data[0].鐩樼偣鏂规);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -432,42 +513,46 @@
tk_Display();
});
//#endregion
-
- //#endregion
- //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
- // #region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ //#endregion
+
+ //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+ // #region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�(姝ｅ父)
set_InitGrid1();
//鍒濆鍖栬〃鏍�(璋冩嫧)
- set_InitGrid2();
- //鍒濆鍖栬〃鏍�(鍑哄簱)
- set_InitGrid3();
- //鍒濆鍖栬〃鏍�(鍏ュ簱)
- set_InitGrid4();
- //鍒濆鍖栬〃鏍�(鐩樼泩)
- set_InitGrid5();
- //鍒濆鍖栬〃鏍�(鐩樹簭)
- set_InitGrid6();
- //鍒濆鍖栬〃鏍�(閫�搴�)
- set_InitGrid7();
- //鏌ヨ
- zc_Display();
-
+ set_InitGrid2();
+ //鍒濆鍖栬〃鏍�(鍑哄簱)
+ set_InitGrid3();
+ //鍒濆鍖栬〃鏍�(鍏ュ簱)
+ set_InitGrid4();
+ //鍒濆鍖栬〃鏍�(鐩樼泩)
+ set_InitGrid5();
+ //鍒濆鍖栬〃鏍�(鐩樹簭)
+ set_InitGrid6();
+ //鍒濆鍖栬〃鏍�(閫�搴�)
+ set_InitGrid7();
+ //鍒濆鏌ユ甯搁〉绛�
+ //zc_Display();
}
//鍒濆鍖栬〃鏍�(姝ｅ父)
- function set_InitGrid1()
- {
+ function set_InitGrid1() {
var ajaxLoad = layer.load();
option1 = {
elem: '#mainTable1'
, toolbar: '#toolbarDemo1'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
option1.data = [];
table1.render(option1);
@@ -482,7 +567,10 @@
, toolbar: '#toolbarDemo2'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
};
option2.data = [];
@@ -498,7 +586,10 @@
, toolbar: '#toolbarDemo3'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
};
option3.data = [];
@@ -514,7 +605,10 @@
, toolbar: '#toolbarDemo4'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
};
option4.data = [];
@@ -530,7 +624,10 @@
, toolbar: '#toolbarDemo5'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
};
option5.data = [];
@@ -546,7 +643,10 @@
, toolbar: '#toolbarDemo6'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
};
option6.data = [];
@@ -562,7 +662,10 @@
, toolbar: '#toolbarDemo7'
, height: '550'
, page: true
+ , totalRow: true
, cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
, cols: [col]
};
option7.data = [];
@@ -585,16 +688,16 @@
option1.data = data1.list[0];
table1.render(option1);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
- //璋冩嫧鏌ヨ
+ //璋冩嫧鏌ヨ
function db_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID";
+ var sWhere = " HRealPotType=HBookPotType and HRealPotType=''浠撳簱'' and HRealPot!=HBookPot";
var HItemID = $("#HItemID").val();//鐩樼偣
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
@@ -606,17 +709,18 @@
option2.data = data1.list[0];
table2.render(option2);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
- //鍑哄簱鏌ヨ
+ //鍑哄簱鏌ヨ
function ck_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and m.HNowSupTypeID=4 and isnull(m.HNowSupID,'')!='' and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and isnull(k.HCorrespondentID,'')!=''";
+ var sWhere = " HBookPotType=''浠撳簱'' and isnull(HBookPot,'''')!='''' and (HRealPotType=''渚涘簲鍟�'' or HRealPotType=''瀹㈡埛'') and isnull(HRealPot,'''')!=''''";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -627,17 +731,18 @@
option3.data = data1.list[0];
table3.render(option3);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
- //鍏ュ簱鏌ヨ
+ //鍏ュ簱鏌ヨ
function rk_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and (k.HCorrespondentTypeID=1 or k.HCorrespondentTypeID=2) and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2) and k.HCorrespondentID!=m.HNowSupID";
+ var sWhere = " (HRealPotType=''渚涘簲鍟�'' or HRealPotType=''瀹㈡埛'') and (HBookPotType=''渚涘簲鍟�'' or HBookPotType=''瀹㈡埛'') and HRealPot!=HBookPot";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -648,17 +753,18 @@
option4.data = data1.list[0];
table4.render(option4);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
- //鐩樼泩鏌ヨ
+ //鐩樼泩鏌ヨ
function py_Display() {
- sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3";
+ var sWhere = "py";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -669,17 +775,18 @@
option5.data = data1.list[0];
table5.render(option5);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
- //鐩樹簭鏌ヨ
+ //鐩樹簭鏌ヨ
function pk_Display() {
- sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3";
+ var sWhere = "pk";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -690,17 +797,18 @@
option6.data = data1.list[0];
table6.render(option6);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
}
- //閫�搴撴煡璇�
+ //閫�搴撴煡璇�
function tk_Display() {
- sWhere = "k.HCorrespondentTypeID!=3 and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=4 and isnull(k.HCorrespondentID,'')!='' and (m.HNowSupTypeID=1 or m.HNowSupTypeID=2)";
+ var sWhere = " HRealPotType=''浠撳簱'' and isnull(HRealPot,'''')!='''' and (HBookPotType=''渚涘簲鍟�'' or HBookPotType=''瀹㈡埛'')";
var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -711,7 +819,7 @@
option7.data = data1.list[0];
table7.render(option7);
} else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
@@ -720,18 +828,18 @@
}
//#endregion
-
- //#region 瀹℃牳
+ //#region 瀹℃牳
//瀹℃牳 璋冩嫧
function set_CheckBill2() {
var checkStatus = table.checkStatus('mainTable2')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HInterID = data[0].鏉＄爜.toString();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
+ $('#btn-Check2').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
- type: "GET",
+ type: "POST",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdMove", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -740,6 +848,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $('#btn-Check1').addClass("layui-btn-disabled").attr("disabled", true);
window.location.reload();
});
@@ -752,19 +861,20 @@
});
}
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();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
+ $('#btn-Check3').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
- type: "GET",
+ type: "POST",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -785,19 +895,20 @@
});
}
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();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
+ $('#btn-Check4').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
- type: "GET",
+ type: "POST",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -818,19 +929,20 @@
});
}
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();
- $.ajax({
- type: "GET",
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
+ $('#btn-Check5').addClass("layui-btn-disabled").attr("disabled", true);
+ $.ajax({
+ type: "POST",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -851,19 +963,20 @@
});
}
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();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
+ $('#btn-Check6').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
- type: "GET",
+ type: "POST",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -884,19 +997,20 @@
});
}
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();
+ if (checkStatus.data.length >= 1) {
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
+ $('#btn-Check7').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
- type: "GET",
+ type: "POST",
url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
+ data: { "msg": sSubStr },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -917,12 +1031,12 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
//#endregion
-
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
--
Gitblit v1.9.1