MES-WEB-LayUI.git

parent: c254f51b | 补丁 | 提交 | show whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2026-02-05 12ba6d544d2b19b8cce3f8baab6c20c3334e9f99

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

1个文件已添加

3个文件已修改

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/单品过站_小卫/Cj_zuituoxiaowei_cacheList.html	855 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -967,6 +967,7 @@
    <Content Include="views\è½¦é´ç®¡ç\å³é®ä»¶ç»å®\Sc_KeyElementBindingList.html" />
    <Content Include="views\è½¦é´ç®¡ç\å³é®ä»¶ç»å®\Sc_KeyElementBinding.html" />
    <Content Include="views\è½¦é´ç®¡ç\ååè¿ç«\SingleItemTransitList.html" />
    <Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_zuituoxiaowei_cacheList.html" />
    <Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_ProcessItemStationPlatform_ShippingExport.html" />
    <Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_SaveSNByICMO.html" />
    <Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_ProcessItemStationPlatform_generateSNCode.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,13 +5,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:81/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

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/saomazutuo_xiaowei.html

@@ -470,6 +470,27 @@
            // è·åæ¡ç ä¿¡æ¯
            function GetMeesageByBarCode() {
                var sBarCode = $('#HBarCode').val();
                if (sBarCode.substring(0, 4) != 'MZXH') {
                    $.ajax({
                        url: GetWEBURL() + '/WEBSController/getMiddleCodeBySn',
                        type: 'GET',
                        async: false,
                        data: {
                            "HBarCode": sBarCode,
                            "HStockOrgID": hform.HStockOrgID
                        },
                        success: function (res) {
                            if (res.count == 1) {
                                sBarCode = res.data[0].HCaseCode;
                            }
                        },
                        error: function (res) {
                            layer.msg(res.Message || 'æ¡ç å¤çå¤±è´¥', { icon: 2 });
                            //layer.msg('æ¡ç å¤çå¤±è´¥ï¼è¯·æ£æ¥ç½ç»è¿æ¥', { icon: 2 });
                            return;
                        }
                    });
                }
                if (!sBarCode) {
                    layer.msg('æ¡ç ä¸è½ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼', { icon: 2 });
                    return;

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_Ð¡ÎÀ/Cj_zuituoxiaowei_cacheList.html

New file
@@ -0,0 +1,855 @@
ï»¿<!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/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/PageTitle.js"></script>
    <script src="../../../layuiadmin/Scripts/xlsx.full.min.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>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">SNç </label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_SN" id="HBarcode_SN" onfocus="this.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;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZB" id="HBarcode_ZB" onfocus="this.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;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZX" id="HBarcode_ZX" onfocus="this.select();">
                                    </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="HBeginDate" style="width:110px;">
                                    </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="HEndDate" style="width:110px;">
                                    </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-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" 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>
                        <table class="layui-hide" 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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="deleteBill" ><i class="layui-icon layui-icon-form"></i>å é¤</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
        }).extend({
            index: 'lib/index', //ä¸»å¥å£æ¨¡å
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
            //#region å¬ç¨åé
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , soulTable = layui.soulTable
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
            var option = [];
            var sWhere = "";
            var HModName = "Cj_ProcessItemStationPlatform_ShippingExport";


            var ins;                        //ç¨äºå¯¼åºexcel
            //ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
            var titleData = ["hmainid","hsubid","HProdOrgID"];

            //#region ãå¨æè·åæ¨¡ååç§°ã
            var HModuleType = "";
            //éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
            //#endregion

            //#endregion

            //#region è¿å¥é¡µé¢å³å è½½

            //åå§åçé¢
            set_ClearBill();

            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //#endregion  çå¬ç½æ ¼è¡¨ä½äºä»¶

            //#endregion

            //#region å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //æ°å¢
                    case 'set_AddNew': set_AddNew();
                        break;
                    //ç¼è¾
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
                    //å®¡æ ¸æé®      ï¼1:å®¡æ ¸ã2:åå®¡æ ¸ï¼
                    case 'btn-Audit':
                        set_CheckBill(0);
                        break;
                    //åå®¡æ ¸æé®
                    case 'btn-DeAudit':
                        set_CheckBill(1);
                        break;
                    //å³éæé®        ï¼1:å³éã2:åå³éï¼
                    case 'btn-Close':
                        set_CloseBill(0);
                        break;
                    //åå³éæé®
                    case 'btn-DeClose':
                        set_CloseBill(1);
                        break;
                    //ä½åºæé®        ï¼1:ä½åºã2:åä½åºï¼
                    case 'btn-Drop':
                        set_DropBill(0);
                        break;
                    //åä½åºæé®
                    case 'btn-DeDrop':
                        set_DropBill(1);
                        break;
                    //å¯¼åºexcel
                    case 'get_export':
                        get_Export();
                        break;
                    //éåºæé®
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //åè®¾ç½®
                    case 'set_HideColumn': get_HideColumn();
                        break;
                    //å é¤
                    case 'deleteBill': deleteBill();
                        break;
                };
            });
            //#endregion

            //#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 ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //#region åå»è¿å¥ç¼è¾
            table.on('rowDouble(mainTable)', function (obj) {
                //éä¸é«äº® åå»è¡
                obj.tr.find(':checkbox').prop('checked', true);
                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = true;
                    }
                });
            });
            //#endregion

            //#region éç½®æé®
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //#endregion

            //#region æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(2);
            });
            //#endregion

            //SNç åè½¦æ¹æ³
            $('#HBarcode_SN').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery(2);
                }
            });

            //æ æ¿ç åè½¦æ¹æ³
            $('#HBarcode_ZB').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery(2);
                }
            });

            //ä¸ç®±ç åè½¦æ¹æ³
            $('#HBarcode_ZX').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery(2);
                }
            });

            //#endregion

            //#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

            //#region åå§åçé¢
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //æ¥è¯¢
                get_FastQuery(1);
            }
            //#endregion

            //#region åå§åè¡¨æ ¼æ¹æ³
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 500
                    , limits: [50, 500, 5000, 20000]
                    , done: function () {
                        soulTable.render(this)
                    }
                };
            }
            //#endregion
            //#endregion
            //#region å é¤
            function deleteBill()
            {
                    var checkStatus = table.checkStatus('mainTable')
                        , data = checkStatus.data;
                    if (checkStatus.data.length === 1) {
                        var HInterID = data[0].HInterID.toString();
                        layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                            var wait = layer.load();
                            //é»è¾å é¤æ¹æ³
                            $.ajax({
                                url: GetWEBURL() + 'Cj_SingleStation/deleteBill',
                                type: "GET",
                                data: { "HInterID": HInterID, "user": sessionStorage["HUserName"],"gnsy":"" },
                                success: function (result) {
                                    if (result.count == 1) {
                                        layer.msg(result.Message, { icon: 1 }, function () {
                                            // å¾å°frameç´¢å¼
                                            var index = layer.getFrameIndex(window.name);
                                            //å³éå½åframe
                                            layer.close(wait);
                                            //ä¿®æ¹ä¸ºååå·æ°çé¢
                                            $("#btnSearch").trigger('click');
                                            get_FastQuery("");
                                        });
                                    } else {
                                        layer.alert(result.code + result.Message, { icon: 5 });
                                        layer.close(wait);
                                    }
                                }, error: function () {
                                    layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                                    layer.close(wait);
                                }
                            });
                        })
                    }
                    else {
                        layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                    }

                }
            //#endregion
            //#region æ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_SingleStation/xiaoweizutuo_CacheList',
                    async: false,
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "gnsy": ""},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var totalArray = ["æ°é"];
                            var data = [];
                            var col = [];
                            //ç»ç©ºçæ°ç»èµå¼
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } 
                                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: 120, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, filter: true });
                                    }
                                }
                            }
                            //å¨ææ¾ç¤ºåå
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 800
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 200
                                , limits: [50, 200, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);

                            //å·æ°è¡¨æ ¼æ°æ®
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                    }
                });

            }
            //#endregion

            //#region å¿«éè¿æ»¤
            function get_FastQuery(number) {
                var HBarcode_SN = $("#HBarcode_SN").val();  //SNå·
                var HBarcode_ZB = $("#HBarcode_ZB").val();  //æ æ¿ç 
                var HBarcode_ZX = $("#HBarcode_ZX").val();  //ä¸ç®±ç 
                var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HEndDate").val();//ç»ææ¥æ

                //ä»»æåæ®µè¿æ»¤
                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;
                }

                if (HBarcode_SN) {
                    sWhere += " and SNç  like '%" + HBarcode_SN + "%'";
                }
                if (HBarcode_ZB) {
                    sWhere += "and  æ æ¿ç  like '%" + HBarcode_ZB + "%'";
                }
                if (HBarcode_ZX) {
                    sWhere += "and  ä¸ç®±ç  like '%" + HBarcode_ZX + "%'";
                }
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),çäº§æ¥æ, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),çäº§æ¥æ, 23) <= '" + HDate1 + "'";
                }

                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //#endregion

            //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
            function set_ClearQuery() {
                $("#HBarcode_SN").val("");
                $("#HBarcode_ZB").val("");
                $("#HBarcode_ZX").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');
                
                get_FastQuery("")
                sWhere = "";
            }
            //#endregion

            //#region å¯¼åºExecel
            function get_Export() {

                var data = option.data
                data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // åè®¾åæ®µåä¸ºfield
                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '');  // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
                        }
                    }
                });

                // æ ¡éª1ï¼æ°æ®ä¸ºç©ºåæç¤º
                if (!data || data.length === 0) {
                    layer.msg('ææ æ°æ®å¯å¯¼åº', { icon: 2 });
                    return;
                }

                // åå»ºç©ºå·¥ä½è¡¨
                var ws = {};

                // éç½®è¡¨å¤´æ é¢ï¼ææ¬æ ¼å¼ï¼
                var headersTitle = [];
                var headersField = [];
                var excludeFields = [];
                //å¾ªç¯æ·»å æ é¢
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide == false && excludeFields.indexOf(option.cols[0][i].title) == -1) {
                        headersTitle.push(option.cols[0][i].title);
                        headersField.push(option.cols[0][i].field);
                    }
                }
                //ææ é¢æ·»å å°excelè¡¨æ ¼
                headersField.forEach((header, idx) => {
                    var cellRef = XLSX.utils.encode_cell({ r: 0, c: idx }); // è¡0ä¸ºè¡¨å¤´
                    ws[cellRef] = { v: header, t: 's', z: "@" }; // t:'s' ä»£è¡¨ææ¬æ ¼å¼, z: "@" æå®ååæ ¼ä¸ºææ¬ç±»å
                });

                // å¡«åæ°æ®å¹¶æå®æ¯ä¸ªååæ ¼çæ ¼å¼
                data.forEach((row, rowIdx) => {
                    var rowNum = rowIdx + 1; // æ°æ®ä»ç¬¬2è¡ï¼è¡1ï¼å¼å§
                    if (!row) return;
                    var Hname = "";
                    //ååæ ¼æ°æ®èµå¼
                    for (var i = 0; i < headersTitle.length; i++) {
                        Hname = headersTitle[i];
                        ws[XLSX.utils.encode_cell({ r: rowNum, c: i })] = { v: row[Hname] || '', t: 's', z: "@" };
                    }
                });

                // å¯éï¼è®¾ç½®åå®½ï¼æåå¯¼åºæä»¶çå¯è¯»æ§
                var HColWidth = [];
                for (var i = 0; i < headersTitle.length; i++) {
                    var HCelWidth = data[0][headersTitle[i]].length + 8;
                    HColWidth.push({ wch: HCelWidth == 8 ? 30 : HCelWidth});
                }
                ws['!cols'] = HColWidth;
                // æ è®°æ°æ®èå´ï¼å³é®ï¼è®©Excelè¯å«ææ°æ®çåºåï¼
                ws['!ref'] = XLSX.utils.encode_range({
                    s: { r: 0, c: 0 }, // èµ·å§ï¼è¡0å0
                    e: { r: data.length, c: headersTitle.length - 1 } // ç»æï¼æåä¸è¡æåä¸å
                });

                // æå»ºå·¥ä½ç°¿å¹¶å¯¼åº
                var wb = XLSX.utils.book_new();
                XLSX.utils.book_append_sheet(wb, ws, 'åºè´§ä¿¡æ¯');
                XLSX.writeFile(wb, 'åºè´§å¯¼åº.xlsx');
            }
            //#endregion

           
            //#region å·æ°
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }
            //#endregion

            //#region éèåè®¾ç½®
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç 

                contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
                    , title: "éèåè®¾ç½®"  //æ é¢
                    , closeBtn: 1  //çªä½å³ä¸è§å³é ç æ ·å¼
                    , shift: 2 //å¼¹åºå¨ç»
                    , area: ["50%", "90%"] //çªä½å¤§å°
                    , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
                    , content: [contentUrl, "yes"]
                    , btn: ["ç¡®å®", "åæ¶"]
                    , btn1: function (index, laero) {
                        //å·æ°è¡¨æ ¼æ°æ®
                        DisPlay_HideColumn();
                        //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
                        layer.close(index);//å³éå¼¹çª
                    }
                })
            }
            //#endregion
            //#region æ¾ç¤ºåæ°æ®
            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) {
                            titleData = ["hmainid", "HMainEmpID", "HDeptID", "HGroupID", "HOrgID", "hsubid", "HMaterID", "HUnitID", "HEmpID", "HSourceID", "HBadReasonID", "HICMOInterID", "HICMOEntryID", "HICMOBillNo", "HProcExchInterID", "HProcExchEntryID", "HSourceInterID", "HSourceEntryID", "HSourceBillNo", "HSourceBillType", "HBarCode", "HReportType", "HAddr", "HMaker", "HMakeDate", "HMainSourceInterID", "HMainSourceEntryID", "HMainSourceBillNo", "HMainSourceBillType"];
                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
                            newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
                            dataCol = data1.data[0].HGridString.split(',');
                            //åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
                            if (dataCol.length == option.cols[0].length - 1) {
                                //éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
                                for (var j = 0; j < option.cols[0].length - 1; j++) {
                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
                                        var dataCols = dataCol[j].split('|');
                                        //éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
                                            //éèå
                                            if (dataCols[1] == 1) {
                                                option.cols[0][i + 1]["hide"] = true;
                                            }
                                            //è®¾ç½®åå®½
                                            if (dataCols[3] > 0) {
                                                option.cols[0][i + 1]["width"] = dataCols[3];
                                            }
                                            //è®¾ç½®åå®¹åä½å¤§å°
                                            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[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                                option.cols[0][i + 1]["hide"] = false;
                                            }
                                            //ç»è®¡å
                                            if (dataCols[6] == 1) {
                                                option.cols[0][i + 1]["totalRow"] = true;
                                            }
                                            //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
                                            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;
                                            }
                                            //è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
                                            if (dataCols[4] != null && dataCols[4] != "") {
                                                option.cols[0][i + 1]["title"] = dataCols[4];
                                            }
                                            newCols[0].push(option.cols[0][i + 1]);
                                        }
                                    }
                                }
                                //éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
                                if (dataCol.length == newCols[0].length - 1) {
                                    option.cols = newCols;
                                    //åæ¶å»ç»å
                                    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


            //#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
        });

            //#endregion

        //ä»¥ä¸æ¯layuiæ¨¡å
    </script>

