From e67b68f62ab103ca0b4d3252fdd92d905780df16 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期二, 25 十月 2022 15:10:51 +0800 Subject: [PATCH] 条码生成完善 --- WebTM/views/PublicPage/MaterialInfo.html | 279 ++++++++++++++++++++++++++++++++++ WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 148 +++++++++++++++++- WebTM/WebTM.csproj | 1 3 files changed, 420 insertions(+), 8 deletions(-) diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 9241518..8d23381 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -138,6 +138,7 @@ <Content Include="views\index - 澶嶅埗.html" /> <Content Include="views\indexMenu.html" /> <Content Include="views\IpadStepIndex.html" /> + <Content Include="views\PublicPage\MaterialInfo.html" /> <Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" /> <Content Include="views\PublicPage\MouldMaintainRuleInterList.html" /> <Content Include="views\PublicPage\OrderBackInfomation.html" /> diff --git a/WebTM/views/PublicPage/MaterialInfo.html b/WebTM/views/PublicPage/MaterialInfo.html new file mode 100644 index 0000000..7554d4b --- /dev/null +++ b/WebTM/views/PublicPage/MaterialInfo.html @@ -0,0 +1,279 @@ +锘�<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>鐗╂枡璧勬枡</title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all"> + <script src="../../layuiadmin/layui/layui.js"></script> + <script src="../../layuiadmin/treeTable.js"></script> + <script src="../../layuiadmin/Scripts/json2.js"></script> + <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script> + <script src="../../layuiadmin/Scripts/webConfig.js"></script> + <script src="../../layuiadmin/layui/lay/modules/util.js"></script> + <style media="screen"> + .custom-tree-item-clicked { + color: #FC9003 + } + </style> +</head> +<body> + <div class="layui-fluid"> + <div class="layui-col-md12"> + <div class="layui-card" style="padding: 1px"> + <div class="layui-card-body" style="padding: 1px;"> + <form class="layui-form" action="" lay-filter="component-form-group"> + <div class="layui-collapse"> + <div class="layui-colla-item"> + <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;"> + <div class="layui-row" style="padding:10px 0"> + <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;"> + <div id="treePart" lay-filter="treePart" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div> + </div> + <div class="layui-col-xs12 layui-inline"> + <div class="layui-row"> + <div class="layui-inline"> + <label class="layui-form-label">鐗╂枡浠g爜</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HNumber" id="HNumber"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鐗╂枡鍚嶇О</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HName" id="HName"> + </div> + </div> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + <div> + <table class="" id="mainTable" lay-filter="mainTable"></table> + </div> + </div> + </div> + </div> + </div> + </div> + </form> + </div> + </div> + </div> + </div> + + <script src="../../layuiadmin/layui/zgqlayui.js"></script> + <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script> + <script> + var treeCkData = { id: 0 }; + var TagId = ""; + var TagParentId = ""; + + layui.config({ + base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index', //涓诲叆鍙fā鍧� + }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () { + var $ = layui.$ + , admin = layui.admin + , layer = layui.layer + , table = layui.table + , form = layui.form + , element = layui.element + , laypage = layui.laypage + , laydate = layui.laydate + , util = layui.util + , tree = layui.tree + //var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷 + //var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃 + var sWhere = " where 1 = 1" + " "; + var sWhere1 = " where 1 = 1" + " "; + + //tree.render({ + // elem: '#treePart', + // data: getData(sWhere), + // showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋 + // id: 'demoId', + // isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆 + // showLine: true,//鏄惁寮�鍚繛鎺ョ嚎 + // onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉 + // click: function (obj) { + // //鐐瑰嚮楂樺厜 + // if (obj.data.id !== treeCkData.id) { + // $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked"); + // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked'); + // treeCkData = obj.data; + // TagId = obj.data.id; + // TagParentId = obj.data.ParentID; + // } + // else { + // $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked'); + // treeCkData = { id: 0 }; + // TagId = ""; + // TagParentId = ""; + // } + + + // $.ajax({ + // url: GetWEBURL() + '/Gy_MaintenanceMode/PartCX', + // type: "GET", + // data: { "HInterID": obj.data.id }, + // success: function (data1) { + // if (data1.count == 1) { + // option.data = data1.data; + // table.render(option); + // layer.close(index); + // } else { + // layer.close(index); + // layer.alert(data1.code + data1.Message, { icon: 5 }); + // } + // }, error: function () { + // layer.close(index); + // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + // } + // }); + // } + //}); + + + var option = { + elem: '#mainTable' + //, toolbar: '#toolbarDemo' + , height: 'full-120' + , page: true + , cellMinWidth: 90 + , cols: [[ + { type: 'radio', fixed: 'left' } + , { field: '鐗╂枡浠撳簱璧勬枡浠g爜', title: '鐗╂枡浠撳簱璧勬枡浠g爜', sort: true } + , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', sort: true } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' } + , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' } + , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�' } + , { field: '杈呭姪灞炴�у悕绉�', title: '杈呭姪灞炴�у悕绉�' } + , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' } + , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' } + , { field: '鎵规', title: '鎵规' } + , { field: '鏁伴噺', title: '鏁伴噺' } + , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜' } + , { field: '浠撳簱', title: '浠撳簱' } + , { field: '浠撲綅浠g爜', title: '浠撲綅浠g爜' } + , { field: '浠撲綅', title: '浠撲綅' } + , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' } + , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' } + , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' } + , { field: '鎵�灞炵粍缁�', title: '鎵�灞炵粍缁�' } + + ]] + }; + + var index = layer.load(0, { shade: false }); + //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛� + $.ajax({ + url: GetWEBURL() + '/PublicPageMethod/MaterialList', + type: "GET", + data: { "sWhere": SeachFilter(sWhere1) }, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.close(index); + } else { + layer.close(index); + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.close(index); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + + + //鏌ヨ鎸夐挳 + form.on('submit(btnSearch)', function (data) { + var HNumber = $("#HNumber").val(); + var HName = $("#HName").val(); + if (HNumber) { + sWhere += " and 鐗╂枡浠g爜 = '" + HNumber + "'"; + } + if (HName) { + sWhere += " and 鐗╂枡鍚嶇О = '" + HName + "'"; + } + $.ajax({ + url: GetWEBURL() + '/PublicPageMethod/MaterialList', + type: "GET", + data: { "sWhere": sWhere}, + success: function (data1) { + if (data1.count == 1) { + option.data = data1.data; + table.render(option); + layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); + } else { + layer.alert(data1.code + data1.Message, { icon: 5 }); + } + }, error: function () { + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + sWhere = "where 1=1 ";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 + }); + + //浠ヤ笂鏄痩ayui妯″潡 + }); + + //鏌ヨ鏍戠姸鏁版嵁 + function getData(sWhere) { + var treeData; + + $.ajax({ + url: GetWEBURL() + '/Gy_MaintenanceMode/PartLoadTree', + type: "GET", + data: { "sWhere": sWhere }, + async: false, + success: function (result) { + var data = result.data; + //鐢熸垚鏁版嵁瀵硅薄闆嗗悎 + treeData = LoadTree(data); + + } + }); + return treeData; + } + /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/ + function LoadTree(data) { + let map = {}; + let treeData = []; + data.forEach(it => { + map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id + }) + //鐢熸垚缁撴灉闆� + data.forEach(it => { + const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d + if (parent) { + if (!Array.isArray(parent.children)) parent.children = []; + parent.children.push(it); + } else { + treeData.push(it) + } + }) + return treeData; + } + + function SeachFilter(sWhere1) { + var HNumber = $("#HNumber").val(); + var HName = $("#HName").val(); + if (HNumber) { + sWhere += " and HNumber like '%" + HNumber + "%'"; + } + if (HName) { + sWhere += " and HName like '%" + HName + "%'"; + } + return sWhere1; + } + + </script> + +</body> +</html> 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 c804b1e..95abda5 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" @@ -200,6 +200,11 @@ var option2 = []; var sWhere = ""; var sBillType = "3801"; + + var HMaterID = ""; + var HBatchNo = ""; + var BatchNoArray; //鐢ㄦ潵瀛樺偍鑾峰彇鍒扮殑鎵瑰彿锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒� + var HMinQty2 = 0; //鐢ㄦ潵瀛樺偍杈撳叆鐨勬渶灏忓寘瑁呮暟锛屽湪鎵规鎸夐挳鍔熻兘涓敤鍒� //#endregion //#region 杩涘叆椤甸潰鏃㈠姞杞� @@ -285,6 +290,7 @@ break; case "HMinQty": //鏈�灏忓寘瑁呮暟閲� value = isNaN(value) ? 0 : value; + HMinQty2 = value; //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪�� var HQty = isNaN(data.HQty) ? 0 : data.HQty; if (HQty == 0) //闄ゆ暟涓�0 { @@ -389,7 +395,10 @@ data: { "msg": Str }, //traditional: true, success: function (result) { + HMaterID = result.list[0].HMaterID; + HBatchNo = result.list[0].HBatchNo; if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + BatchNoArray = result.list; //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪�� table.reload('mainTable', { data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸 }); @@ -458,6 +467,106 @@ var sMainSub = sSubStr + ';' + HOrgType + ';' + HSourceBillType + ';' + HSelectBarCodeType + ';' + CampanyName + ';' + UserName; SaveBarCodeCreate(sMainSub); }) + + //閲嶇疆 + form.on('submit(ToolReset)', function (data) { + layer.confirm('纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�',{ + btn: ['纭畾', '鍙栨秷'], + title: "鎻愮ず", + icon: 3, + }, function (index) { + $("#HOrgID").find("option").remove(); //娓呴櫎婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗕腑鐨勫�� + set_HOrg(); //璋冪敤鑾峰彇婧愬崟绫诲瀷閫夋嫨涓嬫媺妗嗙殑鍊� + $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡 + $("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」 + $("#HBarCodeType").val('0'); + var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark:''}] + table.reload('mainTable', { + data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸 + }); + layer.close(index) + }) + }) + + //搴撳瓨 + form.on('submit(ToolStock)', function (data) { + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '鐗╂枡璧勬枡', + closeBtn: 1, + shift: 2, + area: ['80%', '80%'], + maxmin: true, + content: ['../../PublicPage/MaterialInfo.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺, HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }] + //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊� + table.reload('mainTable', { + data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸 + }); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + } + }); + }); + + //鍚屾璧勬枡 + form.on('submit(ToolSynch)', function (data) { + $.ajax({ + url: GetWEBURL() + '/Sc_BarCode/Sync_data', + type: "GET", + //data: { "sWhere": SeachFilter(sWhere1) }, + success: function (data1) { + if (data1.code == 1) { + layer.alert(data1.Message) + } + }, error: function () { + layer.close(index); + layer.alert(data1.Message, { icon: 5 }); + } + }); + }); + + //鎵规 + form.on('submit(ToolBatch)', function (data) { + if (HMinQty2 == 0 && HMaterID) { + $.ajax({ + url: GetWEBURL() + '/Sc_BarCode/Batch', + type: "GET", + data: { "HMaterID": HMaterID, "HBatchNo": HBatchNo }, + success: function (data1) { + if (data1.code == 1) { + BatchNoArray[0].HBatchNo = data1.data + BatchNoArray[0].HMinQty = HMinQty2 + console.log(BatchNoArray) + table.reload('mainTable', { + data: BatchNoArray // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸 + }); + layer.alert(data1.Message) + } + }, error: function () { + layer.alert(data1.Message, { icon: 5 }); + } + }); + } else { + layer.alert('璇锋偍鍦ㄨ幏鍙栨壒鍙峰悗鍦ㄨ緭鍏ユ渶灏忓寘瑁呮暟 ^_^||') + } + }); //閫�鍑� form.on('submit(ToolExit)', function (data) { @@ -1009,12 +1118,35 @@ //鏉$爜鎵撳嵃 function get_PrintReport() { - var checkStatus = table.checkStatus('mainTable2') - , data = checkStatus.data; + var checkStatus = table.checkStatus('mainTable1') + , dataArr = checkStatus.data; + + //鐢变簬鏉$爜淇℃伅鍒楄〃涓病鏈� HItemID 瀛楁锛屾墍浠ラ噰鍙栦簡鐢� 鏉$爜缂栧彿 鍘昏幏鍙� HItemID 鐨勬柟寮� + + var itemIdArr = []; //鍌ㄥ瓨HItemID + + for (let i = 0; i < dataArr.length; i++) { + var sWhere = dataArr[i].HBarCode2 + $.ajax({ + type: "GET", + url: GetWEBURL() + "/Sc_BarCode/Get_HItemId", + async: true, + data: { "sWhere": sWhere }, + success: function (result) { + //杩欒竟灏� HItemID 瀛樺叆itemIdArr鏁扮粍 + itemIdArr.push(result.data[0].HItemID) + }, + error: function (result) { + console.log(result); + //layer.msg('鑾峰彇鏁版嵁鍑虹幇寮傚父', { icon: 2, time: 2000 }); + } + }); + } + if (checkStatus.data.length>0) { var rows = ''; - for (var i = 0; i < data.length; i++) { - rows += data[i].HItemID.toString() + ','; + for (var i = 0; i < itemIdArr.length; i++) { + rows += itemIdArr[i].toString() + ','; } rows = rows.substring(rows.length - 1, 0); layer.open({ @@ -1043,10 +1175,10 @@ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") { sSubStr = JSON.parse(sSubStr); for (var i = 0; i < sSubStr.length; i++) { - if (sSubStr[i].HMainID == "") { - layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,婧愬崟淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return Result = false; - } + //if (sSubStr[i].HMainID == "") { + // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,婧愬崟淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + // return Result = false; + //} if (sSubStr[i].HMaterID == "") { layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); return Result = false; -- Gitblit v1.9.1