From 8504618273ad3ce337b9593af06173e034f87a95 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 01 二月 2022 10:06:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 18 +++--
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 4
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 4
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 4
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 7 +-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 4
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 11 +++
WebTM/views/采购管理/采购退料单/Cg_PurchaseReturnList.html | 2
WebTM/views/index.html | 4
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 2
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 4
WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html | 2
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html | 2
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 15 +++-
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 7 +-
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 2
WebTM/views/采购管理/退料通知单/Cg_POInStockBackBillList.html | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 6 +-
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 4
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 2
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 7 +-
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 18 +----
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 2
WebTM/views/销售管理/退货通知单/Xs_SeOutStockBackBillList.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 4
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 4
27 files changed, 76 insertions(+), 69 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index c95f10b..dd0ee5a 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -224,8 +224,8 @@
<dd><a lay-href="">璋冩嫧鐢宠鍗昻</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">璋冩嫧鐢宠鍗曠淮鎶�</a></dd>
<dd><a lay-href="浠撳瓨绠＄悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">鐩存帴璋冩嫧鍗曠淮鎶�</a></dd>
- <dd><a lay-href="">鍒嗘寮忚皟鍏ュ崟缁存姢n</a></dd>
- <dd><a lay-href="">鍒嗘寮忚皟鍑哄崟缁存姢n</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>
+ <dd><a lay-href="棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">鍒嗘寮忚皟鍑哄崟缁存姢</a></dd>
</dl>
</dd>
<dd>
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/Gy_WorkCenter.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/Gy_WorkCenter.html"
index 9731bdc..5b48067 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/Gy_WorkCenter.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/Gy_WorkCenter.html"
@@ -232,7 +232,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_WorkCenter/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -320,7 +320,7 @@
$.ajax({
url: GetWEBURL() + 'DeltetGy_WorkCenter',
type: "GET",
- data: { "HItemID": ItemID },
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
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/Gy_WorkCenter_Add_Edit.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/Gy_WorkCenter_Add_Edit.html"
index aa96d1d..989eeb8 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/Gy_WorkCenter_Add_Edit.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/Gy_WorkCenter_Add_Edit.html"
@@ -292,7 +292,7 @@
layer.msg("璇疯緭鍏ヨ澶囨暟閲忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index 07f3b64..df2ad63 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -173,7 +173,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Group/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -259,9 +259,9 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'Gy_Group/EditBill',
+ url: GetWEBURL() + 'DeltetGy_Group',
type: "GET",
- data: { "HItemID": ItemID },
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
@@ -289,7 +289,6 @@
}
//#endregion
-
//#region 鍒锋柊
function get_Refresh() {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index fe20f15..dba5a96 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -287,7 +287,7 @@
layer.msg("璇疯緭鍏ヤ汉鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Group/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index ab37484..5039ba1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -410,7 +410,7 @@
// layer.msg("璇烽�夋嫨ERP宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return;
//}
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "Gy_Process/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index f54de5b..fc9a707 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -62,7 +62,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曠彮宸ユ椂</label>
<div class="layui-input-inline">
- <input type="text" name="HWorkTimes" id="HWorkTimes" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HWorkTimes" id="HWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -83,7 +83,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍏宠仈ID</label>
<div class="layui-input-inline">
- <input type="text" name="HRelationID" id="HRelationID" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HRelationID" id="HRelationID" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -91,19 +91,19 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍗曠彮鏈�澶у伐鏃�</label>
<div class="layui-input-inline">
- <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HMaxWorkTimes" id="HMaxWorkTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏈�灏忚繘闃�</label>
<div class="layui-input-inline">
- <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HMinAdd" id="HMinAdd" lay-verify="" value="0" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">姣忔棩鐝</label>
<div class="layui-input-inline">
- <input type="text" name="HClassCount" id="HClassCount" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HClassCount" id="HClassCount" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -111,7 +111,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鍔犵彮宸ユ椂</label>
<div class="layui-input-inline">
- <input type="text" name="HOverTimes" id="HOverTimes" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="HOverTimes" id="HOverTimes" value="0" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -348,14 +348,15 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- var sMainStr = JSON.stringify(data.field);
+ var sMainStr = JSON.stringify(data.field) + ";" +sessionStorage["HUserName"];
$.ajax({
type: "POST",
url: GetWEBURL() + "SaveGy_SourceList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainStr },
+ data: {"msg": sMainStr },
dataType: "json",
success: function (data) {
+ console.log(JSON.stringify(data))
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -368,6 +369,7 @@
layer.closeAll("loading");
},
error: function (err) {
+ console.log(JSON.stringify(err))
layer.alert("閿欒:" + err, { icon: 5 });
console.log("Reason" + sMainStr);
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index dd9c433..3959c2b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -181,7 +181,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_Process/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -269,7 +269,7 @@
$.ajax({
url: GetWEBURL() + 'DeltetGy_Process',
type: "GET",
- data: { "HItemID": ItemID },
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index c1c9f1d..667f166 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -173,7 +173,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_Source/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
@@ -242,7 +242,7 @@
$.ajax({
url: GetWEBURL() + 'DeltetGy_Source',
type: "GET",
- data: { "HItemID": ItemID },
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
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 6caaa7f..554b870 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"
@@ -173,7 +173,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillList',
type: "GET",
- data: { "sWhere": sWhere},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -224,7 +224,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL1() + '/Gy_BarCodeBillList/GetBarCodeBillList',
type: "GET",
- data: { "sWhere": sWhere},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
index fedc192..0cc9161 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill.html"
@@ -383,7 +383,7 @@
type: "GET",
data: { "HBillType": '3717' },
success: function (d) {
- //console.log(d.data);
+ //console.log(JSON.stringify(d.data[0].HInterID));
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
index b96468d..fbcff58 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html"
@@ -191,6 +191,8 @@
};
}
+ //#endregion
+
//var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -199,7 +201,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportStepBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -261,14 +263,14 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HItemID = data[0];
+ var HItemID = data[0].hmainid;
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
url: GetWEBURL() + '/Sc_QualityReportStepBill/DeltetSc_QualityReportBill',
type: "GET",
- data: { "HItemID": HItemID },
+ data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -317,7 +319,6 @@
}
}
//#endregion
-
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
@@ -368,15 +369,6 @@
});
//#endregion
-
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
-
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index fbde40a..64e9779 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -917,7 +917,7 @@
// objdata.field.HWasterQty2 = 0;
//}
var sMainStr = JSON.stringify(objdata.field);
- var sMainSub = sMainStr + ';'+ refSav;
+ var sMainSub = sMainStr + ';' + refSav + ";" + sessionStorage["HUserName"];
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index e833679..0dc95a6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -348,7 +348,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_MESProductReportStepBill/Get_Sc_MESProductReportBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -515,6 +515,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
+ console.log(JSON.stringify(data))
var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
var HSourceID = data[0].HSourceID.toString(); //鐢熶骇璧勬簮ID
var HSourceInterID = data[0].HSourceInterID.toString(); //婧愬崟涓诲唴鐮�
@@ -523,7 +524,7 @@
var HICMOInterID = data[0].HICMOInterID.toString();//鐢熶骇璁㈠崟涓籌D
var HICMOEntryID = data[0].HICMOEntryID.toString();//鐢熶骇璁㈠崟瀛怚D
var HInterID = data[0].HInterID.toString();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
- if (HBillStatus > 0)
+ if (HBillStatus > 1)
{
layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
return false;
@@ -571,7 +572,7 @@
var HICMOInterID = data[0].HICMOInterID.toString();//鐢熶骇璁㈠崟涓籌D
var HICMOEntryID = data[0].HICMOEntryID.toString();//鐢熶骇璁㈠崟瀛怚D
var HInterID = data[0].HInterID.toString();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
- if (HBillStatus = 0 || HBillStatus>2) {
+ if (HBillStatus = 1 || HBillStatus>2) {
layer.msg('鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳鎴栬�呭崟鎹凡鐢熸晥涓嶅厑璁稿弽瀹℃牳锛�');
return false;
}
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 1e4835e..3a7c3d8 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"
@@ -226,7 +226,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -330,7 +330,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
type: "GET",
- data: { "HInterID": hmainid },
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 86c54fd..55d22dc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -203,14 +203,19 @@
$.ajax({
url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
type: "GET",
- data: { "page": 1, "limit": 10, "sWhere": sWhere },
+ data: { "page": 1, "limit": 10, "sWhere": sWhere, "user": sessionStorage["HUserName"] },
datatype: "json",
success: function (data1) {
console.log(data1);
- for (var key in data1.list) {
- resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ if (data1.count != 0) {
+ for (var key in data1.list) {
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ set_InitGrid(sWhere);
}
- set_InitGrid(sWhere);
+ else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
}, error: function (err) {
layer.alert(err.Message, { icon: 5 });
}
@@ -249,7 +254,7 @@
title: '缁勬墭鍗曞垪琛�',
cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
id: 'mainTable', //琛ㄦ牸id
- where: { sWhere: sWhere }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ where: { sWhere: sWhere, "user": sessionStorage["HUserName"] }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
page: true, //寮�鍚垎椤�
totalRow: true, //寮�鍚悎璁�
limit: 10, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index 466a467..57c80d9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -249,7 +249,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_PPBomBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 170af91..c50c301 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -497,9 +497,16 @@
refSav = "Update";
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ //绛涢�夊垹闄や箣鍚庝笉涓虹┖鐨勬暟鎹粍
+ var row = [];
+ for (var i = 0; i < table.cache['mainTable'].length; i++) {
+ if (table.cache['mainTable'][i] != "") {
+ row.push(table.cache['mainTable'][i])
+ }
+ }
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
+ var sSubStr = JSON.stringify(row);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
return false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 4542bab..6d2c284 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -326,7 +326,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ICMOReportBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -463,7 +463,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index ef432ff..d4358af 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1308,7 +1308,7 @@
$.ajax({
url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (d) {
//alert(JSON.stringify(d.data[0]))
@@ -1405,7 +1405,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 4897ea7..7375bbb 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -229,7 +229,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -323,7 +323,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
type: "GET",
- data: { "lngBillKey": hmainid },
+ data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
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 f37f830..b067345 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"
@@ -230,7 +230,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -310,7 +310,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -347,6 +347,7 @@
};
});
+ //鍙嶅鏍�
function DeAudit(){
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -357,7 +358,7 @@
$.ajax({
type: "GET",
url: GetWEBURL() + "Cg_POInStockBill/DeAuditPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
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 7e8d80f..547f927 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"
@@ -227,7 +227,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POInStockBackBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html"
index 24499ff..0ddedd4 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\351\200\200\346\226\231\345\215\225/Cg_PurchaseReturnList.html"
@@ -297,7 +297,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_PurchaseReturn/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
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 0997f8a..eb06e0a 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"
@@ -224,7 +224,7 @@
$.ajax({
url: GetWEBURL() + '/Xs_SeOutStockBackBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
index 487cf14..c933258 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBillList.html"
@@ -285,7 +285,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_POStockInBackBill/Get_POStockInBackBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
DataList = data1.data;
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 7256b17..81fb198 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -211,7 +211,7 @@
$.ajax({
url: GetWEBURL() + '/Kf_POStockInBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -241,7 +241,7 @@
shift: 2,
area: ['100%', '100%'],
maxmin: true,
- content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
location.reload();
@@ -265,7 +265,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
, resize: false,
end: function () {
//鍒锋柊椤甸潰,
--
Gitblit v1.9.1