</body>
</html>

			@@ -967,6 +967,7 @@
			<Content Include="views\è½¦é´ç®¡ç\å³é®ä»¶ç»å®\Sc_KeyElementBindingList.html" />
			<Content Include="views\è½¦é´ç®¡ç\å³é®ä»¶ç»å®\Sc_KeyElementBinding.html" />
			<Content Include="views\è½¦é´ç®¡ç\ååè¿ç«\SingleItemTransitList.html" />
			<Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_zuituoxiaowei_cacheList.html" />
			<Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_ProcessItemStationPlatform_ShippingExport.html" />
			<Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_SaveSNByICMO.html" />
			<Content Include="views\è½¦é´ç®¡ç\ååè¿ç«_å°å«\Cj_ProcessItemStationPlatform_generateSNCode.html" />

			@@ -5,13 +5,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:81/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

			@@ -470,6 +470,27 @@
			// è·åæ¡ç ä¿¡æ¯
			function GetMeesageByBarCode() {
			var sBarCode = $('#HBarCode').val();
			if (sBarCode.substring(0, 4) != 'MZXH') {
			$.ajax({
			url: GetWEBURL() + '/WEBSController/getMiddleCodeBySn',
			type: 'GET',
			async: false,
			data: {
			"HBarCode": sBarCode,
			"HStockOrgID": hform.HStockOrgID
			},
			success: function (res) {
			if (res.count == 1) {
			sBarCode = res.data[0].HCaseCode;
			}
			},
			error: function (res) {
			layer.msg(res.Message \|\| 'æ¡ç å¤çå¤±è´¥', { icon: 2 });
			//layer.msg('æ¡ç å¤çå¤±è´¥ï¼è¯·æ£æ¥ç½ç»è¿æ¥', { icon: 2 });
			return;
			}
			});
			}
			if (!sBarCode) {
			layer.msg('æ¡ç ä¸è½ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼', { icon: 2 });
			return;