Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

杨乐

2022-01-12 426f22c7336a9686df0dc451289202167c48c0cc

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/InventoryAnalysis.html

@@ -189,7 +189,7 @@
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentID=m.HNowSupID";
            var sWhere = " å®žé™…位置类型=账面位置类型 and å®žé™…位置=账面位置";
            var option1 = [];
            var option2 = [];
            var option3 = [];
@@ -199,6 +199,7 @@
            var option7 = [];
            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 }
@@ -599,7 +600,7 @@
            }
            //调拨查询
            function db_Display() {
                var sWhere = "k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3 and k.HCorrespondentTypeID=m.HNowSupTypeID and k.HCorrespondentTypeID=4 and k.HCorrespondentID!=m.HNowSupID";
                var sWhere = " å®žé™…位置类型=账面位置类型 and å®žé™…位置类型='仓库' and å®žé™…位置!=账面位置";
                var HItemID = $("#HItemID").val();//盘点
                //进入页面显示的缓存列表
                $.ajax({
@@ -620,7 +621,7 @@
            }
            //出库查询
            function ck_Display() {
                var 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 = " è´¦é¢ä½ç½®ç±»åž‹='仓库' and isnull(账面位置,'')!='' and (实际位置类型='供应商' or å®žé™…位置类型='客户') and isnull(实际位置,'')!=''";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
@@ -641,7 +642,7 @@
            }
            //入库查询
            function rk_Display() {
                var 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 = " (实际位置类型='供应商' or å®žé™…位置类型='客户') and (账面位置类型='供应商' or è´¦é¢ä½ç½®ç±»åž‹='客户') and å®žé™…位置!=账面位置";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
@@ -662,7 +663,7 @@
            }
            //盘盈查询
            function py_Display() {
                var sWhere = "isnull(m.HNowSupID,'')='' and isnull(k.HCorrespondentID,'')!='' and k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3";
                var sWhere = "isnull(账面位置,'')='' and isnull(实际位置,'')!=''";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
@@ -683,7 +684,7 @@
            }
            //盘亏查询
            function pk_Display() {
                var sWhere = "isnull(m.HNowSupID,'')!='' and isnull(k.HCorrespondentID,'')='' and k.HCorrespondentTypeID!=3  and m.HNowSupTypeID!=3";
                var sWhere = "isnull(账面位置,'')!='' and isnull(实际位置,'')=''";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
@@ -704,7 +705,7 @@
            }
            //退库查询
            function tk_Display() {
                var 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 = " å®žé™…位置类型='仓库' and isnull(实际位置,'')!='' and  (账面位置类型='供应商' or è´¦é¢ä½ç½®ç±»åž‹='客户')";
                var HItemID = $("#HItemID").val();//单据类型
                //进入页面显示的缓存列表
                $.ajax({
@@ -733,10 +734,11 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].条码.toString();
                    var HItemID = data[0].HItemID.toString();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdMove", //方法所在页面和方法名
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID},
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -769,7 +771,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //方法所在页面和方法名
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID},
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -802,7 +804,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //方法所在页面和方法名
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -835,7 +837,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //方法所在页面和方法名
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -868,7 +870,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //方法所在页面和方法名
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -901,7 +903,7 @@
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //方法所在页面和方法名
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"] },
                        data: { "HBarCode": HInterID, "user": sessionStorage["HUserName"], "userID": sessionStorage["OrganizationID"], "HItemID": HItemID},
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {