From 30d49ce4fa500cb24ad3407d50ec8e0da4ff0046 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 10 十二月 2025 11:33:43 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html | 2
WebTM/WebTM.csproj.user | 2
WebTM/views/车间管理/单品过站_小卫/Cj_BlueToothBarCodePrint.html | 378 +++++++++++++++++++++++++++++++++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html | 2
WebTM/views/grf/蓝牙条码标签_小卫.grf | 87 ++++++++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement_Sec.html | 4
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkPackage_Sec.html | 8
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 57 +++++
WebTM/WebTM.csproj | 1
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html | 2
10 files changed, 533 insertions(+), 10 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 63e897e..a46bba9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -948,6 +948,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batchKeyElement.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batch.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_BlueToothBarCodePrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SachetBarCodePrint.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill_Excel.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 59d7e88..4029b36 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
index f918d71..f5b5561 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -1821,6 +1821,8 @@
function GetMeesageBySourceBillNo(obj) {
var HSourceBillNo = $('#HSourceBillNo').val()
var HSourceBillType = $("#HMainSourceBillType").val()
+ var sHWHID = $("#HWHID").val()
+ var sHSCWHID = $("#HSCWHID").val()
layer.load(3)
$.ajax({
type: "GET",
diff --git "a/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf" "b/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf"
new file mode 100644
index 0000000..b0aad17
--- /dev/null
+++ "b/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf"
@@ -0,0 +1,87 @@
+锘縶
+ "Version":"6.8.2.2",
+ "Title":"鐢熶骇浠诲姟鍗�",
+ "PrintAsDesignPaper":false,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":135000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":4.7,
+ "Height":2.8,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "CenterView":true,
+ "ShowColLine":false,
+ "ShowRowLine":false,
+ "Border":{
+ "Styles":"[]"
+ },
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鏉＄爜缂栧彿"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"Column3",
+ "Width":4.7
+ }
+ ],
+ "ColumnContent":{
+ "Height":2.8,
+ "RowsPerPage":1,
+ "ColumnContentCell":[
+ {
+ "Column":"Column3",
+ "FreeCell":true,
+ "CanGrow":true,
+ "Control":[
+ {
+ "Type":"Barcode",
+ "Name":"Barcode1",
+ "Left":0.211667,
+ "Top":0.396875,
+ "Width":4.18042,
+ "Height":1.79917,
+ "BarcodeType":"Code128Auto",
+ "Text":"[#鏉＄爜缂栧彿#]"
+ }
+ ]
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "Height":0,
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "Text":"Column1"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Name":"ReportHeader1",
+ "Height":0,
+ "RepeatOnPage":true
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":0
+ }
+ ]
+}
\ No newline at end of file
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_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.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_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
new file mode 100644
index 0000000..f51e635
--- /dev/null
+++ "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_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
@@ -0,0 +1,378 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <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">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+ /*end*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 35%;
+ }
+
+ .layui-input-block {
+ margin-left: 0px;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-input-block">
+ <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+ <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;"><b>钃濈墮鏍囩鐢熸垚</b></h1>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
+ <label class="layui-form-label" style="padding-left:0px" id="">钃濈墮鐮�:</label>
+ <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
+ </div>
+ <div class="layui-inline">
+ <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" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaterModel" id="HMaterModel" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎿嶄綔鍛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaker" id="HMaker" autocomplete="off" style="background-color: #efefef4d;" readonly>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+ <ul class="layui-tab-title">
+ <li lay-id="1" class="layui-this">鏉＄爜淇℃伅</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>
+ </div>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ debugger;
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //鍏抽敭浠跺洖杞︽柟娉�
+ $('#HBarCode').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode').val();
+ if (event.keyCode == 13) {
+
+ if (HBarCode) {
+ SaveBarCodeCreate(HBarCode);
+ }
+
+ }
+ });
+
+ //閫夋嫨浜у搧浠ｇ爜鎸夐挳
+ form.on('submit(btnSearchMater)', function () {
+ get_checkSearchMater();
+ });
+
+ //鎵撳嵃
+ form.on('submit(ToolPrint)', function (data) {
+ get_PrintReport();
+ })
+
+
+ //閫�鍑�
+ form.on('submit(ToolExit)', function (data) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+ //鍒濆鍖栨潯鐮佷俊鎭〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+ , { field: 'HBarCodeID', title: '鏉＄爜ID', hide: true }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿' }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜'}
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О'}
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , page: false
+ , totalRow: true
+ , cellMinWidth: 75
+ , height: 'full-255'
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ option.data=[[]]
+ table.render(option);
+ }
+
+
+
+ //鏉＄爜鐢熸垚
+ function SaveBarCodeCreate(HBarCode) {
+
+ var HMaterID = $("#HMaterID").val();
+ var HOrgID = sessionStorage["OrganizationID"];
+ var user = sessionStorage["HUserName"];
+ var wait = layer.load();
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Cj_SingleStation/BlueToothBarCodeSave", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HBarCode": HBarCode, "HMaterID": HMaterID, "HOrgID": HOrgID, "user": user },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ //琛ㄦ牸璧嬪��
+ option.data.push({
+ "HBarCodeID": 0, "HBarCode": HBarCode, "HMaterNumber": $("#HMaterNumber").val(), "HMaterName": $("#HMaterName").val(), "HMaterModel": $("#HMaterModel").val()
+ });;
+ table.render(option);
+
+ //鑷姩鎵撳嵃
+ dy_PL(HBarCode);
+
+ $('#HBarCode').val("");
+ }
+ else {
+ layer.close(wait);
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ },
+ error: function (err) {
+ layer.close(wait);
+ layer.alert(err.responseText, { icon: 5 });
+ }
+ });
+ }
+
+ //鎵归噺鎵撳嵃
+ function dy_PL(HBarCode) {
+ var sWhere = "select HBarCode 鏉＄爜缂栧彿 from Gy_BarCodeBill where HBarCode = '" + HBarCode+"'"
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+
+
+ var Customer = {
+ "Table": data.data
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/钃濈墮鏉＄爜鏍囩_灏忓崼.grf"),
+ data: Customer
+ };
+
+ console.log(data.data[0].鏉＄爜缂栧彿);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ }
+
+ //浜у搧閫夋嫨椤甸潰
+ function get_checkSearchMater() {
+ var HOrgID = sessionStorage["OrganizationID"];
+
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐗╂枡琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, '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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+ });
+
+ function GetMaterValue(obj) {
+ //鑾峰彇鏁版嵁
+ $("#HMaterID").val(obj[0].HItemID);//鐗╂枡id
+ $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+ $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+ if ($("#HName").val() == "") {
+ $("#HName").val(obj[0].鐗╂枡浠ｇ爜);
+ }
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
index 49967fe..1db25ea 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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
@@ -607,7 +607,7 @@
});
}
- option.data = rowarr.slice();
+ option.data = JSON.parse(JSON.stringify(rowarr));
table.render(option);
layer.close(indexs);
@@ -816,6 +816,8 @@
//鍒囨崲浜у搧
$("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
$("#HBarCode_Key").focus();//鍏抽敭浠舵枃鏈閫変腑
+ option.data = JSON.parse(JSON.stringify(rowarr));
+ table.render(option);
get_Display();
}
else {
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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
index becd714..e2ad4b3 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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
@@ -821,7 +821,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
index 49967fe..c13cdd8 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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
@@ -25,7 +25,7 @@
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 10px;">
- <h1 style="text-align: center; padding: 10px 0;"><b>棣欏泭鍏抽敭浠剁粦瀹氳繃绔欏钩鍙�</b></h1>
+ <h1 style="text-align: center; padding: 10px 0;"><b>鍖呰鏍￠獙缁戝畾杩囩珯骞冲彴</b></h1>
</div>
<div class="layui-tab" style="width: 100%; float: left; background-color:white;">
<div class="layui-row">
@@ -607,7 +607,7 @@
});
}
- option.data = rowarr.slice();
+ option.data = JSON.parse(JSON.stringify(rowarr));
table.render(option);
layer.close(indexs);
@@ -810,8 +810,8 @@
success: function (data1) {
if (data1.count == 1) {
layer.close(indexs);
-
-
+ option.data = JSON.parse(JSON.stringify(rowarr));
+ table.render(option);
$("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
//鍒囨崲浜у搧
$("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index 137d559..8c7b775 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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -522,7 +522,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": "",
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index cba9f25..5af4327 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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.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_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -18,6 +18,7 @@
<script src="../../../layuiadmin/MESLanguage.js"></script>
<script src="../../../layuiadmin/SetColumn.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
@@ -86,7 +87,7 @@
<label class="layui-form-label" style="width: 85px; color: red; ">鎵撳嵃妯℃澘</label>
<div class="layui-input-block" style="margin-left: 120px;">
<select name="HPrintTemplate" id="HPrintTemplate" lay-filter="HPrintTemplate" >
- <option>鎵撳嵃妯℃澘1</option>
+ <option>褰╃洅鏍囩妯℃澘</option>
<option>鎵撳嵃妯℃澘2</option>
</select>
</div>
@@ -498,7 +499,7 @@
"field": {
"HProcID": $("#HProcID").val(), "HBatchNo": "",
"HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
- "HProdOrgID": sessionStorage["OrganizationID"],
+ "HPRDOrgID": sessionStorage["OrganizationID"],
"HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
}
};
@@ -520,6 +521,8 @@
$("#HBarCode_SN").focus();
$("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+ //鑷姩鎵撳嵃
+ dy_PL(HBarCode);
get_Display();
}
else {
@@ -537,6 +540,56 @@
});
}
+ //鎵归噺鎵撳嵃
+ function dy_PL(HBarCode) {
+ var sWhere = "select HBarCode 鏉＄爜缂栧彿 from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'"
+
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+
+
+ var Customer = {
+ "Table": data.data
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val()+".grf"),
+ data: Customer
+ };
+
+ console.log(data.data[0].鏉＄爜缂栧彿);
+ //var args = {
+ // report: urlAddRandomNo("../../grf/cs10.grf"),
+ // data: Customer
+ //};
+ webapp_ws_ajax_run(args);
+
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+
+ }
+
//鍔犺浇缃戞牸鏍规嵁缁戝畾宸ュ簭鍜岀敓浜ц祫婧�
function get_Display(sWhere = '') {
var ajaxLoad = layer.load();
--
Gitblit v1.9.1