From db2680cc2a5d4900231f87d599982736215bb027 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 16 四月 2023 21:47:52 +0800
Subject: [PATCH] 界面优化，条码批量删除
---
WebTM/views/车间管理/工序流转卡/Sc_ProcessSendWorkList.html | 2
WebTM/views/home/console.html | 4
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html | 2
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 145 ++++++++++++++++++++++++------------
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html | 5 +
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 65 ++++++++-------
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 5 +
7 files changed, 143 insertions(+), 85 deletions(-)
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 83ae111..8055601 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -62,9 +62,9 @@
</a>
</li>
<li class="layui-col-xs3">
- <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
+ <a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
<i class="layui-icon layui-icon-addition"></i>
- <cite>宸ヤ綔涓績鍒楄〃</cite>
+ <cite>鏉＄爜涓绘。缁存姢</cite>
</a>
</li>
<li class="layui-col-xs3">
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/Kf_MoveStockBill_Fast.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/Kf_MoveStockBill_Fast.html"
index aabcfc2..434ecc0 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/Kf_MoveStockBill_Fast.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/Kf_MoveStockBill_Fast.html"
@@ -123,7 +123,7 @@
<label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
</div>
<div class="layui-col-xs8">
- <select name=" HBillSubType" id="HBillSubType">
+ <select name="HBillSubType" id="HBillSubType">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
@@ -465,9 +465,52 @@
var HSourceBillType = params[params[1]]; //鐢ㄤ簬鍒ゆ柇婧愬崟绫诲瀷
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ type: "GET",
+ data: { "HBillType": '1207' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+ //鑾峰彇鍗曟嵁瀛愮被鍨�
+ var HBillSubType = '';
+ var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
+ type: "GET",
+ data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
+ }
+ $("#HBillSubType").append(HBillSubType);
+ if (HSourceBillType == 1402) { //鍙戣揣閫氱煡鍗�
+ $("#HBillSubType").val("ZJDB02_SYS"); //鍗曟嵁绫诲瀷榛樿涓哄瘎鍞�
+ }
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(linterid);
+ RoadBillSub(linterid);
+ }
+
if (HSourceBillType == 1402) { //鍙戣揣閫氱煡鍗�
$("#HBillType").val(1402);
-
+
} else if (HSourceBillType == 1243) { //璋冩嫧鐢宠鍗�
$("#HBillType").val(1243);
@@ -621,49 +664,7 @@
layer.closeAll("loading");
}
});
- }
-
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNumPDA",
- type: "GET",
- data: { "HBillType": '1207' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- //鑾峰彇鍗曟嵁瀛愮被鍨�
- var HBillSubType = '';
- var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
- $.ajax({
- url: GetWEBURL() + "/WEBSController/GetBillSubType_Json",
- type: "GET",
- data: { "HBillType": '1207', "HStockOrgID": HStockOutOrgID },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- HBillSubType += '<option value="' + data[i].HNumber + '">' + data[i].HName + '</option>';
- }
- $("#HBillSubType").append(HBillSubType);
- form.render('select');
- }
- layer.closeAll("loading");
- }
- })
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid);
- RoadBillSub(linterid);
- }
-
-
+ }
//閫夋嫨鍏堣繘鍏堝嚭浠撳簱
form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
@@ -1151,10 +1152,13 @@
$("#HSourceBillNo").attr("readonly", "readonly");
}
layer.load(3);
- element.tabChange('tab-MoveStockBill', '3');
- //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
- $("#HBarCode").focus();
+ if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+ element.tabChange('tab-MoveStockBill', '2');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HWHNAME").focus();
+ }
+
$.ajax({
url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
type: "GET",
@@ -1457,7 +1461,50 @@
//$("#HStockPlaceID").val(result.data[0].HItemID);
$("#HWHID").val(result.data[0].HItemID);
$("#HWHNAME").val(result.data[0].HName);
- element.tabChange('tab-POStockInBill', '2');
+ //element.tabChange('tab-POStockInBill', '2');
+ if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+ element.tabChange('tab-MoveStockBill', '2');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HWHNAME").focus();
+ }
+ }
+ else {
+ // $("#verifycode").click();
+ //layer.msg(result.Message, { icon: 5 });
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ }
+ });
+ // layer.msg($('#HSourceBillNo').val(), { icon: 1 });
+ }
+ });
+
+ //鎵皟鍑轰粨搴�
+ $('#HSCWHNAME').on('keydown', function (event) {
+ var HBarCode = $('#HSCWHNAME').val()
+ if (event.keyCode == 13) {
+ if (!HBarCode) {
+ layer.msg('鏃犱粨搴撴潯鐮佷俊鎭紒');
+ return;
+ }
+ //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
+ $.ajax({
+ url: GetWEBURL() + "/LookingFor/getWHName_Json",
+ type: "GET",
+ data: { "HBarCode": HBarCode },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //$("#HStockPlaceName").val(result.data[0].HName);
+ //$("#HStockPlaceID").val(result.data[0].HItemID);
+ $("#HSCWHID").val(result.data[0].HItemID);
+ $("#HSCWHNAME").val(result.data[0].HName);
+ //element.tabChange('tab-POStockInBill', '2');
+ if (HSourceBillType == 1402 || HSourceBillType == 1214) { //鍙戣揣閫氱煡鍗晐|鐢熶骇鍙戞枡閫氱煡鍗�
+ element.tabChange('tab-MoveStockBill', '2');
+ //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉＄爜涓�
+ $("#HSCWHNAME").focus();
+ }
}
else {
// $("#verifycode").click();
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index bdddf81..984fab4 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -506,7 +506,10 @@
HBatchNo = result.list[0].HBatchNo;
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
for (let i = 0; i < result.list.length; i++) {
- result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0] //淇濈暀灏忔暟鐐瑰悗涓や綅灏忔暟
+ result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0] //淇濈暀灏忔暟鐐瑰悗涓や綅灏忔暟
+ if (result.list[i].HMinQty != 0) {
+ result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
+ }
}
BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
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 520265f..a0196ca 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"
@@ -134,40 +134,45 @@
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
- case 'btn-Delete':
+ case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (checkStatus.data.length == 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁锛�');
+ return;
+ }
+ var mainid = "";
+ for (i = 0; i < data.length; i++) {
+ mainid += data[i].hmainid.toString() + ",";
+ }
+ mainid = mainid.substring(0, mainid.length - 1)
+ var oData = JSON.stringify(mainid) + ";" + sessionStorage["HUserName"];
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "Gy_MaterialController/DeltetBarCodeBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "oData": oData },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
break;
case 'btn-print':
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
index a850541..9f8283f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessSendWorkList.html"
@@ -137,7 +137,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+ var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID","hentryid","鐢熶骇杞﹂棿ID","缁勭粐ID","浜у搧ID","鍗曚綅ID","鐢熶骇璧勬簮ID","鎿嶄綔宸D","鐝粍ID","HWWOrderEntryID","HWWOrderInterID","ieid"];
var option = [];
var HModName = "Sc_ProcessSendWorkList";
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
index a1500f9..068d32b 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_FastList.html"
@@ -237,12 +237,15 @@
form.on('submit(cmdRescind)', function () {
var checkStatus = table.checkStatus('yd-table');
var checkStatus2 = table.checkStatus('sy-table');
+ var checkStatus3 = table.checkStatus('dj-table');
var data = "";
if (checkStatus.data.length != 0) {
data = checkStatus.data;
} else if (checkStatus2.data.length != 0) {
data = checkStatus2.data;
- } else {
+ } else if (checkStatus3.data.length != 0) {
+ data = checkStatus3.data;
+ } else {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
var sInterID = data[0].HInterID
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_POStockInBill_FastList.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_POStockInBill_FastList.html"
index e1a680d..15a1d41 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_POStockInBill_FastList.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_POStockInBill_FastList.html"
@@ -234,7 +234,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
--
Gitblit v1.9.1