From 48da2eef68996fad4d40350ad705d6a04a428a19 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 05 十一月 2024 09:15:36 +0800
Subject: [PATCH] 首巡末根据检测值判断合格不合格 产线包装单增加墨西哥页面 增加墨西哥条码白标报表
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 38 +++++
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html | 48 ++++++
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 40 +++++
WebTM/views/车间管理/产线/MES_BarcodeWhiteLabelReport.html | 169 ++++++++++++++++++++++++
WebTM/views/车间管理/产线/MES_ProductionLinePackaging_MXG.html | 54 ++++---
WebTM/views/设备管理/Sb_EquipDotCheckBill_PDA.html | 2
WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html | 38 +++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 19 ++
WebTM/views/index.html | 1
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA.html | 1
WebTM/WebTM.csproj | 1
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 9 +
12 files changed, 387 insertions(+), 33 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9778c3a..32a3cf7 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -557,6 +557,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Gy_WorkDay.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceability.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_AssemblyTraceabilityList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_BarcodeWhiteLabelReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging_MXG.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackaging.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\MES_ProductionLinePackagingList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 56952ff..e197e29 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -632,6 +632,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_AssemblyTraceabilityList.html">浜х嚎缁勮杩芥函鍗曞垪琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_ProductionLinePackaging.html">浜х嚎鍖呰鍗�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_ProductionLinePackaging_MXG.html">浜х嚎鍖呰鍗昣澧ㄨタ鍝�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_BarcodeWhiteLabelReport.html">鏉＄爜鐧芥爣杩芥函鎶ヨ〃_澧ㄨタ鍝�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/MES_ProductionLinePackagingList.html">浜х嚎鍖呰鍗曞垪琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_PackUnionBillCacheList.html">浜х嚎鍖呰鍗曠紦瀛樺垪琛�</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/浜х嚎/Sc_GroupOrderBill.html">浜х嚎缁勬墭鍗�</a></dd>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index c2ba757..9adfc01 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -633,7 +633,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true
- , content: ['../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html', 'yes']
+ , content: ['../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
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 b099a34..efca783 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"
@@ -1382,6 +1382,44 @@
}
});
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ //var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ //var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
+ switch (field) {
+ case "HInspectVal": //妫�楠屽��
+ value = isNaN(value) ? 0 : value;
+
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ break;
+ }
+ });
+
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
set_SaveBill(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 d742110..dc03cb7 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"
@@ -1304,6 +1304,46 @@
}
});
+
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ //var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ //var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
+ switch (field) {
+ case "HInspectVal": //妫�楠屽��
+ value = isNaN(value) ? 0 : value;
+
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ break;
+ }
+ });
+
+
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
set_SaveBill(data);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index d01a52e..89b4712 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -1406,6 +1406,44 @@
}
});
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+ //var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+ //var HComparator = $("#HComparator").val(); //姣旇緝绗�
+ var HEntryID = $("#HEntryID").val() - 1;
+ var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+ var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
+ var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
+ switch (field) {
+ case "HInspectVal": //妫�楠屽��
+ value = isNaN(value) ? 0 : value;
+
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
+ }
+ break;
+ }
+ });
+
//淇濆瓨鎸夐挳
form.on('submit(btnSave)', function (data) {
set_SaveBill(data);
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 828ef98..468502b 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"
@@ -3905,17 +3905,30 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val() - 1;
+ var HEntryID = $("#HEntryID").val()-1;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
switch (field) {
case "HInspectVal": //妫�楠屽��
value = isNaN(value) ? 0 : value;
- if (HInspectVal < HUpLimit && HInspectVal > HDownLimit) {
+ if (HAnalysisMethod == "2") {
+ if (value <= HUpLimit && value >= HDownLimit) {
+ obj.update({
+ "HResult": "1"
+ });
+ $('#HResult' + (HEntryID + 1)).find("option[value='1']").attr("selected", true);
+
+ } else {
+ obj.update({
+ "HResult": "2"
+ });
+
+ $('#HResult' + (HEntryID + 1)).find("option[value='2']").attr("selected", true);
+ }
+ form.render('select');
}
-
break;
case "HTargetVal": //鐩爣鍊�
value = isNaN(value) ? 0 : value;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
new file mode 100644
index 0000000..c44b355
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
@@ -0,0 +1,169 @@
+锘�
+<!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">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</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 class="layui-inline">
+ <label class="layui-form-label" style="padding:9px 5px;width:90px;">鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarcode" id="HBarcode">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding:9px 5px;width:90px;">鐧芥爣</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HWhiteBardcode" id="HWhiteBardcode" style="width:800px">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <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/webConfig2.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util;
+ var sWhere = "";
+ var option = [];
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ set_InitGrid();
+ //鏌ヨ
+ get_FastQuery();
+ }
+
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBarcode = $("#HBarcode").val();
+ var HWhiteBardcode = $("#HWhiteBardcode").val();
+
+ if (HBarcode != "") {
+ sWhere += " and 鏉＄爜 like'%" + HBarcode+"%'";
+ }
+ if (HWhiteBardcode != "") {
+ sWhere += " and 鐧芥爣 like'%" + HWhiteBardcode+"%'";
+ }
+
+ get_Display(sWhere);
+
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'radio' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 150 }
+ , { field: '鍞竴鏍囪瘑', title: '鍞竴鏍囪瘑', sort: true, width: 200 }
+ , {
+ field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true, width: 110, templet: function (d) {
+ if (d.鍒跺崟鏃ユ湡 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍒跺崟鏃ユ湡, "yyyy-MM-dd");
+ }
+ }
+ , { field: '鐧芥爣', title: '鐧芥爣', sort: true, width: 700 }
+ , { field: '鏉＄爜', title: '鏉＄爜', sort: true, width: 300 }
+ ]]
+ };
+ }
+
+
+ function get_Display(sWhere) {
+
+ //杩涘叆椤甸潰鏄剧ず鐨勫垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/MES/MES_BarcodeWhiteLabelReport',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ }
+
+
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index fc5861a..8e749f0 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -1149,12 +1149,19 @@
//鎵撳嵃鎸夐挳
form.on('submit(Print)', function (data) {//閫�鍑�
//鎵撳紑鎵撳嵃妯℃澘
+ var BBM = $("#BBM").val();
+ var LDM = $("#LDM").val();
var linterid = $("#HInterID").val();
var Type = "HBarCodePrint";
var OpenTmp = "鐧芥爣鎵撳嵃1";
//var ReportViewer = document.getElementById("ReportViewer");
window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
- $("#Print2").click();
+
+ if (LDM == "DU3" && BBM == "1099081-00-E") {
+
+ } else {
+ $("#Print2").click();
+ }
});
//鐩戝惉琛ㄦ牸涓宸ュ叿浜嬩欢
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
index 2605f43..fc98867 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
@@ -83,8 +83,8 @@
<div class="layui-col-xs1 layui-inline">
<img src="222.jpg" style="width:70%;height:50%;" />
</div>
- <div class="layui-col-xs4 layui-inline">
- <div class="">
+ <div class="layui-col-xs4 layui-inline" >
+ <div class="" hidden="hidden">
<label class="layui-inline" style="width:60px;">娴佽浆鍗″彿</label>
<div class="layui-inline">
<input type="text" style="border-radius: 50px;width: 140%;" name="娴佽浆鍗″彿" id="HFbarcode" placeholder="璇疯緭鍏ユ祦杞崱鍙�" autocomplete="off" class="layui-input">
@@ -102,7 +102,7 @@
<input type="text" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉＄爜" id="SubBarcode" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮�" class="layui-input">
</div>
</div>
- <div class="">
+ <div class="" hidden="hidden">
<label class="layui-inline" style="width:60px;">鏄惁娣风</label>
<div class="layui-inline">
<input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
@@ -116,7 +116,7 @@
<input type="text" style="border-radius: 50px;" name="" id="zxQty" placeholder="璇疯緭鍏ヨ绠辨暟閲�" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="">
+ <div class="" hidden="hidden">
<label class="layui-inline" style="width:60px;">涓嶆弧绠辨爣璇�</label>
<div class="layui-inline">
<input type="text" style="border-radius: 50px;" name="" id="HRemark" autocomplete="off" placeholder="璇疯緭鍏ヤ笉婊＄鏍囪瘑" class="layui-input">
@@ -174,8 +174,8 @@
<table>
<tbody>
<tr>
- <th style="width:80px;padding:10px">娴佽浆鍗″彿</th>
- <td>
+ <th style="width:80px;padding:10px" hidden="hidden">娴佽浆鍗″彿</th>
+ <td hidden="hidden">
<input type="text" name="娴佽浆鍗″彿" id="HProcExchBillNo" lay-verify="" autocomplete="off" placeholder="娴佽浆鍗″彿" class="layui-input" style="background-color:#efefef4d" readonly>
<input type="hidden" name="娴佽浆鍗D" id="HFbarcodeID">
</td>
@@ -185,39 +185,39 @@
</td>
</tr>
<tr>
- <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鍙�</th>
- <td>
+ <th style="width:80px;padding:10px" hidden="hidden">鐢熶骇璁㈠崟鍙�</th>
+ <td hidden="hidden">
<input type="text" name="鐢熶骇璁㈠崟鍙�" id="HSourceBillNo" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
</td>
- <th style="width:80px;padding:10px">浜у搧浠ｇ爜</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">浜у搧浠ｇ爜</th>
+ <td hidden="hidden">
<input type="text" name="浜у搧浠ｇ爜" class="layui-input" id="HNumber" placeholder="浜у搧浠ｇ爜" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="鐗╂枡鍐呯爜" id="HMaterID">
</td>
</tr>
<tr>
- <th style="width:80px;padding:10px">浜у搧鍚嶇О</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">浜у搧鍚嶇О</th>
+ <td hidden="hidden">
<input type="text" name="浜у搧鍚嶇О" id="HMaterName" lay-verify="" autocomplete="off" placeholder="浜у搧鍚嶇О" class="layui-input" style="background-color:#efefef4d" readonly>
</td>
- <th style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">瑙勬牸鍨嬪彿</th>
+ <td hidden="hidden">
<input type="text" name="瑙勬牸鍨嬪彿" class="layui-input" id="HModel" placeholder="瑙勬牸鍨嬪彿" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
- <th style="width:80px;padding:10px">璁￠噺鍗曚綅</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">璁￠噺鍗曚綅</th>
+ <td hidden="hidden">
<input type="text" name="璁￠噺鍗曚綅" id="" lay-verify="" autocomplete="off" placeholder="璁￠噺鍗曚綅" class="layui-input" style="background-color:#efefef4d" readonly>
</td>
- <th style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">娴佽浆鍗℃暟閲�</th>
+ <td hidden="hidden">
<input type="text" name="娴佽浆鍗℃暟閲�" class="layui-input" id="" placeholder="娴佽浆鍗℃暟閲�" style="background-color:#efefef4d;" readonly>
</td>
</tr>
<tr>
- <th style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">鐢熶骇璁㈠崟鏁伴噺</th>
+ <td hidden="hidden">
<input type="text" name="鐢熶骇璁㈠崟鏁伴噺" id="" lay-verify="" autocomplete="off" placeholder="鐢熶骇璁㈠崟鏁伴噺" class="layui-input" style="background-color:#efefef4d" readonly>
</td>
<th style="width:80px;padding:10px">鍗曟嵁鍙�</th>
@@ -227,8 +227,8 @@
</td>
</tr>
<tr>
- <th style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">璁㈠崟璺熻釜鍙�</th>
+ <td hidden="hidden">
<input type="text" name="璁㈠崟璺熻釜鍙�" id="" lay-verify="" autocomplete="off" placeholder="璁㈠崟璺熻釜鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
</td>
<th style="width:80px;padding:10px">鎵樻潯鐮�</th>
@@ -239,8 +239,8 @@
</td>
</tr>
<tr>
- <th style="width:80px;padding:10px">椤圭洰鍙�</th>
- <td>
+ <th hidden="hidden" style="width:80px;padding:10px">椤圭洰鍙�</th>
+ <td hidden="hidden">
<input type="text" name="椤圭洰鍙�" id="HProjectNum" lay-verify="" autocomplete="off" placeholder="椤圭洰鍙�" class="layui-input" style="background-color:#efefef4d" readonly>
</td>
</tr>
@@ -968,11 +968,13 @@
var Customer = {
"Table": dataPrint
}
-
+ var LDM = $("#LDM").val();
var report1 = "";
var parintName = $("#PrintName").val();
- if (parintName == "鏂帿灏�") {
+ if (parintName == "鏂帿灏�" && LDM != "AAA") {
report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf");
+ } else if (LDM == "AAA") {
+ report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)_MXG.grf");
} else {
report1 = urlAddRandomNo("../../grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)2.grf");
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index ee21f2e..a1bbf12 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -471,6 +471,7 @@
get_Display();
get_Histogram1(mychart1);//鏌辩姸鍥�1
get_UsreList();
+ get_ReadConfigFile();
}
// 鐢熸垚鍗曟嵁鍙�
@@ -675,6 +676,41 @@
})
}
+ //璇诲彇閰嶇疆鏂囦欢
+ function get_ReadConfigFile() {
+ //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+ var data = localStorage.getItem("Cj_ProcessItemBGA");
+ if (data != null) {
+ var data2 = JSON.parse(data);
+ $("#HSourceID").val(data2["HSourceID"]);
+ $("#HSourceName").val(data2["HSourceName"]);
+ $("#HBadProcID").val(data2["HBadProcID"]);
+ $("#HBadProcName").val(data2["HBadProcName"]);
+ $("#HBadReasonID").val(data2["HBadReasonID"]);
+ $("#HBadReasonName").val(data2["HBadReasonName"]);
+ $("#HBadTypeID").val(data2["HBadTypeID"]);
+ $("#HBadTypeName").val(data2["HBadTypeName"]);
+ }
+ }
+
+ //瀛樺偍閰嶇疆鏂囦欢
+ function get_WriteConfigFile() {
+ //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+ localStorage.removeItem("Cj_ProcessItemBGA");
+ var data = {
+ HSourceID: $("#HSourceID").val()
+ , HSourceName: $("#HSourceName").val()
+ , HBadProcID: $("#HBadProcID").val()
+ , HBadProcName: $("#HBadProcName").val()
+ , HBadReasonID: $("#HBadReasonID").val()
+ , HBadReasonName: $("#HBadReasonName").val()
+ , HBadTypeID: $("#HBadTypeID").val()
+ , HBadTypeName: $("#HBadTypeName").val()
+ }
+ //鏈湴瀛樺偍
+ localStorage.setItem("Cj_ProcessItemBGA", JSON.stringify(data));
+ }
+
//鏌ヨ鐢ㄦ埛鍏宠仈鏁版嵁
function get_UsreList() {
var sWhere = " and 缂栫爜='" + sessionStorage["Czybm"] + "'";
@@ -683,6 +719,7 @@
$.ajax({
url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -749,8 +786,11 @@
$("#HMaterName").val(data1.data[0]["鐗╂枡鍚嶇О"]);
$("#HMaterModel").val(data1.data[0]["瑙勬牸鍨嬪彿"]);
$("#HBarCode").val(data1.data[0]["鏉＄爜"]);
- $("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
- $("#HBadReasonName").val(data1.data[0]["涓嶈壇鍘熷洜"]);
+ if (data1.data[0]["HBadReasonID"] != "0") {
+ $("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
+ $("#HBadReasonName").val(data1.data[0]["涓嶈壇鍘熷洜"]);
+ }
+
if (data1.data.length != 0) {
//$("#HBadTypeID").val();
@@ -826,6 +866,7 @@
//鑾峰彇鏁版嵁
$("#HSourceID").val(checkStatus.data[0].HItemID);
$("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ get_WriteConfigFile();
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -856,6 +897,7 @@
} else if (num == 1) {
$("#HBadProcID").val(checkStatus.data[0].HItemID);//
$("#HBadProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+ get_WriteConfigFile();
}
@@ -888,6 +930,7 @@
$("#HBadReasonID").val(checkStatus.data[0].HItemID);//鍐呯爜
$("#HBadReasonName").val(checkStatus.data[0].涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+ get_WriteConfigFile();
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
@@ -917,6 +960,7 @@
$("#HBadTypeID").val(checkStatus.data[0].HItemID);//鍐呯爜
$("#HBadTypeName").val(checkStatus.data[0].涓嶈壇绫诲瀷鍚嶇О);//鍚嶇О
+ get_WriteConfigFile();
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
index 5f68f5a..0b46fc7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA.html"
@@ -1391,6 +1391,7 @@
switch (billType) {
case "HCX":
+ case "htt":
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HSourceID": data.HItemID,
"HSourceName": data.鐢熶骇璧勬簮鍚嶇О
--
Gitblit v1.9.1