From e517f57a0b0489165012283c5ea40887fa84c943 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 20 十一月 2025 16:59:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport.html | 116 ++
WebTM/WebTM.csproj.user | 4
WebTM/views/基础资料/公用基础资料/xmlzuotuo_xiaowei.aspx | 28
WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html | 713 +++++++++++++++++
WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html | 76 +
WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList.html | 52
WebTM/views/基础资料/公用基础资料/xmlLBM_HGy_BarCodeBill.aspx.cs | 6
WebTM/views/基础资料/公用基础资料/xmlzuotuo_xiaowei.aspx.designer.cs | 26
WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html | 180 ++++
WebTM/views/基础资料/公用基础资料/Gy_MultipleCodes_Report.html | 577 ++++++++++++++
WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html | 2
WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_TK.html | 262 +++++
WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_Clear_PDA.html | 222 ++---
WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html | 32
WebTM/views/home/console_Mobile.html | 6
WebTM/views/条码明细/Kf_BarCodeDetailQuery.html | 53 -
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldFileMainBill.aspx | 2
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 3
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 5
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 1
WebTM/views/车间管理/报表分析/Sc_AllowedPrintProcExchangeBillList.html | 16
WebTM/WebTM.csproj | 12
WebTM/views/基础资料/公用基础资料/xmlzuotuo_xiaowei.aspx.cs | 17
24 files changed, 2,146 insertions(+), 269 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3143505..4913295 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -180,6 +180,7 @@
<Content Include="layuiadmin\zy_dropdown.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
<Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\saomazutuo_xiaowei.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BankList.html" />
@@ -192,6 +193,7 @@
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OperationBill_Report.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MultipleCodes_Report.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PlanImplementation_Report.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_Shifts.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_GroupList.html" />
@@ -336,7 +338,7 @@
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\灏忚溅閿佸畾\Kf_TrolleyPositionBill_PDA.html" />
- <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_Clear_PDA .html" />
+ <Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_Clear_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByXJ_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventory_WorkShopByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByWorkShop_PDA.html" />
@@ -462,6 +464,7 @@
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill_KaiBei.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBill.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_EnvironmentTestItem.html" />
@@ -2657,6 +2660,13 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx.cs">
+ <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx.designer.cs">
+ <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx.cs">
<DependentUpon>xmlLBM_HGy_BarCodeBill_XinDa.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 89909e4..48ade9c 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a1995cc..fa9da17 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,13 +6,13 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
// var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
- // var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
new file mode 100644
index 0000000..e3394f9
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -0,0 +1,713 @@
+锘�<!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/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/MESLanguage.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <style>
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .bottom-btn {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background: white;
+ padding: 15px;
+ border-top: 1px solid #e6e6e6;
+ text-align: right;
+ z-index: 1000;
+ }
+
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ border: none;
+ }
+
+ .btn-c {
+ background-color: #acacac;
+ color: #fff;
+ border: none;
+ }
+
+ .btn-d {
+ background-color: #ff8901;
+ color: #fff;
+ border: none;
+ }
+
+ .result-modal {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 9999;
+ }
+
+ .modal-mask {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: rgba(0, 0, 0, 0.5);
+ }
+
+ .modal-content {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ width: 90%;
+ max-width: 800px;
+ background: #fff;
+ border-radius: 4px;
+ overflow: hidden;
+ }
+
+ .modal-header {
+ padding: 15px;
+ border-bottom: 1px solid #eee;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .modal-body {
+ padding: 15px;
+ max-height: 60vh;
+ overflow-y: auto;
+ }
+
+ .modal-footer {
+ padding: 15px;
+ border-top: 1px solid #eee;
+ display: flex;
+ align-items: center;
+ }
+
+ .form-container {
+ padding-bottom: 80px;
+ }
+
+ .layui-table {
+ width: 100%;
+ }
+
+ .layui-tab-content {
+ min-height: 400px;
+ }
+
+ .layui-form-checkbox[lay-skin=primary] span {
+ padding-left: 28px;
+ }
+
+ .layui-form-checkbox[lay-skin=primary] i {
+ left: 0;
+ }
+ </style>
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" id="btnAddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" id="btnExit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="form-container">
+ <div class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <h1 style="text-align:center;"><b>鎵爜缁勬墭</b></h1>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>鏉＄爜</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-tab" lay-filter="tab-PackUnionBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">瑁呯淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+
+
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDate" id="HDate" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍗曟嵁ID</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HInterID" id="HInterID" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HStockOrgName" id="HStockOrgName" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">璐ㄩ噺瀹℃壒</label>
+ <div class="layui-input-inline">
+ <input type="checkbox" name="HQualityApproval" id="HQualityApproval" lay-skin="primary" title="璐ㄩ噺瀹℃壒">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="bottom-btn">
+ <button type="button" class="layui-btn btn-a" id="btnSubmit">鎻愪氦</button>
+ <button type="button" class="layui-btn btn-d" id="btnDelete">鍒犻櫎</button>
+ <button type="button" class="layui-btn btn-c" id="btnExit2">閫�鍑�</button>
+ </div>
+
+ <div class="result-modal" id="resultModal" style="display: none;">
+ <div class="modal-mask" id="modalMask"></div>
+ <div class="modal-content">
+ <div class="modal-header">
+ <span class="modal-title">瑁呯缁撴灉</span>
+ <i class="layui-icon layui-icon-close" id="closeModal" style="cursor:pointer;"></i>
+ </div>
+ <div class="modal-body">
+ <table class="layui-hide" id="resultTable" lay-filter="resultTable"></table>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="layui-btn btn-a" id="btnAddNew2">鏂板</button>
+ <div style="flex: 1;"></div>
+ <button type="button" class="layui-btn btn-c" id="closeModal2">鍏抽棴</button>
+ <button type="button" class="layui-btn btn-d" id="btnPrint">鎵撳嵃</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+
+ // 鍏叡鍙橀噺
+ var EnableSubmit = true;
+ var HBarCode = '';
+ var tabs = 0;
+ var HBillType = '3783';
+ var HBillSubType = '1';
+ var OperationType = 1;
+ var HMaterNumber_Pack = "";
+ var listData = [];
+ var selectedRows = [];
+ var HModName = "Sc_PackUnionBill_Packing_PDA";
+ var ModRightName = "CE_PackUnionBill_Packing";
+ var titleData = [];
+ var OperationType = 1;
+ var HBarCode_Pack_Temp = "";
+ var tableHeight = 400;
+
+ // 琛ㄥ崟鎻愪氦鍊�
+ var hform = {
+ HDate: getCurrentDate(),
+ HMaker: sessionStorage["Czybm"],
+ HInterID: '',
+ HStockOrgName: sessionStorage["Organization"],
+ HStockOrgID: '1',
+ HQualityApproval: false,
+ HMainID: '',
+ HSubID: '',
+ HSourceBillSEQ: '',
+ HBillNo: '',
+ HMaterNumber: '',
+ HMaterID: '',
+ HMaterName: '',
+ HMaterModel: '',
+ HCusModel: '',
+ HCusMaterName: '',
+ HEmpID: '001',
+ HEmpNumber: '001',
+ HEmpName: 'admin',
+ HGroupID: 0,
+ HGroupNumber: '',
+ HGroupName: '',
+ HMTONo: '',
+ HCheckEmpName: '',
+ HExpiryDate: getCurrentDate(),
+ HExpirationDateFlag: 0,
+ HRemark: '',
+ HCoilNO: '',
+ HFurnaceNO: '',
+ HFactory: '',
+ HAuxQty: 0,
+ HheatNO: '',
+ HProduceDate: getCurrentDate(),
+ HSPID: 0,
+ HSPCode: '',
+ HSPName: '',
+ HWHID: 0,
+ HWHCode: '',
+ HWHName: '',
+ HQtyMust: 0,
+ HQty: 1,
+ HBQty: 1,
+ HMinQty: 1,
+ HPackQty: 0,
+ HPrice: 0,
+ HMoney: 0,
+ HUseLife: 0,
+ HLeaveLife: 0,
+ HDesignLife: 0,
+ };
+ function init() {
+ form.val('formData', hform);
+ getMaxNo();
+ initTable();
+ initResultTable();
+ calculateTableHeight();
+ bindEvents();
+ }
+
+ function getCurrentDate() {
+ var now = new Date();
+ var year = now.getFullYear();
+ var month = (now.getMonth() + 1).toString().padStart(2, '0');
+ var day = now.getDate().toString().padStart(2, '0');
+ return year + '-' + month + '-' + day;
+ }
+
+ // 鑾峰彇鏈�澶у崟鎹彿
+ function getMaxNo() {
+ $.ajax({
+ url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+ type: "GET",
+ data: { "HBillType": HBillType },
+ success: function (d) {
+ var data = d.data[0];
+ if (d.count == 1) {
+ hform.HInterID = data.HInterID;
+ hform.HBillNo = data.HBillNo;
+ form.val('formData', hform);
+ } else {
+ layer.alert(d.Message || '鑾峰彇鍗曟嵁鍙峰け璐�', { icon: 5 });
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍗曟嵁鍙峰け璐ワ紝璇锋鏌ョ綉缁滆繛鎺�', { icon: 5 });
+ }
+ });
+ }
+ function initTable() {
+ table.render({
+ elem: '#mainTable',
+ height: tableHeight,
+ cols: [[
+ { type: 'checkbox', fixed: 'left' },
+ { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 120 },
+ { field: '鏁伴噺', title: '鏁伴噺', width: 100 },
+ { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120 },
+ { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 },
+ { field: '鏉＄爜涓暟', title: '鏉＄爜涓暟', width: 100 },
+ { field: 'HInterID', title: 'HInterID', width: 100, hide: true }
+ ]],
+ data: listData,
+ page: false
+ });
+ }
+
+ function initResultTable() {
+ table.render({
+ elem: '#resultTable',
+ cols: [[
+ { field: '鏍堟澘鐮�', title: '鏍堟澘鐮�', width: 120 },
+ { field: '涓鐮�', title: '涓鐮�', width: 120 },
+ { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 },
+ { field: '鐗╂枡', title: '鐗╂枡', width: 100 }
+ ]],
+ data: [],
+ page: false
+ });
+ }
+
+ function calculateTableHeight() {
+ var windowHeight = $(window).height();
+ var otherElementsHeight = 300; // 浼扮畻鍏朵粬鍏冪礌鐨勯珮搴�
+ tableHeight = windowHeight - otherElementsHeight;
+ table.resize('mainTable');
+ }
+
+ function bindEvents() {
+ $('#HBarCode').on('keydown', function (e) {
+ if (e.keyCode === 13) {
+ GetMeesageByBarCode();
+ }
+ });
+
+ $('#btnSubmit').on('click', function () {
+ cmdSubmit();
+ });
+
+ $('#btnDelete').on('click', function () {
+ cmdDelete();
+ });
+
+ $('#btnPrint').on('click', function () {
+ var resultTableData = table.cache['resultTable'];
+
+ if (resultTableData.length > 0) {
+ var rows = '';
+ for (var i = 0; i < resultTableData.length; i++) {
+ if (resultTableData[i]['鏍堟澘鐮�']) {
+ rows += resultTableData[i]['鏍堟澘鐮�'] + ',';
+ }
+ }
+ if (rows.length > 0) {
+ rows = rows.substring(0, rows.length - 1);
+ }
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill_xiaowei', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
+ }
+ });
+
+ $('#btnAddNew').on('click', function () {
+ toAddNew();
+ });
+
+ $('#btnAddNew2').on('click', function () {
+ toAddNew();
+ });
+
+ $('#btnExit, #btnExit2').on('click', function () {
+ cmdExit();
+ });
+
+ $('#closeModal, #closeModal2, #modalMask').on('click', function () {
+ closeResultTable();
+ });
+
+ $(window).on('resize', function () {
+ calculateTableHeight();
+ });
+ }
+
+ // 鑾峰彇鏉＄爜淇℃伅
+ function GetMeesageByBarCode() {
+ var sBarCode = $('#HBarCode').val();
+ if (!sBarCode) {
+ layer.msg('鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�', { icon: 2 });
+ return;
+ }
+
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei',
+ type: 'GET',
+ data: {
+ "HInterID": hform.HInterID,
+ "HBarCode": sBarCode,
+ "HBillType": HBillType,
+ "HBillSubType": HBillSubType,
+ "HBarCode_Pack": '',
+ "HBillNo": hform.HBillNo,
+ "HMaterNumber_Pack": HMaterNumber_Pack,
+ "HMaker": hform.HMaker,
+ "HStockOrgID": hform.HStockOrgID
+ },
+ success: function (res) {
+ FindMaterial();
+ if (res.count == 1) {
+ layer.msg('鏉＄爜澶勭悊鎴愬姛', { icon: 1 });
+ listData.push({
+ 鏉＄爜缂栧彿: sBarCode,
+ 鏁伴噺: 1,
+ 鐗╂枡浠ｇ爜: hform.HMaterID,
+ 鐗╂枡鍚嶇О: hform.HMaterName,
+ 鏉＄爜涓暟: 1,
+ HInterID: hform.HInterID
+ });
+
+ table.reload('mainTable', {
+ data: listData
+ });
+
+ $('#HBarCode').val('');
+ } else {
+ layer.msg(res.Message || '鏉＄爜澶勭悊澶辫触', { icon: 2 });
+ }
+ },
+ error: function () {
+ layer.msg('鏉＄爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+ }
+ });
+ }
+
+ function FindMaterial() {
+ var sBarCode = $('#HBarCode').val();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Material/findMaterialByNumber',
+ type: 'GET',
+ data: {
+ "HbarCode": sBarCode,
+ "HSTOCKORGID": hform.HStockOrgID
+ },
+ success: function (res) {
+ let data = res.data;
+ if (res.count == 1) {
+ hform.HMaterID = data[0].HMaterID
+ hform.HMaterName = data[0].HMaterName
+ hform.HMaterModel = data[0].HMaterModel
+ }
+ },
+ error: function () {
+ layer.msg('鏉＄爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+ }
+ });
+ }
+
+ function submitPreCheck() {
+ if (!hform.HInterID) {
+ layer.msg('鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�', { icon: 2 });
+ return false;
+ }
+ if (!hform.HBillNo) {
+ layer.msg('鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�', { icon: 2 });
+ return false;
+ }
+ if (listData.length < 1) {
+ layer.msg('娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�', { icon: 2 });
+ return false;
+ }
+ return true;
+ }
+
+ // 鍒犻櫎閫変腑琛�
+ function cmdDelete() {
+ var checkStatus = table.checkStatus('mainTable');
+ if (checkStatus.data.length !== 1) {
+ layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�', { icon: 2 });
+ return;
+ }
+
+ layer.confirm('纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!', { icon: 3, title: '鍒犻櫎纭' }, function (index) {
+ var selectedRow = checkStatus.data[0];
+ var indexToRemove = listData.findIndex(function (item) {
+ return item['鏉＄爜缂栧彿'] === selectedRow['鏉＄爜缂栧彿'];
+ });
+
+ if (indexToRemove > -1) {
+ listData.splice(indexToRemove, 1);
+ }
+
+ table.reload('mainTable', {
+ data: listData
+ });
+
+ layer.msg('鍒犻櫎鎴愬姛!', { icon: 1 });
+ layer.close(index);
+ });
+ }
+
+ // 鎻愪氦
+ function cmdSubmit() {
+ var checkRes = submitPreCheck();
+ if (!checkRes) {
+ return;
+ }
+ EnableSubmit = false;
+ $('#btnSubmit').addClass('layui-btn-disabled').attr('disabled', true);
+
+ // 鐢熸垚鏉＄爜
+ getBarCode_pack().then(function () {
+ console.log(HBillType)
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/set_SavePackUnionBill_Json',
+ type: 'GET',
+ data: {
+ "HInterID": hform.HInterID,
+ "HBillType": HBillType,
+ "HBillNo": hform.HBillNo,
+ "HBarCode_Pack": HBarCode_Pack,
+ "HMaker": hform.HMaker,
+ "HStockOrgID": hform.HStockOrgID
+ },
+ success: function (res) {
+ console.log(HBarCode_Pack);
+ if (res.count == 1) {
+ layer.msg('鎻愪氦鎴愬姛', { icon: 1 });
+
+ getResultTableData();
+ } else {
+ layer.msg(res.Message || '鎻愪氦澶辫触', { icon: 2 });
+ EnableSubmit = true;
+ $('#btnSubmit').removeClass('layui-btn-disabled').attr('disabled', false);
+ }
+ },
+ error: function () {
+ layer.msg('鎻愪氦澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+ EnableSubmit = true;
+ $('#btnSubmit').removeClass('layui-btn-disabled').attr('disabled', false);
+ }
+ });
+ }).catch(function (error) {
+ layer.msg('鏉＄爜鐢熸垚澶辫触: ' + error, { icon: 2 });
+ EnableSubmit = true;
+ $('#btnSubmit').removeClass('layui-btn-disabled').attr('disabled', false);
+ });
+ }
+
+ // 鐢熸垚鏉＄爜
+ function getBarCode_pack() {
+ return new Promise(function (resolve, reject) {
+ var sMainStr = JSON.stringify(hform);
+ var omain = sMainStr + ';' + hform.HStockOrgName + ';' + hform.HEmpName;
+
+ $.ajax({
+ url: GetWEBURL() + '/Sc_BarCode/Sub_SaveBill_xiaowei',
+ type: 'POST',
+ data: { "msg": omain },
+ success: function (res) {
+ if (res.count == 1) {
+ HBarCode_Pack = res.data[0]['鏉＄爜缂栧彿'];
+ resolve(HBarCode_Pack);
+ } else {
+ reject(res.Message || '鏉＄爜鐢熸垚澶辫触');
+ }
+ },
+ error: function () {
+ reject('鏉＄爜鐢熸垚璇锋眰澶辫触');
+ }
+ });
+ });
+ }
+
+ function getResultTableData() {
+ $.ajax({
+ url: GetWEBURL() + '/WEBSController/get_SavePackUnion_xiaowei',
+ type: 'GET',
+ data: { "HBarCode_Pack": HBarCode_Pack },
+ success: function (res) {
+ if (res.count == 1) {
+ var resultData = res.data;
+
+ table.reload('resultTable', {
+ data: resultData
+ });
+
+ $('#resultModal').show();
+ } else {
+ layer.msg(res.Message || '鑾峰彇鏁版嵁澶辫触', { icon: 2 });
+ EnableSubmit = true;
+ $('#btnSubmit').removeClass('layui-btn-disabled').attr('disabled', false);
+ }
+ },
+ error: function () {
+ layer.msg('鑾峰彇缁撴灉鏁版嵁澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+ EnableSubmit = true;
+ $('#btnSubmit').removeClass('layui-btn-disabled').attr('disabled', false);
+ }
+ });
+ }
+
+ // 鏂板
+ function toAddNew() {
+ $('#resultModal').hide();
+ HBarCode_Pack = '';
+ $('#HBarCode').val('');
+ listData = [];
+ table.reload('mainTable', { data: listData });
+ getMaxNo();
+ EnableSubmit = true;
+ $('#btnSubmit').removeClass('layui-btn-disabled').attr('disabled', false);
+ }
+
+
+ function closeResultTable() {
+ $('#resultModal').hide();
+ }
+
+ // 閫�鍑�
+ function cmdExit() {
+ layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+
+ console.log('閫�鍑烘搷浣�');
+ layer.close(index);
+ });
+ }
+
+ init();
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA .html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA.html"
similarity index 72%
rename from "WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA .html"
rename to "WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA.html"
index 6d7b618..c94e0bc 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA .html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\346\237\245\350\257\242/KF_ICInventory_Clear_PDA.html"
@@ -30,25 +30,23 @@
<span style="color: white;"><i class="layui-icon layui-icon-form"></i>杞﹂棿涓婃灦搴撳瓨鏌ヨ</span>
</div>
<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
- <button type="button" lay-submit="" lay-filter="cmdSearch" class="layui-btn layui-btn-radius" id="cmdSearch">鏌ヨ</button>
+ <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn layui-btn-radius" id="cmdDelete">鍒犻櫎</button>
<button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn layui-btn-radius layui-btn-danger" id="cmdCancel">閫�鍑�</button>
</div>
<div class="layui-collapse">
<div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
+ <!--<div class="layui-colla-title layui-inline">
<div class="layui-inline">
<span>鏇村</span>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<div class="layui-col-xs2">
- <label class="layui-form-label" style="width:30px;padding-left:0px;">鏉＄爜</label>
+ <label class="layui-form-label" style="width:30px;padding-left:0px;">鐗╂枡浠ｇ爜</label>
</div>
<div class="layui-col-xs10">
<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
</div>
- </div>
- <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-col-xs2">
<label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
@@ -78,21 +76,20 @@
</div>
</div>
</div>
- </div>
- </div>
- <div class="layui-tab layui-col-xs12" lay-filter="tab-KF_ICInventoryByCLD_PDA">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;">杞﹂棿鍙婃椂搴撳瓨淇℃伅</li>
- </ul>
- <div class="layui-tab-content">
- <!--杞﹂棿鍙婃椂搴撳瓨淇℃伅-->
- <div class="layui-tab-item layui-show">
- <div class="layui-row">
- <div class="layui-col-xs12">
- <div class="layui-form-item" style="padding:0px;margin:0px"></div>
- <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
- </div>
- </div>
+ <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+
+ </div>
+ <!--澶辫触鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs" hidden controls>
+ <source src="../../video/jingbao.wav" type="audio/ogg">
+ </audio>
+ </div>
+ <!--鎴愬姛鎻愮ず闊�-->
+ <div id="" style="display:none;">
+ <audio id="cs2" hidden controls>
+ <source src="../../video/success.wav" type="audio/ogg">
+ </audio>
</div>
</div>
</div>
@@ -118,7 +115,7 @@
var HStockOrgID = sessionStorage["OrganizationID"] //缁勭粐ID
var listOption = [];
var columns = "";
- var HModName = "KF_ICInventory_WorkShopByCLD_PDA";
+ var HModName = "KF_ICInventory_Clear_PDA";
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
var params = get_UrlVars();
var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //1涓虹洿鎺ユā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑
@@ -158,12 +155,7 @@
listOption.data = data;
table.render(listOption);
- if (OperationType == 2) {
- //杩斿洖鐗╂枡浠ｇ爜
- $("#HBarCode").val(HMaterNumber);
- //鏄剧ず琛ㄤ綋鏄庣粏
- DisBillEntryList();
- }
+
}
//鍒濆鍖栬〃鏍�
@@ -361,115 +353,16 @@
//#endregion
- //#region 鎵弿鐗╂枡鏉＄爜
-
- //鎵弿鏉＄爜
- $('#HBarCode').on('keydown', function (event) {
- if (event.keyCode == 13) {
- DisBillEntryList();
- layer.closeAll("loading");
- }
- });
-
- //#endregion
//#region 鍔熻兘鎺т欢
-
- //#region 鏌ヨ
- form.on('submit(cmdSearch)', function (data) {
- DisBillEntryList();
- layer.closeAll("loading");
- });
-
- function DisBillEntryList() {
- //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
- if ($("#HWHName").val() == '') {
- $("#HWHID").val("0");
+ //鍒犻櫎
+ form.on('submit(cmdDelete)', function () {
+ if (set_ModCheck("CE_MaterialUpperClear") == true) {
+ set_DeleteBill();
}
- if ($("#HStockPlaceName").val() == '') {
- $("#HStockPlaceID").val("0");
- }
- var sHBarCode = $('#HBarCode').val()
- var sHWHID = $("#HWHID").val()
- var sHSPID = $("#HStockPlaceID").val()
+ })
- $.ajax({
- type: "GET",
- url: GetWEBURL() + '/KF_ICInventory_WorkShopByMaterID/GetWorkShopICInventory',
- async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
- data: { "HBarCode": sHBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID, "HOWNERID": HStockOrgID, "sWhere": '' },
- success: function (result) {
- var data = [];
- var col = [];
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in result.list) {
- //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
- data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
- //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
- var patrn = new RegExp(/^h/i);
- if (patrn.test(result.list[key].ColmCols)) {
- titleData[key] = result.list[key].ColmCols;
- }
- }
-
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'radio' });
- for (var i = 0; i < data.length; i++) {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
- else {
- switch (data[i].Type) {
- //int
- case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
- break;
- default:
-
- if (data[i].name == '浠撳簱' || data[i].name == '鎵瑰彿') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
- } else if (data[i].name == '鐗╂枡浠ｇ爜' || data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿' || data[i].name == '缁勭粐' || data[i].name == '浠撲綅浠ｇ爜' ) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
- } else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center' });
- }
- }
- }
- }
- columns = col;
- listOption.cols = [columns];
- listOption.data = result.data;
- //listOption.totalRow = true;
- table.cache['wl-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
- table.render(listOption);
- }
- else {
- listOption.cols = [[
- { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
- , { field: '浠撳簱', title: '浠撳簱', width: 100 }
- , { field: '浠撲綅', title: '浠撲綅', width: 100 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: '鎵规', title: '鎵规', width: 100 }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
- , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
- , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
- , { field: '缁勭粐', title: '缁勭粐', width: 100 }
- ]];
- listOption.data = data;
- //listOption.totalRow = true;
- table.render(listOption);
- //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
- });
- }
-
- //#endregion
//#region 閫�鍑�
form.on('submit(cmdCancel)', function () {
@@ -487,6 +380,71 @@
//#endregion
+ //澶辫触鎻愮ず闊�
+ function playSound() {
+ console.log("playSound");
+ var audio = document.getElementById("cs");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+ //鎴愬姛鎻愮ず闊�
+ function playSound_OK() {
+ console.log("playSound_OK");
+ var audio = document.getElementById("cs2");
+ audio.play();
+ audio.onended = function () {
+ // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+ audio.pause();
+ audio.currentTime = 0;
+ };
+ }
+
+ function set_ModCheck(ModRightNameCheck) {
+ var Permission = false;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ Permission = true;
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁鏌ヨ鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ return Permission;
+ }
+ function set_DeleteBill() {
+ if ($("#HStockPlaceID").val() == 0 || $("#HWHID").val() == 0 || $("#HBarCode").val() == "") {
+ return layer.alert("浠撲綅鎴栫墿鏂欐湭閫夋嫨!", { icon: 5 });
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/KF_ICInventory_WorkShop/ClearHBarCode", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "HBarCode": $("#HBarCode").val(), "HWHID": $("#HWHID").val(), "HSPID": $("#HStockPlaceID").val(), "user": sessionStorage["HUserName"], "HOrgID": HStockOrgID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.alert("鍒犻櫎鎴愬姛!", { icon: 5 });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+
//#endregion
});
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
index 5f93feb..af29893 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
@@ -99,6 +99,19 @@
<div class="layui-form-item" style="padding: 0px; margin: 0px">
<div class="layui-row">
<div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佽浆鍗″彿</label>
+ </div>
+ <div class="layui-col-xs9">
+ <div class="layui-col-xs10">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ <!--<div class="layui-col-xs2" style="float: right;">
+ <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+ </div>-->
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs3">
<label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
</div>
<div class="layui-col-xs9">
@@ -161,6 +174,7 @@
<!--闅愯棌瀛楁-->
<input type="hidden" name="HBillType" id="HBillType">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="">
<!--澶辫触鎻愮ず闊�-->
<div id="" style="display:none;">
<audio id="cs" hidden controls>
@@ -328,7 +342,7 @@
table.render(LowerListOption);
//鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
- var pFocus = $("#HBarCode");
+ var pFocus = $("#HSourceBillNo");
pFocus.select();
pFocus.focus(); //鑾峰彇鍏夋爣
}
@@ -806,6 +820,13 @@
}
});
+ //鎵弿婧愬崟鏉＄爜
+ $('#HSourceBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ GetMeesageBySourceBillNo();
+ }
+ });
+
//鎵潯鐮�
function GetMeesageByBarCode(obj) {
//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
@@ -944,6 +965,59 @@
}
}
+ //鎵弿婧愬崟鏉＄爜
+ function GetMeesageBySourceBillNo(obj) {
+ var HSourceBillNo = $('#HSourceBillNo').val()
+ if (HSourceBillNo == '') {
+ playSound();
+ layer.msg("娴佽浆鍗″彿涓嶈兘涓虹┖锛岃鎵弿娴佽浆鍗℃潯鐮侊紒", {
+ icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ return;
+ }
+ layer.load(3)
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/KF_ICInventory_WorkShop/SearchHBarCode",
+ async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HBillNo": HBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ playSound_OK();
+ $("#HMainSourceBillNo").val(HBillNo);
+ $("#HSourceBillNo").attr("disabled", "disabled");
+ //$('#HSourceBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+ $("#HBarCode").select();
+ $("#HBarCode").focus(); //鑾峰彇鍏夋爣
+
+ }
+ else {
+ playSound();
+ layer.msg(result.Message, {
+ icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+ }, function () {
+
+ $("#HSourceBillNo").val("");
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ });
+ }
+ },
+ error: function (err) {
+ playSound();
+ $("#HSourceBillNo").val("");
+ $("#HSourceBillNo").select();
+ $("#HSourceBillNo").focus();
+ layer.msg("鎺ュ彛閿欒" + err);
+ },
+ complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+ });
+ layer.closeAll("loading");
+ }
+
//#endregion
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 8eedf81..9e22fdc 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -255,6 +255,12 @@
<cite style="white-space:pre-wrap">搴撳瓨杞Щ</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventory_Clear_PDA.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-template-1"></i>
+ <cite style="white-space:pre-wrap">搴撳瓨娓呯悊</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index b020229..5c02225 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -1047,6 +1047,11 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var sAllStr = JSON.stringify(allVal);
+ console.log(sMainStr);
+ console.log("---------");
+ console.log(sSubStr)
+ console.log("---------");
+ console.log(sAllStr);
//var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MultipleCodes_Report.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MultipleCodes_Report.html"
new file mode 100644
index 0000000..bbb1a31
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MultipleCodes_Report.html"
@@ -0,0 +1,577 @@
+锘�<!DOCTYPE html>
+<html>
+<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/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </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-colla-title layui-inline">
+ <!--<div class="layui-inline">
+ <span>鏇村</span>
+ </div>-->
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 75px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄庣粏sn鐮�</label>
+ <div class="layui-input-block">
+ <!--<input type="hidden" class="layui-input" id="HDeptID" style="width:190px;">-->
+ <input type="text" class="layui-input" id="HBarCode" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓鐮�</label>
+ <div class="layui-input-block">
+ <!--<input type="hidden" class="layui-input" id="HDeptID" style="width:190px;">-->
+ <input type="text" class="layui-input" id="HBarCode_MiddleBox" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐩殑浠撶爜</label>
+ <div class="layui-input-block">
+ <!--<input type="hidden" class="layui-input" id="HDeptID" style="width:190px;">-->
+ <input type="text" class="layui-input" id="HBarCode_Destination" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏍堟澘鐮�</label>
+ <div class="layui-input-block">
+ <!--<input type="hidden" class="layui-input" id="HDeptID" style="width:190px;">-->
+ <input type="text" class="layui-input" id="HBarCode_Pallet" style="width:190px;">
+ </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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
+
+
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row">
+ <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>-->
+ <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>-->
+ <!--<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>-->
+ </div>
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-radio"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>-->
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var OptionData = [];
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+ 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
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var ins;//瀛樺偍鏁版嵁 瀵煎嚭鍔熻兘闇�瑕佺敤鍒扮殑鍙傛暟
+ var HModName = "";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //閫�鍑�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ //瀵煎嚭鎸夐挳
+ case 'btn_Export': get_Export();
+ break;
+ //鎵撳嵃
+ case 'btn-print': get_PrintReport();
+ break;
+ };
+ });
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //鐗╂枡
+ form.on('submit(btnHMaterID)', function (data) {//閫夋嫨鐗╂枡
+ get_btnHMaterID();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ //鍒濆鍖栨椂闂�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery();
+ //DisPlay_HideColumn();
+ //ColFilter();
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 120
+ , totalRow: true
+ , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+ , height: 'full-70'
+ };
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MultipleCode_ReportController/getList',
+ type: "GET",
+ data: { "sWhere": sWhere,"HBeginDate": HBeginDate, "HEndDate": HEndDate},
+ success: function (data1) {
+ var col = [];
+ console.log("杩斿洖鏁版嵁:", data1);
+ if (data1.code == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ //, cellMinWidth: 90
+ , done: function (res, curr, count) {
+ //soulTable.render(this);
+ }
+ }
+
+ table.render(option);
+ ins = table.render(option);
+
+ layer.close(wait);
+
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HBarCode = $("#HBarCode").val();
+ var HBarCode_Pallet = $("#HBarCode_Pallet").val();
+ var HBarCode_MiddleBox = $("#HBarCode_MiddleBox").val();
+ var HBarCode_Destination = $("#HBarCode_Destination").val();
+ if (HBarCode != '')
+ sWhere += "and 鐗╂枡鏉＄爜 like '%" + HBarCode + "%'";
+ else if (HBarCode_Pallet != '') {
+ sWhere += "and 鏍堟澘鐮� like '%" + HBarCode_Pallet + "%'";
+ }
+ else if (HBarCode_Destination != '') {
+ sWhere += "and 鐩殑鐮� like '%" + HBarCode_Destination + "%'";
+ }
+ else if (HBarCode_MiddleBox != '') {
+ sWhere += "and 涓鐮� like '%" + HBarCode_MiddleBox + "%'";
+ }
+
+ else
+ sWhere = '';
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+
+
+
+
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBarCode").val('');
+ $("#HBarCode_Pallet").val('');
+ $("#HBarCode_MiddleBox").val('');
+ $("#HBarCode_Destination").val('');
+ form.render('select');
+ sWhere = " ";
+ get_FastQuery();
+ }
+
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization); $("#ColName1").empty();
+ $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //瀵煎嚭Execel
+ function get_Export() {
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+
+ var data = table.cache['mainTable']
+ if (data.length > 0) {
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=0&MyMsg=0&Type=Sc_ProdOrderPickingStatusReport', 'yes']
+ , resize: false
+ , end: function () {
+ if (OptionData.length > 0) {
+ var GrfName = OptionData[0].HName;
+
+ var dataPrint = [];
+ for (var i = 0; i < data.length; i++) {
+ dataPrint.push(data[i])
+ }
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "preview",
+ //showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + GrfName + ".grf"),
+ data: Customer
+ };
+
+ webapp_ws_ajax_run(args);
+ OptionData = [];
+ }
+
+ }
+ })
+ } else {
+ layer.msg("鏃犳暟鎹�,鏃犳硶鎵撳嵃!");
+ }
+
+ }
+
+
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+
+ //#endregion
+ });
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index c2beeec..49aff68 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -369,6 +369,9 @@
case "Kf_BarCodeDetailQuery": //鏉＄爜鏄庣粏
CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_BarCodeDetailQuery.aspx?linterid=" + value, true, "");
break;
+ case "HGy_BarCodeBill_xiaowei": //zutuoxiaowei鏄庣粏
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlzuotuo_xiaowei.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill.aspx.cs"
index 9ec5263..4676ec0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill.aspx.cs"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_HGy_BarCodeBill.aspx.cs"
@@ -9,9 +9,9 @@
{
public partial class xmlLBM_HGy_BarCodeBill : System.Web.UI.Page
{
- protected void Page_Load(object sender, EventArgs e)
- {
+ //protected void Page_Load(object sender, EventArgs e)
+ //{
- }
+ //}
}
}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx"
index f061291..287b05a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldFileMainBill.aspx"
@@ -15,7 +15,7 @@
//OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
//SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
- SqlXMLReportData.GenEntireData(this, "select * from h_v_Gy_MouldFileList where hmainid in (" + Request.Params["linterid"] + ")", "select 1");
+ SqlXMLReportData.GenEntireData(this, "select * from h_v_Gy_MouldFileList where hmainid in (" + Request.Params["linterid"] + ")"+" ORDER BY 鏉＄爜缂栧彿 ", "UPDATE Gy_MouldFileMain set HPrintQty=HPrintQty+1 where HInterID in ("+Request.Params["linterid"] + ")");
}
</script>
</head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx"
new file mode 100644
index 0000000..3abe118
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlzuotuo_xiaowei.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlzuotuo_xiaowei" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from Sc_PackUnionBillMain where HBarCode_Pack in(" + Request.Params["linterid"]+ ") ");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx.cs"
new file mode 100644
index 0000000..9ec5263
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_HGy_BarCodeBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx.designer.cs"
new file mode 100644
index 0000000..f8527d8
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlzuotuo_xiaowei.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlzuotuo_xiaowei
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html" "b/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
index ce27d72..35d52e9 100644
--- "a/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
+++ "b/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
@@ -43,58 +43,9 @@
<input type="text" class="layui-input" id="HBillType" style="width:190px;" disabled="disabled">
</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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- -->
+
<div class="layui-colla-content">
- <!--
- <div class="layui-inline">
- <label class="layui-form-label">鏉″舰鐮�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBarCode" id="HBarCode" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浠撳簱</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="sWH" id="sWH" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浠撲綅</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="sSP" id="sSP" style="width:190px;">
- </div>
- </div>
- <hr />
- <div class="layui-inline">
- <label class="layui-form-label">鎵瑰彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="sBatchNo" id="sBatchNo" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="BillNo" id="BillNo" style="width:190px;">
- </div>
- </div>
- -->
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
- </div>
- </div>-->
+
</div>
</div>
</div>
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 fc5a634..b733cda 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"
@@ -341,26 +341,40 @@
case 'btn-print':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length > 0) {
- var rows = '';
- for (var i = 0; i < data.length; i++) {
- rows += data[i].HItemID.toString() + ',';
+ var ModRightName = 'Gy_BarCodeBillList_Print';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_BarCodeBillList/GetBarCodeBillPermission',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["HUserName"] },
+ success: function (res) {
+ if (res.data == 1) {
+ if (checkStatus.data.length > 0) {
+ var rows = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].HItemID.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
+ }
+ }
+ else {
+ layer.alert(get_MessageError("鏃犳墦鍗版潈闄�!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
}
- rows = rows.substring(rows.length - 1, 0);
- layer.open({
- type: 2
- , area: ['40%', '80%']
- , title: '鎵撳嵃妯＄増閫夋嫨'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + rows + '&MyMsg=' + rows + '&Type=HGy_BarCodeBill', 'yes']
- , resize: false
- })
- }
- else {
- layer.msg(get_MessageError('[0000-1-016]璇烽�夋嫨鏁版嵁鎵撳嵃锛�', sessionStorage["HTranSlate"]));
- }
+ });
break;
//鍒锋柊
case 'btn-reload':
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_MouldFileList.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_MouldFileList.html"
index eeceac2..1935cc7 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_MouldFileList.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_MouldFileList.html"
@@ -485,6 +485,7 @@
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
+ , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', sort: true }
, { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
]]
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/KF_BarCodeStatusChangeBill.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/KF_BarCodeStatusChangeBill.html"
index 6b8c3e0..e676622 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/KF_BarCodeStatusChangeBill.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/KF_BarCodeStatusChangeBill.html"
@@ -258,13 +258,17 @@
<script type="text/html" id="HBarCodeStatus_New">
<select name="HBarCodeStatus_New" lay-filter="HBarCodeStatus_New" id="HBarCodeStatus_New{{d.LAY_TABLE_INDEX+1}}">
<option value=""></option>
- <option value="姝ｅ父">姝ｅ父</option>
+ <option value="鍑哄簱">鍑哄簱</option>
+ <option value="鍏ュ簱">鍏ュ簱</option>
+ <option value="寮傚父">寮傚父</option>
+ <option value="绌�">绌�</option>
+ <!--<option value="姝ｅ父">姝ｅ父</option>
<option value="鍦ㄥ簱">鍦ㄥ簱</option>
<option value="鍑哄簱">鍑哄簱</option>
<option value="浣滃簾">浣滃簾</option>
<option value="闅旂">闅旂</option>
<option value="涓嶈壇">涓嶈壇</option>
- <option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>-->
</select>
</script>
<script>
@@ -289,7 +293,7 @@
var HBarCodeStatusVal = [];
var CopyHBarCodeStatusVal = [];
//#endregion
-
+ var ExistBarCode;
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "1288";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
@@ -604,8 +608,14 @@
if (num[j].HBarCodeStatus_New != HBarCodeStatusVal[j]) {
num[j].HBarCodeStatus_Old = HBarCodeStatusVal[j]
}
+ JudgeBarCodeIsExist(num[j].HBarCode);
+ if (!ExistBarCode) {
+ layer.msg('璇ユ潯鐮佸湪鏉＄爜涓绘。涓笉瀛樺湪');
+ retrun ;
+ }
}
-
+
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
//var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
@@ -635,7 +645,21 @@
}
});
}
+ function JudgeBarCodeIsExist(HbarCode) {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_Material/findMaterialByNumber",
+ type: "GET",
+ async: false,
+ data: { "HbarCode": HbarCode, "HSTOCKORGID": sessionStorage["OrganizationID"] },
+ success: function (d) {
+ if (d.count === 1)
+ ExistBarCode = 1;
+ else
+ ExistBarCode = 0;
+ }
+ })
+ }
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index a982037..aa21149 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -870,7 +870,7 @@
}
if (HBeginDate && HEndDate) {
- sWhere += " and CONVERT(varchar(100),鐢熶骇璁㈠崟鏃ユ湡, 23) between '" + HBeginDate + "' and '" + HEndDate + "'"
+ sWhere += " and CONVERT(varchar(100),鍒跺崟鏃ユ湡, 23) between '" + HBeginDate + "' and '" + HEndDate + "' and HMaterClsID !=1"
}
sWhere += addSWhereByOpenType();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
index 53587b8..4a24574 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_WorkShopICStockBillList.html"
@@ -88,7 +88,95 @@
</button>
</div>
</div>
-
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -271,7 +359,7 @@
//鏌ヨ
- function get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID) {
+ function get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere) {
var index = layer.load(0, { shade: false });
var ajaxLoad = layer.load();
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -280,7 +368,7 @@
url: GetWEBURL() + '/Kf_WorkShopICStockBill/List',
type: "GET",
async:false,
- data: { "HBillType": HBillType, "HCarBarCode": HCarBarCode, "HProcExBillNo": HProcExBillNo, "HMaterNumber": HMaterNumber, "HWHID": HWHID, "HSPID": HSPID,"sWhere": '' },
+ data: { "HBillType": HBillType, "HCarBarCode": HCarBarCode, "HProcExBillNo": HProcExBillNo, "HMaterNumber": HMaterNumber, "HWHID": HWHID, "HSPID": HSPID, "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -340,7 +428,10 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+ }
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -362,7 +453,79 @@
var HMaterNumber = $('#HMaterNumber').val()
var HWHID = $("#HWHID").val()
var HSPID = $("#HSPID").val()
- get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID);
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+ get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -377,6 +540,15 @@
$("#HWHName").val("")
$("#HSPID").val(0)
$("#HStockPlaceName").val("")
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
get_FastQuery();
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
index 3751d26..08b72b9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport.html"
@@ -66,6 +66,95 @@
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
</div>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -169,7 +258,7 @@
get_FastQuery();
//DisPlay_HideColumn();
- //ColFilter();
+/* ColFilter();*/
}
//鍒濆鍖栬〃鏍�
@@ -185,12 +274,12 @@
}
//鍔犺浇缃戞牸
- function get_Display(sWhere) {
+ function get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName,sWhere) {
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName,"sWhere": sWhere },
success: function (data1) {
var col = [];
if (data1.count == 1) {
@@ -223,6 +312,10 @@
option.data = data1.data;
ins = table.render(option);
DisPlay_HideColumn();
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+
+ }
layer.close(wait);
} else {
layer.close(wait);
@@ -319,8 +412,10 @@
}
sWhere += " and " + ColName2 + " " + com2;
}
- sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
- get_Display(sWhere);
+ //if (sWhere != '')
+ // sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" + sWhere;
+ //sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'"+"''";
+ get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
}
@@ -346,21 +441,24 @@
get_FastQuery();
}
- //鍒楁槑鏄剧ず涓嬫媺妗�
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i].hide != true) {
- Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
}
}
$("#ColName").empty();
- $("#ColName").append(Organization); $("#ColName1").empty();
- $("#ColName1").append(Organization); $("#ColName2").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
$("#ColName2").append(Organization);
form.render('select');
}
//#endregion
+ //#endregion
//鐗╂枡
function get_btnHMaterID() {
layer.open({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
index 8378ee8..3ef15f1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Mes_OrderProcFlowAllReport_TK.html"
@@ -52,39 +52,128 @@
<input type="date" class="layui-input ForFilteringSchemes" name="HDate2" id="HDate2" style="width:190px;">
</div>
</div>
- <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
- <div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="txtHOrderProcNo" style="width:190px;">
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHOrderProcNo" style="width:190px;">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-block">
- <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
- </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>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;">
+ <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>-->
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block">
+ <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+ </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>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+
+ </div>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -222,7 +311,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
-
+
}
//鍒濆鍖栬〃鏍�
@@ -238,12 +327,12 @@
}
//鍔犺浇缃戞牸
- function get_Display(sWhere) {
+ function get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_Tk',
type: "GET",
- data: { "sWhere": sWhere },
+ data: {"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
success: function (data1) {
var col = [];
if (data1.count == 1) {
@@ -276,6 +365,10 @@
option.data = data1.data;
ins = table.render(option);
DisPlay_HideColumn();
+ if ($("#ColName option").length < 1) {
+ ColFilter();
+
+ }
layer.close(wait);
} else {
layer.close(wait);
@@ -292,6 +385,7 @@
function get_FastQuery() {
var HDate1 = $("#HDate1").val();
var HDate2 = $("#HDate2").val();
+ sWhere = "and 宸ュ簭瀹屽伐鏃ユ湡1 >='" + HDate1 + "' and 宸ュ簭瀹屽伐鏃ユ湡1<='" + HDate2 + "'";
var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
@@ -300,9 +394,83 @@
if (chkHShowUnFinish) {
check = "Y";
}
-
- sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
- get_Display(sWhere);
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
+ //sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
}
@@ -326,7 +494,7 @@
$("#ColName2").val("0");
$("#Comparator2").val("0");
form.render('select');
-
+
sWhere = " ";
get_FastQuery();
}
@@ -423,7 +591,23 @@
});
})
//#endregion
-
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
//鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html"
index 4dd03b9..bee0f5b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_AllowedPrintProcExchangeBillList.html"
@@ -349,6 +349,16 @@
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+ col.push({
+ field: "鏄惁鎵撳嵃",
+ title: "鏄惁鎵撳嵃",
+ align: 'center',
+ sort: true,
+ width: 100,
+ templet: function (d) {
+ return d.鎵撳嵃鏃ユ湡 ? '宸叉墦鍗�' : '';
+ }
+ });
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
@@ -375,6 +385,12 @@
}
}
}
+
+ if (data1.data && data1.data.length > 0) {
+ data1.data.forEach(function (item) {
+ item.鏄惁鎵撳嵃 = item.鎵撳嵃鏃ユ湡 ? '宸叉墦鍗�' : '';
+ });
+ }
option.cols = [col];
option.data = data1.data;
//鍒楄缃�
--
Gitblit v1.9.1