From 0d9348eecb09c09f5ec7c59b608170382e8d1f2f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 26 六月 2023 09:22:02 +0800
Subject: [PATCH] PDA销售出库扫码校验、校验缓存列表模块功能新增（原单据为扫码生成，审核时对原扫描的条码进行核对）
---
WebTM/WebTM.csproj.user | 2
WebTM/views/领料发货/销售出库/Kf_SellOutBill_CheckList_New.html | 18 +++++----
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Check_New.html | 26 +++++++-----
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 27 +++++++------
WebTM/layuiadmin/Scripts/webConfig.js | 4 +-
5 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index ebfee46..6b35d37 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 4c3b3b2..22e59f6 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
//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/WEBAPI/"; //棰滃鍙板紡鏈烘湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
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_CheckList_New.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_CheckList_New.html"
index a687477..222f821 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_CheckList_New.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_CheckList_New.html"
@@ -164,9 +164,9 @@
$.ajax(
{
type: "Get",
- url: GetWEBURL() + "/WEBSController/DeleteBillList_Json",
- async: true,
- data: { "HInterID": sInterID },
+ url: GetWEBURL() + "/WEBSController/DeleteBillList_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�,
@@ -207,8 +207,9 @@
function DisBillEntryList() {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_TempList_BillCheck_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
success: function (data1) {
var col = [];
@@ -298,8 +299,9 @@
}
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_ICStockBillQueryList_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": HBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
success: function (data1) {
var col = [];
@@ -359,9 +361,9 @@
$.ajax(
{
type: "Get",
- url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_Json",
- async: true,
- data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType },
+ url: GetWEBURL() + "/WEBSController/DeleteICStockBillAndWMS_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
dataType: "json",
success: function (data) {
if (data.count == 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_Check_New.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_Check_New.html"
index 0926da4..cc4e41d 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_Check_New.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_Check_New.html"
@@ -222,8 +222,9 @@
//#region 浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡锛岃幏鍙栧崟鎹俊鎭�
function RoadBillMain(linterid) {
$.ajax({
- url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetSourceBillList_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillNo": lBillNo, "HBillType": HBillType },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
@@ -289,8 +290,9 @@
HBillNo = $('#HBillNo').val()
if (event.keyCode == 13) {
$.ajax({
- url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID},
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -365,8 +367,9 @@
$('#HQty').val("");
}
$.ajax({
- url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HStockOrgID": HStockOrgID },
success: function (result) {
if (result.count == 1) {
@@ -393,7 +396,7 @@
layer.load(3)
}
else {
- layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
}
layer.closeAll("loading");
}
@@ -407,8 +410,9 @@
function DisBillEntryList() {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
type: "GET",
+ url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_Json',
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '' },
success: function (data1) {
var col = [];
@@ -522,7 +526,7 @@
{
type: "POST",
url: GetWEBURL() + "/WEBSController/set_SaveSellOutBill_BillCheck_Json",
- async: true,
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "oMain": sMain },
dataType: "json",
success: function (data) {
@@ -538,14 +542,14 @@
});//鏂板
}
else {
- layer.msg(data.Message, { icon: 5 });
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
//鐏板害鎻愪氦鎸夐挳cmdSaver
document.getElementById("Saver").disabled = false;
}
layer.closeAll("loading");
},
error: function (err) {
- layer.msg("閿欒:" + err, { icon: 5 });
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
//鐏板害鎻愪氦鎸夐挳cmdSaver
document.getElementById("cmdSaver").disabled = false;
}
@@ -587,9 +591,9 @@
$.ajax(
{
type: "Get",
- url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
- async: true,
- data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+ url: GetWEBURL() + "/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
dataType: "json",
success: function (data) {
if (data.count == 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 3e67a13..947183e 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"
@@ -644,8 +644,9 @@
$("#HInterID").val("");
$("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": '1205' },
success: function (d) {
//console.log(d.data);
@@ -1875,18 +1876,18 @@
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
//}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HSecManager").val() == '') {
- layer.msg("鍙戣揣浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ //if ($("#HDeptName").val() == '') {
+ // layer.msg("閮ㄩ棬娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HSecManager").val() == '') {
+ // layer.msg("鍙戣揣浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if ($("#HKeeper").val() == '') {
+ // layer.msg("淇濈浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
//if ($("#HSupName").val() == '') {
// layer.msg("瀹㈡埛娌℃湁閫夋嫨!", { icon: 5 });
// return false;
--
Gitblit v1.9.1