From 1382e7f901677dce9db97ba25d9095668c1cb67f Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 10 三月 2021 19:49:36 +0800
Subject: [PATCH] 2021-03-10统一更新
---
WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html | 201 ++++++++++++++++++++++++++++++--------------------
1 files changed, 120 insertions(+), 81 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
index 7e19277..1e71bbb 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html"
@@ -115,14 +115,6 @@
</div>
<!--瀹炵墿涓婃灦-->
<div class="layui-tab-item layui-show">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">瀹炵墿鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
<div class="layui-form-item" style="padding:0px;margin:0px">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -133,7 +125,7 @@
<input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs1">
- <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+ <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT" style="display:none;">...</button>
</div>
</div>
</div>
@@ -149,6 +141,14 @@
<div class="layui-col-xs1">
<button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
</div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">瀹炵墿鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
</div>
</div>
<table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
@@ -276,13 +276,13 @@
, cellMinWidth: 90
, cols: [[
{ type: 'numbers', title: '搴忓彿' }
- //, { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true }
+ , { field: 'HIsStatus', title: '鏄惁鎵爜' }
, { field: 'HMTONo', title: '鎵瑰彿' }
, { field: 'HSPID', title: '浠撲綅ID', hide: true }
- , { field: 'HSPName', title: '浠撲綅' }
+ , { field: 'HSPName', title: '浠撲綅', hide: true }
, { field: 'HStatus', title: '鍦ㄥ簱鐘舵��' }
, { field: 'HWhID', title: '浠撳簱ID', hide: true }
- , { field: 'HWhName', title: '浠撳簱', width: 130 }
+ , { field: 'HWhName', title: '浠撳簱', width: 130, hide: true }
, { field: 'HSourceInterID', title: '婧愬崟ID', hide: true }
, { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 }
, { field: 'HGroupID', title: '鐝粍ID', hide: true }
@@ -315,8 +315,8 @@
option2.data = [];
table.render(option2);
- //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓�
- $("#HBarCode").focus();
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄤ粨浣嶄笂
+ $("#HSPName").focus();
//鎵簮鍗曪紙鍖呰鍗曟潯鐮侊級--寮冪敤
$('#HBarCode_Pack').on('keydown', function (event) {
@@ -435,59 +435,82 @@
//鎵疄鐗╂潯鐮�
$('#HBarCode').on('keydown', function (event) {
- var HBarCode = $('#HBarCode').val()
+ var HBarCode = $('#HBarCode').val();
if (event.keyCode == 13) {
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
- type: "GET",
- data: { "HBarCode": HBarCode },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var sSubStr = result.data;
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HIsStatus == "鏄�") {
- layer.close(index);
- $('#HBarCode').val("");
- layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "鍦ㄥ簱") {
- layer.close(index);
- layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"锛屼笉鍏佽鎵爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else {
- var data = result.data;
- option2.data = data;
- table.render(option2);
- sSubStr = table.cache['bzd-table2'];
- sSubStr[i].HIsStatus = "鏄�";
- sSubStr[i].HSourceID = $("#HSourceID").val();
- sSubStr[i].HSource = $("#HSource").val();
- sSubStr[i].HGroupID = $("#HGroupID").val();
- sSubStr[i].HGroup = $("#HGroup").val();
- sSubStr[i].HInterID = $("#HInterID").val();
- sSubStr[i].HBillNo = $("#HBillNo").val();
- sSubStr[i].HMakerID = $("#HMakerID").val();
- sSubStr[i].HMaker = $("#HMaker").val();
- option2.data = table.cache["bzd-table2"];
- table.render(option2);
- layer.close(index);
- $('#HBarCode').val("");
- layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+ if ($("#HSPID").val() == 0) {
+ layer.msg("璇峰厛鎵弿浠撲綅鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ else
+ {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var sSubStr = result.data;
+ var tableStr = table.cache['bzd-table2'];
+ for (var i = 0; i < tableStr.length; i++) {
+ if (tableStr[i].HBarCode == sSubStr[0].HBarCode) {
+ layer.close(index);
+ $('#HBarCode').val("");
+ layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
}
- }
+ var last = tableStr.length;
+ //if (tableStr.length >0 && tableStr[i-1].HBarCode == sSubStr[0].HBarCode) {
+ // layer.close(index);
+ // $('#HBarCode').val("");
+ // layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //}
+ //else if (sSubStr[i].HStatus == null || sSubStr[i].HStatus == "" || sSubStr[i].HStatus == "鍦ㄥ簱")
+ //{
+ // layer.close(index);
+ // layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"锛屼笉鍏佽鎵爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //}
+ //else {
+ //var data = result.data;
+ option2.data.push(sSubStr[0]);
+ table.render(option2);
+ sSubStr = table.cache['bzd-table2'];
+ sSubStr[last].HIsStatus = "鏄�";
+ sSubStr[last].HSourceID = $("#HSourceID").val();
+ sSubStr[last].HSource = $("#HSource").val();
+ sSubStr[last].HGroupID = $("#HGroupID").val();
+ sSubStr[last].HGroup = $("#HGroup").val();
+ sSubStr[last].HInterID = $("#HInterID").val();
+ sSubStr[last].HBillNo = $("#HBillNo").val();
+ sSubStr[last].HMakerID = $("#HMakerID").val();
+ sSubStr[last].HMaker = $("#HMaker").val();
+ sSubStr[last].HSPName = $("#HSPName").val();
+ sSubStr[last].HSPID = $("#HSPID").val();
+ sSubStr[last].HWHID = $("#HWHID").val();
+ sSubStr[last].HWhName = $("#HWHName").val();
+ option2.data = table.cache["bzd-table2"];
+ table.render(option2);
+ layer.close(index);
+ $('#HBarCode').val("");
+ layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+ //}
+ //}
- }
- else {
- option2.data = [];
- table.render(option2);
+ }
+ else {
+ option2.data = [];
+ table.render(option2);
+ layer.close(index);
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
layer.close(index);
- layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- },
- error: function (err) {
- layer.close(index);
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ });
+ }
}
});
@@ -571,16 +594,16 @@
if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
{
//鍒ゆ柇涓婃灦搴撲綅鏄惁涓庢潯鐮佷腑搴撲綅涓�鑷�
- var tableData = table.cache['bzd-table2'];
- if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
- layer.msg("褰撳墠搴撲綅涓庡疄闄呬笉绗︼紒", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //var tableData = table.cache['bzd-table2'];
+ //if ($("#HWHID").val() != tableData[0].HWhID || $("#HSPID").val() != tableData[0].HSPID) {
+ // layer.msg("褰撳墠搴撲綅涓庡疄闄呬笉绗︼紒", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
var index = layer.load();
$.ajax(
{
type: "POST",
- url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
+ url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
//url:"http://localhost:12761/LookingFor/set_SaveLookingForReturnBill_Json",
async: true,
data: { "oMain": sSubStr },
@@ -630,19 +653,35 @@
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var tableData = table.cache['bzd-table2'];
- if (tableData.length == 0) {
- layer.msg("璇峰厛鎵疄鐗╂潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
- layer.msg("姝ゅ簱浣嶄笌瀹為檯涓嶇锛�", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else {
- $("#HSPName").val(result.data[0].HName);
- $("#HSPID").val(result.data[0].HItemID);
- $("#HWHID").val(result.data[0].HWHID);
- $("#HWHName").val(result.data[0].HWhName);
- }
+ //var tableData = table.cache['bzd-table2'];
+ //if (tableData.length == 0) {
+ // layer.msg("璇峰厛鎵疄鐗╂潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if (result.data[0].HWHID != tableData[0].HWhID || result.data[0].HItemID != tableData[0].HSPID) {
+ // layer.msg("姝ゅ簱浣嶄笌瀹為檯涓嶇锛�", { icon: 4, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //} else {
+ $("#HSPName").val(result.data[0].HName);
+ $("#HSPID").val(result.data[0].HItemID);
+ $("#HWHID").val(result.data[0].HWHID);
+ $("#HWHName").val(result.data[0].HWhName);
+ //鍚敤mes浠撲綅锛屾牴鎹�佷粨搴撹浆鎹㈡垚鏂颁粨搴�
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
+ type: "GET",
+ data: { "HERPWHID": $("#HWHID").val() },
+ success: function (result) {
+ if (result.count == 1) {
+ $("#HWhID").val(result.data[0].HMESWHID);
+ $("#HWHName").val(result.data[0].HMESWHNAME);
+ $("#HBarCode").focus();
+ }
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
}
else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
--
Gitblit v1.9.1