From 2680d162ceca7d0e618ad30f926bd4c99e13fd7b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 12 十二月 2022 11:23:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 173 +++++++++++++++++++++++++------------------
WebTM/views/基础资料/基础资料/Gy_StockCheckItemEdit.html | 10 +-
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 10 +-
3 files changed, 112 insertions(+), 81 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/Gy_StockCheckItemEdit.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/Gy_StockCheckItemEdit.html"
index 7b72638..0f38bf1 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/Gy_StockCheckItemEdit.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/Gy_StockCheckItemEdit.html"
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
<div id="layout1" class="layui-fluid">
@@ -52,7 +53,7 @@
</div>
</div>
</div>
- <div class="layui-form-item">
+ <div class="layui-form-item" hidden>
<div class="layui-inline">
<label class="layui-form-label">鎴鏃ユ湡</label>
<div class="layui-input-inline">
@@ -213,9 +214,10 @@
$("#HOrgID").val(sessionStorage["OrganizationID"]);
}
$("#HNumber").val("");
- laydate.render({
- elem: '#HEndDate'
- });
+ //laydate.render({
+ // elem: '#HEndDate'
+ //});
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
}
//缂栬緫
function set_EditFromGrid() {
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 83c94b5..e36c9cd 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"
@@ -822,7 +822,7 @@
var checkStatus = table.checkStatus('mainTable2')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check2').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -857,7 +857,7 @@
var checkStatus = table.checkStatus('mainTable3')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check3').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -891,7 +891,7 @@
var checkStatus = table.checkStatus('mainTable4')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check4').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -925,7 +925,7 @@
var checkStatus = table.checkStatus('mainTable5')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check5').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
@@ -993,7 +993,7 @@
var checkStatus = table.checkStatus('mainTable7')
, data = checkStatus.data;
if (checkStatus.data.length >= 1) {
- var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
+ var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
$('#btn-Check7').addClass("layui-btn-disabled").attr("disabled", true);
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index c1f32ad..45c9c9f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -594,6 +594,7 @@
$("#HBarCode").focus();
var option;
var HModName = "Cj_StationOutBill";
+ var FirstEndHProcNo = 0; // 榛樿0 棣栭亾宸ュ簭1 鏈亾宸ュ簭2
//杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
@@ -990,6 +991,11 @@
, "HCenterName": data.宸ヤ綔涓績
, "HCenterID": data.HCenterID
});
+ if (data.棣栭亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 1;
+ } else if (data.鏈亾宸ュ簭 == "鏄�") {
+ FirstEndHProcNo = 2;
+ }
$("#HProcNo").attr("readonly", "readonly");
$("#HProcNo").css("background-color", "#efefef4d");
layer.close(index);
@@ -1184,6 +1190,17 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ if (sessionStorage["OrganizationID"] == 100038) {
+ if (FirstEndHProcNo == 1) {
+ //姹囨姤
+ GetInStorage();
+ } else if (FirstEndHProcNo == 2) {
+ //鍏ュ簱
+ BtnRK();
+ //鎶ュ簾
+ BtnBF();
+ }
+ }
if (result.Verify == "Y") {
location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
}
@@ -1206,85 +1223,17 @@
//姹囨姤
form.on('submit(btn-InStorage)', function (data) {
- var InterID = $("#HInterID").val();
- var BillNo = $("#HBillNo").val();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 });
- }
- },
- error: function (err) {
- layer.alert(err.Message, { icon: 5 });
- }
- });
+ GetInStorage();
});
-
//鍏ュ簱
form.on('submit(btn-RK)', function (data) {
- var BillNo = $("#HBillNo").val();
-
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "BillNo": BillNo},
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 });
- }
- },
- error: function (err) {
- layer.alert(err.Message, { icon: 5 });
- }
- });
+ BtnRK();
});
-
//鎶ュ簾
form.on('submit(btn-BF)', function (data) {
- var BillNo = $("#HBillNo").val();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_ProcessMangement/SaveBFBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "BillNo": BillNo },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 });
- }
- },
- error: function (err) {
- layer.alert(err.Message, { icon: 5 });
- }
- });
+ BtnBF();
});
//鍒楄缃�
@@ -1656,7 +1605,7 @@
})
//#endregion
- //#region 鍙嶅鏍告柟娉�
+ // 鍙嶅鏍告柟娉�
function set_AbandonCheck() {
var wait = layer.load();
$.ajax({
@@ -1679,6 +1628,86 @@
});
}
+ //姹囨姤
+ function GetInStorage() {
+ var InterID = $("#HInterID").val();
+ var BillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //鍏ュ簱
+ function BtnRK() {
+ var BillNo = $("#HBillNo").val();
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "BillNo": BillNo },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //鎶ュ簾
+ function BtnBF() {
+ var BillNo = $("#HBillNo").val();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_ProcessMangement/SaveBFBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "BillNo": BillNo },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1