From aa1c13f339ac37aaa7c809c1ed6f0f122841ec32 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 29 七月 2024 16:55:15 +0800
Subject: [PATCH] 库存检验单 增加 批次号，检验数量，良品数量，报废数量，可疑数 HBatchNo varchar(200) --批号 HInSpectQty dec(18,8) --检验数量 HRightQty dec(18,8) --合格数量 HUnRightQty dec(18,8) --不合格数量 HUnKnowQty dec(18,8) --可疑数量 实验室 仪器检验时，扫码流转卡二维码的， 改为 可以扫 取样单 二维码（即 可以扫流转卡也可以扫取样单）。 检验单里 保存 对应的 取样单 内码； 首件单，巡检单，工序检验单 表头增加 字段 HTakeSampleCheckBillID int --取样单内码 HTakeSampleCheckBillNo int --取样单 出站单 ：增加 字段： 返工数，工废数量，料废数量 ，料废返工数量 HBackWorkQty dec(18,8) -- 返工数 HBadByWorkQty dec(18,8) -- 工废数量 HBadByMaterQty dec(18,8) --料废数量 HBackWorkByMaterQty dec(18,8) --料废返工数量
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 15 ++
WebTM/views/质量管理/质量报表/QC_MoistureContentDataLedger.html | 159 +++++++++----------------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 85 +++++++-------
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 13 ++
WebTM/views/质量管理/库存检验单/QC_Add_Edit_StockCheckBill.html | 39 ++++++
WebTM/views/生产管理/生产报表/Sc_NutInspectionCCDPassRate.html | 25 +---
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 15 ++
WebTM/WebTM.csproj | 5
8 files changed, 195 insertions(+), 161 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 012977f..723a598 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -252,6 +252,7 @@
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
+ <Content Include="views\WMS鎵爜妯″潡\涓夌偣鐓у悎鎵爜璁板綍鍗昞WMS_CusBarCodeCheckBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\涓婃枡闃查敊鍗昞Sc_MaterToSourceBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBackBillList_PDA.html" />
@@ -310,6 +311,7 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
+ <Content Include="views\浠撳瓨绠＄悊\涓夌偣鐓у悎鎵爜璁板綍鍗昞WMS_CusBarCodeCheckBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Add_Edit_Kf_MoveStockBill.html" />
<Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
@@ -411,6 +413,7 @@
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillType.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫寮�宸Sc_SwipeCardStart.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_NutInspectionCCDPassRate.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillMonth.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_QualityReportBillDay.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
@@ -446,6 +449,8 @@
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_TakeSampleCheckBillMainList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_Add_TakeSampleCheckBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_InspectionFormReport.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBill.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\杞﹂棿鑷鍗昞QC_Add_Edit_WorkSelfCheckBill.html" />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html"
index 4c36ff0..fb88583 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html"
@@ -31,28 +31,16 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <label class="layui-form-label">鎵规鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 76px;">浜у搧鏉＄爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">娴佽浆鍗″彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
</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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
</div>
@@ -138,13 +126,12 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
- </div>
+ </div>-->
</div>
</div>
<div class="layui-tab layui-tab-card">
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <!--杩涘嚭绔欒褰�-->
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
@@ -263,10 +250,10 @@
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
+ url: GetWEBURL() + '/LEMS/Sc_NutInspectionCCDPassRate',
type: "GET",
async: false,
- data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 718d72b..5d6e8bf 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -225,6 +225,13 @@
<input type="hidden" name="HProcID" id="HProcID" value="0">
</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="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -830,6 +837,8 @@
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);
+ $("#HTakeSampleCheckBillNo").val(data.娴佽浆鍗″彿);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -873,6 +882,8 @@
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);//
$("#HBatchNo").val(data.鎵瑰彿);
+ $("#HTakeSampleCheckBillNo").val(data.鍗曟嵁鍙�);
+ $("#HTakeSampleCheckBillID").val(data.HInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -948,6 +959,8 @@
$("#HICMOEntryID").val(data.HICMOEntryID);
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -1517,6 +1530,8 @@
, "HShiftsName": data.鐝鍚嶇О
, "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
, "HBatchNo": data.鎵瑰彿
+ , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
+ , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
});
$("input[name=HLastResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
$("input[name=HLastResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index 06d0df4..0f32412 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -222,6 +222,13 @@
<input type="hidden" name="HProcID" id="HProcID" value="0">
</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="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -870,6 +877,8 @@
$("#HICMOEntryID").val(HICMOEntryID);
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -955,6 +964,8 @@
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);//
$("#HBatchNo").val(data.鎵瑰彿);
+ $("#HTakeSampleCheckBillNo").val(data.鍗曟嵁鍙�);
+ $("#HTakeSampleCheckBillID").val(data.HInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -1472,6 +1483,8 @@
, "HShiftsName": data.鐝鍚嶇О
, "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
, "HBatchNo": data.鎵瑰彿
+ , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
+ , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
index 319a794..ec5be7c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
@@ -190,6 +190,40 @@
</div>
</div>
<div class="layui-row">
+ <div class="layui-inline" id="hidediv1">
+ <label class="layui-form-label" style="width: 85px;">鎵规鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <label class="layui-form-label" style="width: 85px;">妫�楠屾暟閲�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HInSpectQty" id="HInSpectQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <label class="layui-form-label" style="width: 85px;">鑹搧鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HRightQty" id="HRightQty" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline" id="hidediv1">
+ <label class="layui-form-label" style="width: 85px;">鎶ュ簾鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUnRightQty" id="HUnRightQty" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" id="hidediv1">
+ <label class="layui-form-label" style="width: 85px;">鍙枒鏁�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HUnKnowQty" id="HUnKnowQty" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 58%">
@@ -1504,6 +1538,11 @@
, "HShiftsID": data.HShiftsID
, "HShiftsName": data.鐝鍚嶇О
, "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+ , "HBatchNo": data.鎵瑰彿
+ , "HInSpectQty": data.妫�楠屾暟閲�
+ , "HRightQty": data.鍚堟牸鏁伴噺
+ , "HUnRightQty": data.涓嶅悎鏍兼暟閲�
+ , "HUnKnowQty": data.鍙枒鏁伴噺
});
$("input[name=HLastResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
$("input[name=HLastResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html"
index a76b152..91b0eb8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MoistureContentDataLedger.html"
@@ -34,37 +34,39 @@
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃ユ湡</label>
<div class="layui-input-block">
- <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍒ゅ畾缁撴灉</label>
<div class="layui-input-block" style="margin-left: 120px; width: 85px;">
- <select name="HMonth" id="HMonth" lay-verify="HMonth">
+ <select name="HResult" id="HResult" lay-verify="HResult">
<option value="鍚堟牸">鍚堟牸</option>
<option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 125px;">
- <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
- <!--鍔ㄦ�佹覆鏌撳勾浠�-->
- </select>
+ <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;margin-left:5%;">
</div>
@@ -150,13 +152,12 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
- </div>
+ </div>-->
</div>
</div>
<div class="layui-tab layui-tab-card">
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
- <!--杩涘嚭绔欒褰�-->
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
@@ -227,81 +228,48 @@
set_ClearQuery();
});
+
+ //閫夋嫨鐢熶骇璧勬簮
+ form.on('submit(btnHSource)', function () {
+ btnHSource();
+ });
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- Year();
- DeptName();
- Organ();
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//set_InitGrid();
//鏌ヨ
get_FastQuery();
}
- //骞�
- function Year() {
- var yyyy = new Date().getFullYear();
- var YearOption = "";
- for (var i = 0; i <= 10; i++) {
- YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
- }
- $("#HYear").append(YearOption);
- $("#HYear").val(yyyy);
- $("#HMonth").val(new Date().getMonth()+1);
- form.render('select');
- }
-
- //鐢熶骇杞﹂棿
- function DeptName() {
- //鑾峰彇杞﹂棿鍒�
- var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
- async: false,
- data: { "HOrgID": sessionStorage["OrganizationID"] },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- if (i == 0)
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
- else
- HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
-
- }
- $("#HDeptName").append(HDeptName);
- form.render('select');
+ //鐢熶骇璧勬簮閫夋嫨椤甸潰
+ function btnHSource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
}
- layer.closeAll("loading");
- }
- })
- }
+ //鑾峰彇鏁版嵁
+ $("#HSourceID").val(checkStatus.data[0].HItemID);
+ $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
-
- //鑾峰彇缁勭粐
- function Organ() {
- //鑾峰彇鐧诲綍椤电粍缁囧垪
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Web/GetOrganizations",
- async: false,
- success: function (result) {
- var Organization = "";
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
- }
- $("#HOrgID").append(Organization);
- $("#HOrgID").val(sessionStorage["OrganizationID"])
- form.render('select');
- }
- layer.closeAll("loading");
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
+ , btn2: function (index, layero) { }
})
}
@@ -309,22 +277,13 @@
var columns = [];
columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- columns.push({ field: '宸ュ簭', title: '宸ュ簭', sort: true, width: 90});
- columns.push({ field: '鍒ゅ畾缁撴灉', title: '鍒ゅ畾缁撴灉', sort: true, width: 110 });
- columns.push({ field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜', sort: true, width: 110 });
- columns.push({ field: '鎬昏', title: '鎬昏', sort: true, totalRow: true, width: 90});
-
- //鑾峰彇骞�
- var yyyy = $("#HYear").val();
- //鑾峰彇鏈堜唤
- var MM = $("#HMonth").val();
- //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
- var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
-
- for (var i = 0; i < SumMonth; i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + (i + 1), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (i + 1), 'MM.dd'), width: 80 })
- }
-
+ columns.push({ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 90});
+ columns.push({ field: '鏈哄彴鍙�', title: '鏈哄彴鍙�', sort: true, width: 110 });
+ columns.push({ field: '鍙栨牱閲嶉噺', title: '鍙栨牱閲嶉噺', sort: true, width: 110 });
+ columns.push({ field: '娴嬮噺缁撴灉', title: '娴嬮噺缁撴灉', sort: true, totalRow: true, width: 110});
+ columns.push({ field: '鍒ゅ畾缁撴灉', title: '鍒ゅ畾缁撴灉', sort: true, totalRow: true, width: 110});
+ columns.push({ field: '妫�娴嬩汉', title: '妫�娴嬩汉', sort: true, totalRow: true, width: 110});
+ columns.push({ field: '澶囨敞', title: '澶囨敞', sort: true, totalRow: true, width: 110});
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo1'
@@ -348,7 +307,7 @@
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/QC_CustomerAppealReport/QC_QualityStatisticsDailyReport',
+ url: GetWEBURL() + '/QC_CustomerAppealReport/QC_MoistureContentDataLedger',
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -361,9 +320,9 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
- ColFilter();
- }
+ //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ // ColFilter();
+ //}
layer.close(ajaxLoad);
} else {
@@ -379,10 +338,10 @@
// 蹇�熻繃婊�
function get_FastQuery() {
- var HYear = $("#HYear").val();
- var HMonth = $("#HMonth").val();
- var HDeptName = $("#HDeptName").val();
- var HOrgID = $("#HOrgID").val();
+ var HBeginDate = $("#HBeginDate").val();
+ var HEndDate = $("#HEndDate").val();
+ var HResult = $("#HResult").val();
+ var HSourceID = $("#HSourceID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -460,10 +419,10 @@
sWhere = {
- HYear: HYear
- , HMonth: HMonth
- , HDeptName: HDeptName
- , HOrgID: HOrgID
+ HBeginDate: HBeginDate
+ ,HEndDate: HEndDate
+ , HResult: HResult
+ , HSourceID: HSourceID
}
set_InitGrid();
get_Display(JSON.stringify(sWhere));
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 21b54b3..499cebc 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -228,6 +228,13 @@
<input type="hidden" name="HProcID" id="HProcID" value="0">
</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="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -856,6 +863,8 @@
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);
+ $("#HTakeSampleCheckBillNo").val(data.娴佽浆鍗″彿);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -900,6 +909,8 @@
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
$("#HProcName").val(data.褰撳墠宸ュ簭);//
$("#HBatchNo").val(data.鎵瑰彿);
+ $("#HTakeSampleCheckBillNo").val(data.鍗曟嵁鍙�);
+ $("#HTakeSampleCheckBillID").val(data.HInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
} else {
@@ -979,6 +990,8 @@
$("#HICMOEntryID").val(data.HICMOEntryID);
$("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
$("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+ $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
+ $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
//鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
get_CheckItem();
@@ -1573,6 +1586,8 @@
, "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
, "HBatchNo": data.鎵瑰彿
, "HLastResult": data.鍒ゅ畾缁撹 == "鍚堟牸" ? "true" : "false"
+ , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
+ , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
});
data = result.data;
//data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 23c1e9a..5a3bb52 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -92,7 +92,7 @@
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
</div>
- </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -116,11 +116,11 @@
</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="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -155,15 +155,15 @@
</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="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">褰撳墠宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鏈嚭绔欐暟閲�</label>
<div class="layui-input-block">
@@ -189,12 +189,12 @@
</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="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
- <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
- </div>
- </div>-->
+ <label class="layui-form-label">鏍哥畻宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"></label>
<div class="layui-input-inline">
@@ -298,17 +298,17 @@
</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="HWorkTimes" id="HWorkTimes" value="0">
- </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="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
- </div>
- </div>-->
+ <label class="layui-form-label">宸ユ椂</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+ </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="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -331,20 +331,20 @@
</div>
</div>
<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" value="0" name="" id="">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏂欏簾杩斿伐鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="HBackWorkByMaterQty" style="width:190px;" id="HBackWorkByMaterQty" onfocus="this.select();">
</div>
- </div>-->
+ </div>
</div>
<div class="layui-row">
<!--<div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
- </div>
- </div>-->
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -911,6 +911,7 @@
"HShiftsName": data.鐝鍚嶇О,
"HToCheckQty": data.鍙栨牱鏁伴噺,
"HLossQty": data.閬楀け鏁伴噺,
+ "HBackWorkByMaterQty": data.鏂欏簾杩斿伐鏁伴噺,
});
if (data.鏄惁瀹℃牳 == "true") {
$('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
--
Gitblit v1.9.1