From 9fc747c8fe1b492e0e82da57a60f4ac17ef196d8 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 22 二月 2021 22:28:09 +0800
Subject: [PATCH] 1、上架归还单：先扫条码再扫货架，如果不匹配不允许提交。2、下架找货单：已下架的条码允许再次下架。
---
WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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_LookingForBill.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_LookingForBill.html"
index aa02308..806fc05 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_LookingForBill.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_LookingForBill.html"
@@ -217,11 +217,11 @@
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
, { field: '鍗虫椂搴撳瓨', title: '鍗虫椂搴撳瓨' }
, { field: 'HBarCode', title: '鏉＄爜缂栧彿', hide: true }
- , { field: 'HInterID', title: '鍗曟嵁ID' }
+ , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
, { field: 'HBillNo', title: '鍗曟嵁鍙�' }
- , { field: 'HMakerID', title: '鍒跺崟浜篒D' }
+ , { field: 'HMakerID', title: '鍒跺崟浜篒D', hide: true }
, { field: 'HMaker', title: '鍒跺崟浜�' }
- , { field: 'HBillType', title: 'HBillType' }
+ , { field: 'HBillType', title: 'HBillType', hide: true }
]]
, text: {
none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔簮鍗曞彿锛�' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
@@ -319,10 +319,14 @@
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("璇ュ疄鐗╁湪瑁佸垏涓紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- } else {
+ }
+ //else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus != "" && sSubStr[i].HStatus != "鍦ㄥ簱")
+ //{
+ // layer.close(index);
+ // layer.msg("璇ュ疄鐗╁湪" + sSubStr[i].HSource+"瑁佸垏涓紝涓嶅厑璁告壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ //}
+ else
+ {
sSubStr[i].HIsStatus = "鏄�";
sSubStr[i].HSourceID = $("#HSourceID").val();
sSubStr[i].HSource = $("#HSource").val();
@@ -452,15 +456,15 @@
async: true,
data: { "oMain": sSubStr },
dataType: "json",
- success: function (data) {
- if (data.count == 1) {
- layer.confirm(data.Message, {
- icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- btn2: function () {
- //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- parent.location.href = "../../../views/index.html"
- }//鍏抽棴
+ success: function (result) {
+ if (result.count == 1) {
+ layer.confirm(result.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ parent.location.href = "../../../views/index.html"
+ }//鍏抽棴
}, function () { window.location.reload(); });//鏂板
}
else {
--
Gitblit v1.9.1