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/基础资料/基础资料/InventoryAnalysis.html | 84 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 45 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 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('璇锋渶灏戦�夋嫨涓�琛屾暟鎹鏍革紒');
}
}
--
Gitblit v1.9.1