From cfc4f0346a6d7f1514a837f095efccda9434398d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 20 八月 2024 12:36:24 +0800
Subject: [PATCH] 1
---
WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 7 +++++++
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html | 2 +-
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 4 ++--
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_PDA.html | 2 +-
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 9 ++++++++-
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html | 9 ++++++++-
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_PDA.html | 2 +-
8 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 4c205c4..2aefa35 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- /*var WEBURL = "http://localhost/API/"; */ //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- /*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
/*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; //鐜嬪浆鏈湴閰嶇疆
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
index 87094d4..00d3fad 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA.html"
@@ -2136,7 +2136,7 @@
layer.load(3)
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_New_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
success: function (result) {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
index 2ca55d0..d360534 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepInBill_PDA.html"
@@ -1567,7 +1567,7 @@
layer.load(3)
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_New_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
success: function (result) {
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
index efee826..740a25d 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockStepOutBill_PDA.html"
@@ -1780,7 +1780,7 @@
layer.load(3)
$.ajax({
type: "GET",
- url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_Json",
+ url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_New_Json",
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": sHSCWHID, "HSCSPID": sHSCSPID, "HQty": sHQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sSourceBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
success: function (result) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 278e638..9d30fab 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -522,11 +522,11 @@
}
//涓嬮檺
else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
- var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
$("#HCPK").val(HDownLimit.toFixed(4));
} else {
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), s_AVG, "-"), (3 * s_CPK), "/");
- var HDownLimit = calc(calc(s_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
+ var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
if (s_CPK == 0) {
$("#HCPK").val(0);
} else {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
index d3202ff..782c7c3 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_Fast.html"
@@ -1184,7 +1184,14 @@
});
//鎵潯鐮�
- function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ function GetMeesageByBarCode(obj) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHNAME").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
var sOldBarCode = $('#HBarCode').val()
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 0a94dba..934c2ed 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -1662,7 +1662,14 @@
});
//鎵潯鐮�
- function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
+ function GetMeesageByBarCode(obj) {
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHNAME").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
var sOldBarCode = $('#HBarCode').val()
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
index c4bf787..8b537d5 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html"
@@ -1093,6 +1093,13 @@
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sSubStr = table.cache['wl-table'];
+ //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+ if ($("#HWHNAME").val() == '') {
+ $("#HWHID").val("0");
+ }
+ if ($("#HStockPlaceName").val() == '') {
+ $("#HStockPlaceID").val("0");
+ }
var sBarCode = $('#HBarCode').val()
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").val()
--
Gitblit v1.9.1