1
duhe
2025-08-05 21d40b36d600d91e162f25cd970534e5852da75e
1
22个文件已修改
1个文件已添加
1853 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_PDA.html 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html 377 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/Gy_MatePrice.html 333 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/Gy_MatePriceEdit.html 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/凯贝日计划导入/JIT_DayPlanPlatForm_KB.html 489 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html 116 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/添康三周排产/ReportPODemandPlanBillList_S_TK.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -648,6 +648,7 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />
    <Content Include="views\生产管理\发货计划平台(三升)\Xs_SendGoodsPlanForm.html" />
    <Content Include="views\生产管理\发货计划平台(三升)\Xs_SendGoodsPlanImport.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,12 +6,11 @@
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
   // var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
     //var WEBURL = "http://localhost: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/WMSɨÂëÄ£¿é/ÆäËû³ö¿â/Kf_OtherOutBillList_PDA.html
@@ -14,6 +14,7 @@
    <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/qrcode/qrcode.min.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -80,6 +81,9 @@
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
@@ -287,6 +291,46 @@
        //#endregion
        //#region æ˜¾ç¤ºäºŒç»´ç 
        form.on('submit(cmdQRCode)', function () {
            var checkStatus = table.checkStatus('Uploaded-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                showQRCode(data[0].单据号, "单据二维码");
            }
            else {
                layer.msg('请先选中一行数据!');
            }
        });
        function showQRCode(content, title) {
            // æ˜¾ç¤ºå¼¹çª—
            layer.open({
                type: 1,
                title: title || '二维码',
                skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                area: ['300px', '360px'],
                closeBtn: 1,
                shadeClose: true,
                content: '<div style="text-align:center;padding:45px;">' +
                    '<div id="qrcode" style="margin-left: auto;"></div>' +
                    '<div style="">' + content + '</div></div>',
                success: function (layero, index) {
                    // åœ¨å¼¹çª—成功打开后生成二维码
                    new QRCode(document.getElementById("qrcode"), {
                        text: content,
                        width: 200,
                        height: 200,
                        colorDark: "#000000",
                        colorLight: "#ffffff",
                        correctLevel: QRCode.CorrectLevel.H
                    });
                }
            });
        }
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
WebTM/views/WMSɨÂëÄ£¿é/ÆäËû³ö¿â/Kf_OtherOutBill_PDA.html
@@ -15,6 +15,7 @@
    <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/qrcode/qrcode.min.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
@@ -162,8 +163,13 @@
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                            <div class="layui-col-xs8">
                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                            <div class="layui-col-xs2">
                                                <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-row">
@@ -1357,7 +1363,7 @@
                                                parent.location.href = "../../WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                                /*parent.location.href = "../../../views/index_Mobile.html";*/
                                            }
                                        }//关闭
                                    }
@@ -1532,7 +1538,42 @@
            //#endregion
            //#region äºŒç»´ç ç”Ÿæˆ
            form.on('submit(generateQRCodeBtn)', function () {
                showQRCode($("#HBillNo").val(), "单据二维码");
            });
            /**
             * æ˜¾ç¤ºäºŒç»´ç å¼¹çª—
             * @param {string} content - è¦ç”ŸæˆäºŒç»´ç çš„内容
             * @param {string} title - å¼¹çª—标题
             */
            function showQRCode(content, title) {
                // æ˜¾ç¤ºå¼¹çª—
                layer.open({
                    type: 1,
                    title: title || '二维码',
                    skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                    area: ['300px', '360px'],
                    closeBtn: 1,
                    shadeClose: true,
                    content: '<div style="text-align:center;padding:45px;">' +
                        '<div id="qrcode" style="margin-left: auto;"></div>' +
                        '<div style="">' + content + '</div></div>',
                    success: function (layero, index) {
                        // åœ¨å¼¹çª—成功打开后生成二维码
                        new QRCode(document.getElementById("qrcode"), {
                            text: content,
                            width: 200,
                            height: 200,
                            colorDark: "#000000",
                            colorLight: "#ffffff",
                            correctLevel: QRCode.CorrectLevel.H
                        });
                    }
                });
            }
            //#endregion
            //#region æ‰«ææºå•条码
            //扫描源单条码
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÈë¿â/Kf_ProductInBillList_PDA.html
@@ -14,6 +14,7 @@
    <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/qrcode/qrcode.min.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -80,6 +81,9 @@
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
@@ -287,6 +291,46 @@
        //#endregion
        //#region æ˜¾ç¤ºäºŒç»´ç 
        form.on('submit(cmdQRCode)', function () {
            var checkStatus = table.checkStatus('Uploaded-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                showQRCode(data[0].单据号, "单据二维码");
            }
            else {
                layer.msg('请先选中一行数据!');
            }
        });
        function showQRCode(content, title) {
            // æ˜¾ç¤ºå¼¹çª—
            layer.open({
                type: 1,
                title: title || '二维码',
                skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                area: ['300px', '360px'],
                closeBtn: 1,
                shadeClose: true,
                content: '<div style="text-align:center;padding:45px;">' +
                    '<div id="qrcode" style="margin-left: auto;"></div>' +
                    '<div style="">' + content + '</div></div>',
                success: function (layero, index) {
                    // åœ¨å¼¹çª—成功打开后生成二维码
                    new QRCode(document.getElementById("qrcode"), {
                        text: content,
                        width: 200,
                        height: 200,
                        colorDark: "#000000",
                        colorLight: "#ffffff",
                        correctLevel: QRCode.CorrectLevel.H
                    });
                }
            });
        }
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÈë¿â/Kf_ProductInBill_PDA.html
@@ -15,6 +15,7 @@
    <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/qrcode/qrcode.min.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
@@ -140,8 +141,13 @@
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                            <div class="layui-col-xs8">
                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                            <div class="layui-col-xs2">
                                                <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-row">
@@ -1132,7 +1138,7 @@
                                                parent.location.href = "../../WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                                /*parent.location.href = "../../../views/index_Mobile.html";*/
                                            }
                                        }//关闭
                                    }
@@ -1294,6 +1300,41 @@
            //#endregion
            //#region äºŒç»´ç ç”Ÿæˆ
            form.on('submit(generateQRCodeBtn)', function () {
                showQRCode($("#HBillNo").val(), "单据二维码");
            });
            /**
             * æ˜¾ç¤ºäºŒç»´ç å¼¹çª—
             * @param {string} content - è¦ç”ŸæˆäºŒç»´ç çš„内容
             * @param {string} title - å¼¹çª—标题
             */
            function showQRCode(content, title) {
                // æ˜¾ç¤ºå¼¹çª—
                layer.open({
                    type: 1,
                    title: title || '二维码',
                    skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                    area: ['300px', '360px'],
                    closeBtn: 1,
                    shadeClose: true,
                    content: '<div style="text-align:center;padding:45px;">' +
                        '<div id="qrcode" style="margin-left: auto;"></div>' +
                        '<div style="">' + content + '</div></div>',
                    success: function (layero, index) {
                        // åœ¨å¼¹çª—成功打开后生成二维码
                        new QRCode(document.getElementById("qrcode"), {
                            text: content,
                            width: 200,
                            height: 200,
                            colorDark: "#000000",
                            colorLight: "#ffffff",
                            correctLevel: QRCode.CorrectLevel.H
                        });
                    }
                });
            }
            //#endregion
            //#region æ‰«ææºå•条码
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBillList_PDA.html
@@ -14,6 +14,7 @@
    <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/qrcode/qrcode.min.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -80,6 +81,9 @@
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
@@ -286,6 +290,46 @@
        //#endregion
        //#region æ˜¾ç¤ºäºŒç»´ç 
        form.on('submit(cmdQRCode)', function () {
            var checkStatus = table.checkStatus('Uploaded-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                showQRCode(data[0].单据号, "单据二维码");
            }
            else {
                layer.msg('请先选中一行数据!');
            }
        });
        function showQRCode(content, title) {
            // æ˜¾ç¤ºå¼¹çª—
            layer.open({
                type: 1,
                title: title || '二维码',
                skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                area: ['300px', '360px'],
                closeBtn: 1,
                shadeClose: true,
                content: '<div style="text-align:center;padding:45px;">' +
                    '<div id="qrcode" style="margin-left: auto;"></div>' +
                    '<div style="">' + content + '</div></div>',
                success: function (layero, index) {
                    // åœ¨å¼¹çª—成功打开后生成二维码
                    new QRCode(document.getElementById("qrcode"), {
                        text: content,
                        width: 200,
                        height: 200,
                        colorDark: "#000000",
                        colorLight: "#ffffff",
                        correctLevel: QRCode.CorrectLevel.H
                    });
                }
            });
        }
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBill_PDA.html
@@ -15,6 +15,7 @@
    <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/qrcode/qrcode.min.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
@@ -152,8 +153,13 @@
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                            <div class="layui-col-xs8">
                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                            <div class="layui-col-xs2">
                                                <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-row">
@@ -1194,7 +1200,7 @@
                                                parent.location.href = "../../WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                                /*parent.location.href = "../../../views/index_Mobile.html";*/
                                            }
                                        }//关闭
                                    }
@@ -1369,6 +1375,41 @@
            //#endregion
            //#region äºŒç»´ç ç”Ÿæˆ
            form.on('submit(generateQRCodeBtn)', function () {
                showQRCode($("#HBillNo").val(), "单据二维码");
            });
            /**
             * æ˜¾ç¤ºäºŒç»´ç å¼¹çª—
             * @param {string} content - è¦ç”ŸæˆäºŒç»´ç çš„内容
             * @param {string} title - å¼¹çª—标题
             */
            function showQRCode(content, title) {
                // æ˜¾ç¤ºå¼¹çª—
                layer.open({
                    type: 1,
                    title: title || '二维码',
                    skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                    area: ['300px', '360px'],
                    closeBtn: 1,
                    shadeClose: true,
                    content: '<div style="text-align:center;padding:45px;">' +
                        '<div id="qrcode" style="margin-left: auto;"></div>' +
                        '<div style="">' + content + '</div></div>',
                    success: function (layero, index) {
                        // åœ¨å¼¹çª—成功打开后生成二维码
                        new QRCode(document.getElementById("qrcode"), {
                            text: content,
                            width: 200,
                            height: 200,
                            colorDark: "#000000",
                            colorLight: "#ffffff",
                            correctLevel: QRCode.CorrectLevel.H
                        });
                    }
                });
            }
            //#endregion
            //#region æ‰«ææºå•条码
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBillList_PDA.html
@@ -14,6 +14,7 @@
    <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/qrcode/qrcode.min.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -80,6 +81,9 @@
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
@@ -287,6 +291,46 @@
        //#endregion
        //#region æ˜¾ç¤ºäºŒç»´ç 
        form.on('submit(cmdQRCode)', function () {
            var checkStatus = table.checkStatus('Uploaded-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                showQRCode(data[0].单据号, "单据二维码");
            }
            else {
                layer.msg('请先选中一行数据!');
            }
        });
        function showQRCode(content, title) {
            // æ˜¾ç¤ºå¼¹çª—
            layer.open({
                type: 1,
                title: title || '二维码',
                skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                area: ['300px', '360px'],
                closeBtn: 1,
                shadeClose: true,
                content: '<div style="text-align:center;padding:45px;">' +
                    '<div id="qrcode" style="margin-left: auto;"></div>' +
                    '<div style="">' + content + '</div></div>',
                success: function (layero, index) {
                    // åœ¨å¼¹çª—成功打开后生成二维码
                    new QRCode(document.getElementById("qrcode"), {
                        text: content,
                        width: 200,
                        height: 200,
                        colorDark: "#000000",
                        colorLight: "#ffffff",
                        correctLevel: QRCode.CorrectLevel.H
                    });
                }
            });
        }
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_PDA.html
@@ -15,6 +15,7 @@
    <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/qrcode/qrcode.min.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
@@ -199,8 +200,13 @@
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                            <div class="layui-col-xs8">
                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                            <div class="layui-col-xs2">
                                                <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-row">
@@ -1828,7 +1834,7 @@
                                                parent.location.href = "../../WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                               /* parent.location.href = "../../../views/index_Mobile.html";*/
                                            }
                                        }//关闭
                                    }
@@ -2021,7 +2027,42 @@
            //#endregion
            //#region äºŒç»´ç ç”Ÿæˆ
            form.on('submit(generateQRCodeBtn)', function () {
                showQRCode($("#HBillNo").val(), "单据二维码");
            });
            /**
             * æ˜¾ç¤ºäºŒç»´ç å¼¹çª—
             * @param {string} content - è¦ç”ŸæˆäºŒç»´ç çš„内容
             * @param {string} title - å¼¹çª—标题
             */
            function showQRCode(content, title) {
                // æ˜¾ç¤ºå¼¹çª—
                layer.open({
                    type: 1,
                    title: title || '二维码',
                    skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                    area: ['300px', '360px'],
                    closeBtn: 1,
                    shadeClose: true,
                    content: '<div style="text-align:center;padding:45px;">' +
                        '<div id="qrcode" style="margin-left: auto;"></div>' +
                        '<div style="">' + content + '</div></div>',
                    success: function (layero, index) {
                        // åœ¨å¼¹çª—成功打开后生成二维码
                        new QRCode(document.getElementById("qrcode"), {
                            text: content,
                            width: 200,
                            height: 200,
                            colorDark: "#000000",
                            colorLight: "#ffffff",
                            correctLevel: QRCode.CorrectLevel.H
                        });
                    }
                });
            }
            //#endregion
            //#region æ‰«ææºå•条码
            //扫描源单条码
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBillList_PDA.html
@@ -14,6 +14,7 @@
    <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/qrcode/qrcode.min.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -80,6 +81,9 @@
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
@@ -287,6 +291,46 @@
        //#endregion
        //#region æ˜¾ç¤ºäºŒç»´ç 
        form.on('submit(cmdQRCode)', function () {
            var checkStatus = table.checkStatus('Uploaded-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                showQRCode(data[0].单据号, "单据二维码");
            }
            else {
                layer.msg('请先选中一行数据!');
            }
        });
        function showQRCode(content, title) {
            // æ˜¾ç¤ºå¼¹çª—
            layer.open({
                type: 1,
                title: title || '二维码',
                skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                area: ['300px', '360px'],
                closeBtn: 1,
                shadeClose: true,
                content: '<div style="text-align:center;padding:45px;">' +
                    '<div id="qrcode" style="margin-left: auto;"></div>' +
                    '<div style="">' + content + '</div></div>',
                success: function (layero, index) {
                    // åœ¨å¼¹çª—成功打开后生成二维码
                    new QRCode(document.getElementById("qrcode"), {
                        text: content,
                        width: 200,
                        height: 200,
                        colorDark: "#000000",
                        colorLight: "#ffffff",
                        correctLevel: QRCode.CorrectLevel.H
                    });
                }
            });
        }
        //#endregion
        //#region åˆ é™¤åŠŸèƒ½æŽ§ä»¶
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_PDA.html
@@ -15,6 +15,7 @@
    <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/qrcode/qrcode.min.js"></script>
    <style>
        .layui-col-xs8 {
            width: 55.666667%;
@@ -155,8 +156,13 @@
                                            <div class="layui-col-xs3">
                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">单据号</label>
                                            </div>
                                            <div class="layui-col-xs9">
                                            <div class="layui-col-xs8">
                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
                                            </div>
                                            <div class="layui-col-xs2">
                                                <button type="button" lay-submit="" lay-filter="generateQRCodeBtn" class="layui-btn" id="generateQRCodeBtn" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-row">
@@ -1222,10 +1228,10 @@
                                                parent.location.href = "../../WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html";
                                            }
                                            else {
                                                parent.location.href = "../../../views/index_Mobile.html";
                                                /*parent.location.href = "../../../views/index_Mobile.html";*/
                                            }
                                        }//关闭
                                    }
                                        }
                                        , function () {
                                            location.replace('Kf_MateOutBill_PDA.html?OperationType=1&HInterID=0');
                                        });//新增
@@ -1406,6 +1412,42 @@
            //#endregion
            //#region äºŒç»´ç ç”Ÿæˆ
            form.on('submit(generateQRCodeBtn)', function () {
                showQRCode($("#HBillNo").val(), "单据二维码");
            });
            /**
             * æ˜¾ç¤ºäºŒç»´ç å¼¹çª—
             * @param {string} content - è¦ç”ŸæˆäºŒç»´ç çš„内容
             * @param {string} title - å¼¹çª—标题
             */
            function showQRCode(content, title) {
                // æ˜¾ç¤ºå¼¹çª—
                layer.open({
                    type: 1,
                    title: title || '二维码',
                    skin: 'layui-layer-demo', // è‡ªå®šä¹‰çš®è‚¤
                    area: ['300px', '360px'],
                    closeBtn: 1,
                    shadeClose: true,
                    content: '<div style="text-align:center;padding:45px;">' +
                        '<div id="qrcode" style="margin-left: auto;"></div>' +
                        '<div style="">' + content + '</div></div>',
                    success: function (layero, index) {
                        // åœ¨å¼¹çª—成功打开后生成二维码
                        new QRCode(document.getElementById("qrcode"), {
                            text: content,
                            width: 200,
                            height: 200,
                            colorDark: "#000000",
                            colorLight: "#ffffff",
                            correctLevel: QRCode.CorrectLevel.H
                        });
                    }
                });
            }
            //#endregion
            //#region æ‰«ææºå•条码
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_BarCodeReport.html
@@ -219,7 +219,11 @@
                , util = layui.util
            //查询条件
            var sWhere = "";
            var sWhere_1 = "";
            var sWhere_2 = "";
            var option = [];
            var option_BadReason = [];
            var option_LotNoList = [];
            var HModName = "Sc_BarCodeReport";
            var ins;                        //用于导出excel
            //#endregion
@@ -252,11 +256,8 @@
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
            form.on('submit(btnSearch)', function (data) {
                        get_FastQuery();
            });
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -279,8 +280,9 @@
                initSelects();
                set_InitGrid();
                //加载数据到网格
                get_FastQuery();
                set_Graphics();
               // set_Graphics();
            }
            //初始化表格
@@ -376,17 +378,11 @@
                    }
                })
            }
           //#endregion
            //加载网格
            function get_Display(sWhere) {
                if ($("#Station").val() != null && $("#Station").val() != 0) {
                    sWhere = sWhere;
                }
                else
                sWhere = "";
                var wait = layer.load();//遮罩
            //#endregion
            function get_BadReasonCount(sWhere) {
                $.ajax({
                    url: GetWEBURL() + '/Gy_BarCodeReportController/list',
                    url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReason_proc',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -394,6 +390,72 @@
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.data[1].list) {
                                data.push({ "name": data1.data[1].list[key].ColmCols, "Type": data1.data[1].list[key].ColmType });
                            }
  /*                          option_BadReason.cols = [col];*/
                            option_BadReason.data = data1.data[1];
                            /*ins = table.render(option_BadReason);*/
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            function get_LotNoCount(sWhere) {
                $.ajax({
                    url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReasonTotal_proc',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            /*                          option_BadReason.cols = [col];*/
                            option_LotNoList.data = data1.data;
                            /*ins = table.render(option_BadReason);*/
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //加载网格
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/Gy_BarCodeReportController/GetBadReason_proc',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            data_1 = data1.data[0];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -417,7 +479,7 @@
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            option.data = data_1;
                            ins = table.render(option);
                            layer.close(wait);
@@ -433,23 +495,12 @@
            }
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#Station").val("");
                $("#MaterialNo").val("");
                $("#Station").val("0");
                $("#MaterialNo").val("0");
                $("#LotNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "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');
                sWhere = "";
                get_FastQuery();
            }
            //#endregion
@@ -459,96 +510,29 @@
                var HEndDate = $("#HEndDate").val();//截止日期
                var Station = $("#Station").val();//站台号
                var MaterialNo = $("#MaterialNo").val();//料号
                //var LotNo = $("#LotNo").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;
                var LotNo = $("#LotNo").val();//批次号
                sWhere_1 = {
                    HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , Station: Station
                    , MaterialNo: MaterialNo
                    , LotNo: LotNo
                }
                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;
                sWhere_2 = {
                    HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , MaterialNo: MaterialNo
                    , LotNo: LotNo
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (Station) {
                    sWhere += " and a.HCheckProc like '%" + Station + "%'";
                }
                if (MaterialNo) {
                    sWhere += " and b.HLayOutName like '%" + MaterialNo + "%'";
                }
                //if (LotNo) {
                //    sWhere += " and æ‰¹æ¬¡å· like '%" + LotNo + "%'";
                //}
                //if (HBeginDate != "" && HEndDate != "") {
                //    sWhere += "and åˆ›å»ºæ—¶é—´ between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
                //}
                get_Display(sWhere);
                get_Display(JSON.stringify(sWhere_1));
                get_BadReasonCount(JSON.stringify(sWhere_1));
                get_LotNoCount(JSON.stringify(sWhere_2));
                //调用接口后清空sWhere缓存
                sWhere = "";
                sWhere_1 = "";
                sWhere_2 = "";
                set_Graphics();
            }
            //隐藏列设置
            function get_HideColumn() {
@@ -654,24 +638,39 @@
            }
            //#region ã€å›¾å½¢ã€‘
            function set_Graphics() {
                //#region ã€é¥¼å›¾ã€‘
                var chartDom = document.getElementById('PieChart');
                var myChart = echarts.init(chartDom);
                var option_BT;
                var HQty2 = option.data.length > 5 ? 5 : option.data.length;//饼状图根据合计降序排序显示前n条数据
                var BadReasonCount = 0;
                for (let i = 0; i < HQty2; i++) {
                    if (option.data[i][3] != null)
                        BadReasonCount++;
                }
                //仅对本业务提供的算法
                // ä½¿ç”¨å¯¹è±¡è¿›è¡Œåˆ†ç»„统计
                var reasonMap = {};
                // éåŽ†æ•°æ®ï¼ŒæŒ‰ä¸è‰¯åŽŸå› åˆ†ç»„æ±‚å’Œ
                option_BadReason.data.forEach(item => {
                    var reason = item.不良原因;
                    if (!reasonMap[reason]) {
                        reasonMap[reason] = 0;
                    }
                    reasonMap[reason] += item.不良原因数量;
                });
                // è½¬æ¢ä¸ºé¥¼å›¾éœ€è¦çš„æ ¼å¼
                var option_BT_XData = [];
                for (let i = 0; i < HQty2; i++) {
                    option_BT_XData.push({ value: BadReasonCount, name: option.data[i].检验工序 });
                }
                Object.keys(reasonMap).forEach(reason => {
                    option_BT_XData.push({
                        value: reasonMap[reason],
                        name: reason
                    });
                });
                //$("#MaterialNo").val()
                option_BT = {
                    title: {
                        text:   '料号'+ '下的' + '不良原因分布图',
                        text: '不良原因分布图',
                        left: 'center'
                    },
                    tooltip: {
@@ -699,7 +698,9 @@
                option_BT && myChart.setOption(option_BT);
                //#endregion
                //柱状图绑定数据
                //#region ã€æŸ±çŠ¶å›¾ã€‘
                var app = {};
                var chartDom = document.getElementById('histogram');
@@ -790,29 +791,61 @@
                //#endregion
                //柱状图绑定数据
                var stations = [];//横轴lotNO
                var qualifiedRate = [];//纵轴合格率
                var PNLCount = [];
                var PNLPara = [];
                var HQty1 = option.data.length > 5 ? 5 : option.data.length;//柱状图根据合计降序排序显示前n条数据
                for (let i = 0; i < HQty1; i++) {
                    PNLPara[i] = option.data[i].PNL条码编号;
                    for (let j = 0; j < HQty1; j++) {
                        if (PNLPara[i] == option.data[j].PNL条码编号) {
                            PNLCount[i]++;
                        }
                var HXTitle = [];//X轴标题名称
                var HSourceIssueCount = [];
                var HSourceIssueCount1 = [];
                var HSourceIssueCount2 = [];
                var ZZTColor = [];
                //每个批次的PCS总数count_option_LotNoList
                var count_option_LotNoList = 0;
                var AllCount = 0;
                var BadReasonCount=0 ;
                var ZZTColor2 = ['#00FFFF', '#FC2C83', '#FCED2C', '#93FC2C', '#FC2CF0', '#FC892C', '#2C81FC', '#2CC9FC', '#2CFCA7', '#DED3F2', '#F2D8D3', '#F2D3E0', '#D8E052', '#7EE052', '#52E0D8', '#5F52E0', '#E06F52', '#52E09B', '#E052DE', '#E05F52', '#52B2E0', '#E0C452', '#52CEE0', '#648690', '#E5D1D6', '#D8E5D1', '#E5D1E5', '#D8E5D1', '#7C6262', '#76627C', '#81A583', '#81A595'];
                //统计不同批次号下的总数目
                for (let i = 0; i < option_LotNoList.data.length; i++) {
                    //统计该批次下的PNL号和总数
                    AllCount++;
                    count_option_LotNoList += option_LotNoList.data[i].总计;
                }
                    for (let i = 0; i < option_BadReason.data.length; i++) {
                        BadReasonCount += option_BadReason.data[i].不良原因数量;
                    }
                    
                }
                for (let i = 0; i < HQty1; i++) {
                for (let i = 0; i < option_LotNoList.data.length; i++) {
                    HXTitle.push(option_LotNoList.data[i].HBatchNo);
                        HSourceIssueCount.push(BadReasonCount);
                        HSourceIssueCount1.push(count_option_LotNoList);
                    HSourceIssueCount2.push(((BadReasonCount) / (AllCount * count_option_LotNoList))*100+'%');
                        ZZTColor.push({
                            x: 1,
                            y: 0,
                            x2: 0,
                            y2: 0,
                            type: "linear",
                            colorStops: [
                                { offset: 0, color: "red" },
                                { offset: 1, color: "blue" },
                                { offset: 2, color: "green" }
                            ]
                        });
                    stations.push(option.data[i].检验工序);
                    //此处3暂时代表psc数量,1暂时代表不良psc数量
                    qualifiedRate.push((PNLCount[i] * 3 - 1) / (PNLCount[i] * 3));
                }
                option_ZZT = {
                    title: {
                        text: '批次号',
                        left: 'left',
                        textStyle: {
                            color: 'black',
                            fontSize: 18,
                            fontWeight: 'normal'
                        },
                        padding: [5, 0, 0, 65]
                    },
                    tooltip: {
                        trigger: 'axis',
                        axisPointer: {
@@ -820,9 +853,7 @@
                        }
                    },
                    legend: {
                        data: PNLPara
                        data: ['不良数目', '总数','不良率']
                    },
                    toolbox: {
                        show: true,
@@ -841,7 +872,7 @@
                        {
                            type: 'category',
                            axisTick: { show: true },
                            data: stations
                            data: HXTitle
                        }
                    ],
                    yAxis: [
@@ -851,6 +882,43 @@
                    ],
                    series: [
                        {
                            name: '不良数目',
                            type: 'bar',
                            barGap: 0,
                            label: labelOption,
                            emphasis: {
                                focus: 'series'
                            },
                            data: HSourceIssueCount,
                            itemStyle: {
                                color: function (params) {
                                    // åŠ¨æ€ç”Ÿæˆæ¸å˜è‰²æˆ–è€…æ ¹æ®æ¡ä»¶è¿”å›žé¢„è®¾çš„æ¸å˜è‰²
                                    const gradientColors = ZZTColor2;
                                    return gradientColors[params.dataIndex];
                                }
                            }
                        },
                        {
                            name: '总数',
                            type: 'bar',
                            barGap: 0,
                            label: labelOption,
                            emphasis: {
                                focus: 'series'
                            },
                            data: HSourceIssueCount1,
                            itemStyle: {
                                color: function (params) {
                                    // åŠ¨æ€ç”Ÿæˆæ¸å˜è‰²æˆ–è€…æ ¹æ®æ¡ä»¶è¿”å›žé¢„è®¾çš„æ¸å˜è‰²
                                    const gradientColors = ZZTColor2;
                                    return gradientColors[params.dataIndex];
                                }
                            }
                        },
                        {
                            name: '不良率',
                            type: 'bar',
                            barGap: 0,
@@ -858,8 +926,17 @@
                            emphasis: {
                                focus: 'series'
                            },
                            data: qualifiedRate
                        },
                            data: HSourceIssueCount2,
                            itemStyle: {
                                color: function (params) {
                                    // åŠ¨æ€ç”Ÿæˆæ¸å˜è‰²æˆ–è€…æ ¹æ®æ¡ä»¶è¿”å›žé¢„è®¾çš„æ¸å˜è‰²
                                    const gradientColors = ZZTColor2;
                                    return gradientColors[params.dataIndex];
                                }
                            }
                        }
                    ]
                };
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html
@@ -610,9 +610,9 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
                        , { field: 'HCenterID', title: 'HCenterID', width: 100, hide: true }
                        , { field: 'HCenterName', title: '工作中心名称', width: 100, edit: 'text' }
                        , { field: 'HCenterName', title: '工作中心名称', width: 400, edit: 'text' }
                        , { field: 'HSourceID', title: 'HSourceID', width: 100, hide: true }
                        , { field: 'HSourceName', title: '生产资源名称', event: "HSourceNameSelect", width: 100, edit: 'text' }
                        , { field: 'HSourceName', title: '生产资源名称', event: "HSourceNameSelect", width: 400, edit: 'text' }
                        , { title: '操作', toolbar: '#barDemo', width: 70 }
                    ]]
                }
@@ -829,8 +829,8 @@
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                    if (checkStatus.length === 1) {
                                        let data = checkStatus[0]
                                    if (checkStatus.data.length === 1) {
                                        let data = checkStatus.data[0]
                                        obj.update({
                                            HSourceID: data["HItemID"],
                                            HSourceName: data["生产资源名称"]
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx
@@ -14,7 +14,11 @@
            //OledbXMLReportData适合于Access等本地数据库,为了演示方便,这里从Grid++Report的Access例子数据库中获取报表数据
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.销售订单号,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求,a.辅数量2,a.HAuxUnit2,a.辅助单位2,b.出站关联数量 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","select 1");
            //20250731调整,查询打印数据时,更新打印日期到流转卡主表
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.销售订单号,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求,a.辅数量2,a.HAuxUnit2,a.辅助单位2,b.出站关联数量 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","update Sc_ProcessExchangeBillMain set HPrintDate = getdate() where HInterID in ("+Request.Params["linterid"] + ") and HPrintDate is null");
        }
    </script>
</head>
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MatePrice.html
@@ -140,6 +140,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                            </div>
                    </form>
                </div>
            </div>
@@ -170,7 +171,7 @@
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"];
            var HModName = "Gy_MatePrice";
            var HModName = "Gy_MaterPrice";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "父级ID", "HMaterID", "HUnitID", "HRelationID"];
@@ -238,10 +239,6 @@
                    case 'btn-Close':
                        parent.layui.admin.events.closeThisTabs();
                        break;
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //#endregion
@@ -277,8 +274,8 @@
                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], option);
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                //get_DefaultModule(get_FastQuery);
                get_DefaultModule(get_FastQuery);
            }
            //#endregion
@@ -303,6 +300,12 @@
                $("#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');
                sWhere = "";
            }
@@ -331,28 +334,58 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    if (data[i].name === "是否禁用") {
                                        col.push({
                                            field: data[i].id,
                                            title: data[i].name,
                                            align: 'center',
                                            templet: function (d) {
                                                return d.是否禁用 === 1 ? 'Y' : '';
                                            }
                                        });
                                    }
                                    else {
                                        switch (data[i].Type) {
                                            //int
                                            case 'DateTime':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                                break;
                                            case 'long':
                                            case 'Int32':
                                            case 'Int64':
                                            case 'double':
                                            case 'Decimal':
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                                break;
                                            default:
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                        }
                                    }
                                }
                            }
                            option.cols = [col];
                            option.data = data1.data;
                            //列设置
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
                            table.render(option)
                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            //layer.alert("查询成功", { icon: 1 });
                            //刷新表格数据
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -368,7 +401,7 @@
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var HName = $("#HName").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -621,9 +654,9 @@
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    //// å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    ////关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
@@ -675,6 +708,250 @@
                form.render('select');
            }
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //获取当前用户的默认过滤方案
            function get_DefaultModule() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                    type: "GET",
                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
                    success: function (data1) {
                        if (data1.count == 1) {
                            //当前用户设置有默认的过滤方案
                            var data = data1.data;
                            //当前选择的过滤方案
                            HInterID_Choose = data[0].hmainid;
                            //过滤方案内码
                            HInterID = data[0].hmainid
                            //过滤方案名称
                            HDefaultFilter = data[0].方案名称
                            //过滤方案的备注(方案信息描述)
                            var HRemark = data[0].备注
                            //显示出当前的默认过滤方案
                            document.getElementById("HFilterScheme_Now").style.display = "block";
                            document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
                            //把过滤条件值回写到页面上
                            for (let i = 0; i < data.length; i++) {
                                $("#" + data[i].过滤字段ID).val(data[i].过滤值);
                                if (data[i].过滤标签类型 == 'SELECT') {
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }
                            //查询
                            get_FastQuery();
                            form.render("select");
                        } else {
                            //当前用户没有设置默认的过滤方案
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            form.render("select");
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //保存方案
            function set_SaveScheme() {
                var index = layer.open()
                //判断用户是否点击了右上角的“叉号”关闭弹窗页面
                var HIsClose_Manual = false;
                //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                var Filter = document.getElementsByClassName(HClassTag);
                var HFilterIdList = "";//过滤条件
                var HFilterIdLists = "";//拼接多个过滤条件
                var HValue = "";//过滤值
                var HElement_type = "";//过滤标签类型
                for (var i = 0; i < Filter.length; i++) {
                    HFilterIdList = Filter[i].id; //过滤条件ID
                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)
                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                }
                //去除末尾逗号
                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                HValue = HValue.substring(0, HValue.length - 1);
                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
                //当前页面上没有选择过滤方案,进入新增方法
                if (HDefaultFilter == "") {
                    layer.open({
                        type: 2
                        , area: ['40%', '80%']
                        , title: '过滤方案'
                        , shift: 0//弹出动画
                        , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                        , cancel: function () {
                            // å³ä¸Šè§’关闭事件的逻辑
                            HIsClose_Manual = true;
                        }
                        , end: function () {
                            if (HIsClose_Manual != true) {
                                get_FastQuery();
                                //显示当前的过滤方案
                                document.getElementById("HFilterScheme_Now").style.display = "block";
                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
                            }
                        }
                    })
                    layer.close(index)
                } else {
                    //当前页面已有过滤方案,用户选择 æ–°å¢žæˆ–者编辑
                    layer.confirm('当前已选择过滤方案,是否修改?请选择对应操作', {
                        title: "操作提示",
                        icon: 0,
                        btn: ['新增方案', '保存修改当前方案', '取消']
                    }, function (index, layero) {
                        //新增
                        layer.open({
                            type: 2
                            , area: ['40%', '80%']
                            , title: '过滤方案'
                            , shift: 0//弹出动画
                            , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                            , end: function () {
                                get_FastQuery()
                                //显示当前的过滤方案
                                document.getElementById("HFilterScheme_Now").style.display = "block";
                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
                            }
                        })
                        layer.close(index)
                    }, function (index) {
                        //编辑
                        var Filter_Edit = document.getElementsByClassName(HClassTag); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                        HFilterIdList = "";
                        HFilterIdLists = "";
                        HValue = "";
                        HElement_type = "";
                        for (var i = 0; i < Filter_Edit.length; i++) {
                            HFilterIdList = Filter_Edit[i].id; //过滤条件ID
                            HFilterIdLists += Filter_Edit[i].id + ","; //过滤条件ID(拼接)
                            HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                        }
                        //去除末尾逗号
                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                        HValue = HValue.substring(0, HValue.length - 1);
                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
                        //修改
                        $.ajax({
                            type: "POST",
                            url: GetWEBURL() + "/Xt_FastICScheme/save", //方法所在页面和方法名
                            async: true,
                            data: { "oMain": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
                                }
                                else {
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {
                            }
                        });
                        layer.close(index)
                    }, function (index) {
                        //取消
                        layer.alert('取消')
                        layer.close(index)
                    });
                }
            }
            //读取方案
            function set_ReadScheme() {
                var HIsClose_Manual = false;
                var Filter = document.getElementsByClassName(HClassTag); //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                var HFilterIdList = "";
                var HFilterIdLists = "";
                var HValue = "";
                var HElement_type = "";
                for (var i = 0; i < Filter.length; i++) {
                    HFilterIdList = Filter[i].id; //过滤条件ID
                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)
                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                }
                //去除末尾逗号
                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
                HValue = HValue.substring(0, HValue.length - 1);
                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '过滤方案列表'
                    , shift: 0//弹出动画
                    , content: '../../系统管理/过滤方案设置/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
                    , cancel: function () {
                        // å³ä¸Šè§’关闭事件的逻辑
                        HIsClose_Manual = true;
                    }
                    , end: function () {
                        if (HIsClose_Manual != true) {
                            get_FastQuery()
                            form.render("select");
                        }
                    }
                })
            }
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆè¿”回数据】
            function HFilterScheme(obj)  //返回过滤方案
            {
                var HInterID = obj[0].hmainid;
                HInterID_Choose = obj[0].hmainid;
                $.ajax({
                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
                    type: "GET",
                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = data1.data;
                            //赋值过滤方案名称
                            HDefaultFilter = data[0].方案名称
                            var HRemark = data[0].备注
                            //显示当前的过滤方案
                            document.getElementById("HFilterScheme_Now").style.display = "block";
                            document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案:" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
                            HInterID = data[0].hmainid
                            //根据选择的过滤方案回填数据到列表过滤条件
                            for (let i = 0; i < data.length; i++) {
                                $("#" + data[i].过滤字段ID).val(data[i].过滤值);
                                if (data[i].过滤标签类型 == 'SELECT') {
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
        //#endregion
        });
            //#endregion
    </script>
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MatePriceEdit.html
@@ -112,7 +112,7 @@
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">仓库代码</label>
                                                    <label class="layui-form-label">仓库代码<label style="color:red"> * </label></label>
                                                    <div class="layui-input-block">
                                                        <input type="text" readonly name="HWHNumber" id="HWHNumber" class="layui-input" value="" style="float: left; width: 135px;">
                                                        <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -132,8 +132,8 @@
                                                <div class="layui-col-xs4 layui-inline">
                                                    <label class="layui-form-label">禁用标志</label>
                                                    <div class="layui-input-inline">
                                                        <input type="checkbox" name="HStopflag" id="HStopflag" disabled
                                                               lay-skin="primary" lay-filter="HStopflag" value="0" title="是否禁用">
                                                        <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="是否禁用">
                                                        <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                                        <!--<input type="hidden" value="false" name="HStopflag" id="HStopflag">-->
                                                    </div>
                                                </div>
@@ -305,11 +305,7 @@
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //保存提交
        form.on('submit(Saver)', function (data) {//提交
            set_AddNew(data);
        });
        //退出
        form.on('submit(Exit)', function (data) {
            Pub_Close(1);
@@ -434,7 +430,9 @@
        
        //保存提交
        form.on('submit(Saver)', function (data) {//提交
            set_AddNew(data);
            if (AllowLoadData(data)) {
                set_AddNew(data);
            }
        });
        //#endregion
@@ -451,7 +449,7 @@
            Organ1();
        }
        //是否禁用按钮
        form.on('checkbox(HStopflag)', function (data) {
        form.on('checkbox(checkboxHStopflag)', function (data) {
            $("#HStopflag").val(data.elem.checked);
        });
        //保存HMaker
@@ -511,8 +509,11 @@
                success: function (d) {
                    var IsHStopflag = d.data[0].是否禁用;
                    //禁用标记
                    if (IsHStopflag=== 1) {
                        $("#HStopflag").attr("checked", true);
                    //if (IsHStopflag=== 1) {
                    //    $("#HStopflag").attr("checked", true);
                    //}
                    if (IsHStopflag) {
                        $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                    }
                    //主表
                    form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
@@ -655,6 +656,24 @@
            return vars;
        }
        //#region éžç©ºéªŒè¯
        function AllowLoadData(data) {
            //#region è¡¨å¤´æ•°æ®æ£€éªŒ
            if ($("#HWHID").val() == '0') {
                layer.msg("仓库不能为空!");
                return false;
            }
            //#endregion
            return true;
        }
            //#endregion
        //#endregion
    });
WebTM/views/Éú²ú¹ÜÀí/¿­±´Èռƻ®µ¼Èë/JIT_DayPlanPlatForm_KB.html
New file
@@ -0,0 +1,489 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>生产日计划导入</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">单据日期</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">订单类型</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
                                                    <option value="生产订单">生产订单</option>
                                                    <option value="委外订单">委外订单</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
                        </div>
                    </script>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script type="text/html" id="barDemo">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , laydate = layui.laydate
            , excel = layui.excel
            , upload = layui.upload
            , element = layui.element;
        var option = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        var params = getUrlVars();
        var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
            set_GridCellCheck(obj);//行内快捷键筛选
        });
        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_KB',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            before: function (data) {
                layer.load();
            },
            done: function (data1) {
                layer.closeAll('loading');
                if (data1.count == 1) {
                    var HVersion_Import_Temp = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                    for (var i = 0; i < data1.data.length; i++) {
                        data1.data[i].HVersion_Import = HVersion_Import_Temp;
                    }
                    option.data = data1.data;
                    table.render(option);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.closeAll('loading');
                layer.alert('导入出现异常', { icon: 2 });
            }
        });
        //退出
        form.on('submit(Cancel)', function () {
            if (OperationType == 1) {
                Pub_Close(1);
            }
            else {
                Pub_Close(2);
            }
        })
        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }
            else {
                layer.msg("无数据,请先导入数据!");
            }
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化时间
            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            //初始化表格
            set_InitGrid();
        }
        //#endregion
        //初始化表格
        function set_InitGrid() {
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
            var MM = myDate.getMonth() + 1;
            var dd = myDate.getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            var columns = [];
            var HBEGINDATE = new Date(new Date($("#HDate").val())).getDate(); //获取开始日期天数
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
            columns.push({ field: '单据号', title: '单据号', width: 200 });
            columns.push({ field: '生产订单号*', title: '生产订单号', width: 150 });
            columns.push({ field: '生产订单明细行号*', title: '生产订单明细行号', width: 200 });
            columns.push({ field: '组织编码*', title: '组织编码', width: 150 });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间编码*', title: '生产车间', width: 150 });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: '生产资源编码*', title: '生产资源', edit: 'text', event: "HSourceID" });
            columns.push({ field: '产能', title: '产能', edit: 'text' });
            columns.push({ field: '优先级', title: '优先级' });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: '员工', title: '员工', width: 150 });
            columns.push({ field: '员工编码', title: '员工编码', width: 150 });
            columns.push({ field: 'HMaterID', title: '物料ID', hide: true });
            columns.push({ field: '物料编码*', title: '物料编码', width: 150 });
            columns.push({ field: '物料名称', title: '物料名称', width: 200 });
            columns.push({ field: '规格型号', title: '规格型号', width: 150 });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: '计量单位', title: '计量单位', width: 150 });
            columns.push({ field: '批次号', title: '批次', width: 150 });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width: 200 });
            columns.push({ field: '生产订单数量', title: '生产订单数量', width: 200 });
            columns.push({ field: '总齐套数量', title: '总齐套数量', width: 200 });
            columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true });
            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: 'HVersion_Import', title: '导入序列号' });
            var k = 0;//收集循环次数
            var Days = 7;
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
                    MM = 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    HBEGINDATE = 0;
                    k += j;
                    j = 0;
                } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åР䏀  å¤©æ•°ä»Žä¸€å¼€å§‹
                    HBEGINDATE = 0;
                    MM += 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    k += j;
                    j = 0;
                }
            }
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-190'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [columns]
            };
            //渲染页面
            table.render(option);
        }
        //导入(保存)
        function set_AddNew(data) {
            var msgError = "";
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    if (table.cache["mainTable"][i].物料名称.indexOf("\"") != -1 || table.cache["mainTable"][i].物料名称.indexOf(";") != -1) {
                        table.cache["mainTable"][i].物料名称 = table.cache["mainTable"][i].物料名称.replaceAll("\"", "”").replaceAll(";", ";")
                    }
                    if (table.cache["mainTable"][i].规格型号.indexOf("\"") != -1 || table.cache["mainTable"][i].规格型号.indexOf(";") != -1) {
                        table.cache["mainTable"][i].规格型号 = table.cache["mainTable"][i].规格型号.replaceAll("\"", "”").replaceAll(";", ";")
                    }
                    num.push(table.cache["mainTable"][i])
                }
            }
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i].物料名称.indexOf("\"") != -1 || option.data[i].物料名称.indexOf(";") != -1) {
                    option.data[i].物料名称 = option.data[i].物料名称.replaceAll("\"", "”").replaceAll(";", ";")
                }
                if (option.data[i].规格型号.indexOf("\"") != -1 || option.data[i].规格型号.indexOf(";") != -1) {
                    option.data[i].规格型号 = option.data[i].规格型号.replaceAll("\"", "”").replaceAll(";", ";")
                }
            }
            //判断是否有导入权限,如果有则将总装车间之前的日计划工单作废
            if (!set_ModCheck("Sc_WorkBillSortBill_Edit")) {
                layer.msg("导入失败!无导入权限!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            } else {
                if (!setWorkBillSortBillForDelete()) {
                    layer.msg("导入失败!往期日计划作废失败!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
            }
            var HDataSub = [];
            //JIT导入计划,每次导入100行数据,可修改i的自增值决定每次循环导入的行数
            for (var i = 0; i < option.data.length; i += 100) {
                HDataSub = option.data.slice(i, i + 100)
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(HDataSub);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_KB",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            /* layer.msg("提交成功");*/
                        }
                        else {
                            layer.close(index);
                            msgError += data.Message + ";";
                            //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        msgError += err + ";";
                        //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }
            if (msgError.length == 0) {
                layer.msg("提交成功");
            } else {
                layer.msg(msgError, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            }
        }
        //行内删除
        function set_GridDelete(obj) {
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗?', function (index) {
                    obj.del();
                    table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素,从缓存里移除这一行
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    table.reload(option);
                    layer.close(index);
                });
            }
        }
        //行内删除快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //生产资源
                    if (obj.event == "HSourceID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "生产资源列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/生产基础资料/Gy_Source.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HSourceID": checkStatus.data[0].HItemID
                                    , "生产资源编码*": checkStatus.data[0].生产资源代码
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    obj.event = "";
                    return false;
                }
            })
        }
        //获取参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
            for (var i = 0; i < hashes.length; i++) {
                hash = hashes[i].split('=');
                vars.push(hash[0]);
                vars[hash[0]] = hash[1];
            }
            return vars;
        }
        //#region æƒé™åˆ¤å®š
        function set_ModCheck(ModRightNameCheck) {
            var Permission = false;
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                async: false,
                data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        Permission = true;
                    } else {
                        //layer.alert("当前模块没有查询权限!", { icon: 5 });
                    }
                }, error: function (e) {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            return Permission;
        }
        //#endregion
        //#region ä½œåºŸå¯¹åº”生产车间的日计划工单
        function setWorkBillSortBillForDelete() {
            //拼接生产车间的ID
            var HWorkShopIDArrayList = [];
            for (var i = 0; i < option.data.length; i++) {
                option.data[i]["单据号"] = "";
                option.data[i]["hmainid"] = "";
                if ($.inArray(option.data[i]["HWorkShopID"], HWorkShopIDArrayList) == -1) {
                    HWorkShopIDArrayList.push(option.data[i]["HWorkShopID"]);
                }
            }
            var HWorkShopIDListStr = "";
            for (var i = 0; i < HWorkShopIDArrayList.length; i++) {
                if (i == HWorkShopIDArrayList.length - 1) {
                    HWorkShopIDListStr = HWorkShopIDArrayList[i];
                } else {
                    HWorkShopIDListStr = HWorkShopIDArrayList[i] + ",";
                }
            }
            //作废对应生产车间ID的日计划工单
            var resultBool = false;
            var sql = "";
            if (HWorkShopIDListStr != "") {
                sql = "update Sc_WorkBillSortBillMain set HDeleteMan = '" + sessionStorage["HUserName"] + "',HDeleteDate = getdate(),HBillStatus = 4 where HWorkShopID in (" + HWorkShopIDListStr + ")";
            } else {
                return resultBool;
            }
            var ModRightNameCheck = "";
            $.ajax({
                url: GetWEBURL() + '/CommonModel/commonMethod',
                type: "GET",
                async: false,
                data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
                success: function (data1) {
                    if (data1.count == 1) {
                        resultBool = true;
                    } else {
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function (e) {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            return resultBool;
        }
        //#endregion
        //#endregion
    });
</script>
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html
@@ -251,7 +251,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">备注:</label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入详细内容" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
                                                            <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_DayPlanPlatForm_TK2.html
@@ -28,6 +28,7 @@
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">要料运算</button>-->
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">提料运算</button>-->
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">添加订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO_Batch" id="btnAddICMO_Batch">添加护理床-椅架订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">组装排产</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">锁定工单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">解锁工单</button>
@@ -69,8 +70,17 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">多车间排产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMergeDept" id="HMergeDept" lay-verify="HMergeDept">
                                            <option value="否" selected="selected">否</option>
                                            <option value="是">是</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">排产天数</label>
                                    <div class="layui-input-block">
                                    <div class="layui-input-block" style="width: 120px;">
                                        <select name="HArrangeProductDayQty" id="HArrangeProductDayQty" class="ForFilteringSchemes" lay-filter="HArrangeProductDayQty" style="width:190px;">
                                        </select>
                                    </div>
@@ -632,6 +642,16 @@
            get_btnAddICMO();
        })
        //添加护理床-椅架生产订单
        form.on('submit(btnAddICMO_Batch)', function (data) {
            if ($("#HMergeDept").val() == "是") {
                get_btnAddICMO_Batch();
            } else {
                layer.alert("当前不为多车间排产模式");
            }
        })
        //组装排产
        form.on('submit(btnProZZPC)', function (data) {
            var HWorkShopID = $("#HWorkShopID").val();//生产车间
@@ -793,11 +813,9 @@
            columns.push({ type: 'checkbox', fixed: 'left', sort: true });
            columns.push({ type: 'numbers', field: '序号', title: '序号', sort: true });
            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150, sort: true, filter: true });
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true, filter: true });
            columns.push({ field: '锁定工单', title: '锁定工单', width: 150, sort: true, filter: true });//0
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true, filter: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true, filter: true });
            columns.push({ field: '规格型号', title: '规格型号', width: 150, sort: true, filter: true });
@@ -808,8 +826,11 @@
            columns.push({ field: '昨日数量', title: '昨日数量', filter: true });
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID", filter: true });
            columns.push({ field: '使用工装', title: '使用工装', width: 150, hide: true });
            columns.push({ field: '销售订单审核日期', title: '销售订单审核日期', width: 150, templet: "<div>{{d.销售订单审核日期 ==null ?'':layui.util.toDateString(d.销售订单审核日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '要货日期', title: '要货日期', width: 150, templet: "<div>{{d.要货日期 ==null ?'':layui.util.toDateString(d.要货日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '开工日期', title: '开工日期', width: 150, templet: "<div>{{d.开工日期 ==null ?'':layui.util.toDateString(d.开工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '完工日期', title: '完工日期', width: 150, templet: "<div>{{d.完工日期 ==null ?'':layui.util.toDateString(d.完工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '生产车间', title: '生产车间', width: 150 });
            columns.push({ field: '业务状态', title: '业务状态', width: 150, sort: true, hide: true });
            columns.push({ field: '产线入库数量', title: '产线入库数量', width: 150, sort: true, hide: true });
            columns.push({ field: '未排数量', title: '可排数量', width: 150, sort: true, hide: true });
@@ -820,6 +841,9 @@
                columns.push(dateColumns[i]);//0
            }
            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单审核日期', title: '销售订单审核日期', width: 150, templet: "<div>{{d.销售订单审核日期 ==null ?'':layui.util.toDateString(d.销售订单审核日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: '订单类型', title: '订单类型', width: 150, sort: true });
            columns.push({ field: '生产订单单据类型', title: '源单订单单据类型', width: 150, sort: true });
@@ -830,7 +854,7 @@
            columns.push({ field: '生产周期', title: '生产周期', width: 150, sort: true });
            columns.push({ field: '最迟开工日期', title: '最迟开工日期', width: 150, templet: "<div>{{d.最迟开工日期 =='' ?'':layui.util.toDateString(d.最迟开工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '生产车间', title: '生产车间', width: 150 });
            columns.push({ field: '源单主内码', title: '源单主内码', width: 150, sort: true });
            columns.push({ field: '源单子内码', title: '源单子内码', width: 150, sort: true });
            columns.push({ field: 'hmainid', title: '日计划工单主码', width: 150, sort: true });
@@ -859,6 +883,7 @@
            columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
            columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
            columns.push({ field: '所需工位数', title: '所需工位数', width: 150 });
            columns.push({ field: '使用工装', title: '使用工装', width: 150, hide: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option_columns = columns;
            option = {
@@ -933,6 +958,11 @@
            if (number == 1) {
                HProdORGID = sessionStorage["OrganizationID"];//生产订单组织
            }
            if (HWorkShopID == 102357 && $("#HMergeDept").val() == "是" ) {
                HWorkShopID = "102357,102359";
            }
            var HMastersDate = $("#HMastersDate").val();//排产日期
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HMaterID = $("#HMaterID").val();//物料编码id
@@ -1113,6 +1143,52 @@
        }
        //#endregion
        //#region æ·»åŠ æŠ¤ç†åºŠ-椅架生产订单
        function get_btnAddICMO_Batch() {
            var HDeptID = "102357,102359" //102357=护理床 102359=椅架
            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept',
                type: "GET",
                data: { "HDeptID": HDeptID },
                success: function (data1) {
                    if (data1.count == 1) {
                        //var dataPush = [];
                        //var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                        //buttonArr = [];//清空数组
                        //for (var i = 0; i < tableBak.length; i++) {
                        //    dataPush.push(tableBak[i]);  //将之前的数据存储
                        //}
                        //for (var i = 0; i < dataPush.length; i++) {
                        //    if (dataPush[i]["单据号"] == "") {
                        //        for (var j = 0; j < data1.data.length; j++) {
                        //            if (data1.data[j]["源单主内码"] == dataPush[i]["源单主内码"] && data1.data[j]["源单子内码"] == dataPush[i]["源单子内码"]) {
                        //                return layer.alert("生产明细行重复,重复的生产订单号:" + dataPush[i]["生产订单号"] + ",明细行号:" + dataPush[i]["生产订单明细行号"], { icon: 5 });
                        //            }
                        //        }
                        //    }
                        //}
                        ////存储数据
                        //for (var i = 0; i < data1.data.length; i++) {
                        //    dataPush.push(data1.data[i]);
                        //}
                        //option.data = dataPush;
                        //table.render(option);
                        get_FastQuery(1);
                    } else {
                        layer.alert(data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion
        //#region åˆå§‹åŒ–下拉列表 æŽ’产时间
        function setSelect_HArrangeProductDayQty() {
@@ -1122,8 +1198,8 @@
            var lastDay = new Date(year, month, 0).getDate();               //当月最后一天
            var thisDay = new Date().getDay();                              //当天是本月第几天
                       var valueList = [7, 21, 28 , 30, 40, 50, 60, 70, 80, 90, 100];
            var titleList = ["7天","21天","28天", "30天", "40天", "50天", "60天", "70天", "80天", "90天", "100天"];
                       var valueList = [7, 21, 28 , 30, 40];
            var titleList = ["7天","21天","28天", "30天", "40天"];
            var HArrangeProductDayQty_ArrayList = '';
            for (var i = 0; i < valueList.length; i++) {
@@ -1191,8 +1267,14 @@
                }
            });
            //根据车间删除没有锁定的数据
            var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            if ($("#HMergeDept").val() == "是") {
                //根据车间删除没有锁定的数据
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
            } else {
                //根据车间删除没有锁定的数据
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            }
            $.ajax({
                url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
                type: "GET",
@@ -1357,6 +1439,7 @@
                                option.data[i]["生产资源代码"] = sSourceNumber;
                                var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                                    type: "GET",
@@ -2146,13 +2229,20 @@
            var old_date = new Date();
            var data = option.data;//table.cache["mainTable"];
            //根据销售订单审核日期排序数组
            //根据销售订单要货日期,销售订单审核日期排序数组
            data.sort(function (a, b) {
                return new Date(a.销售订单审核日期) - new Date(b.销售订单审核日期)
                // é»˜è®¤æ ¹æ®æœ€æ—©å¼€å·¥æ—¥æœŸæŽ’序,最早开工日期相同则按照销售订单审核日期排序
                if (new Date(a.要货日期) == new Date(b.要货日期)) {
                    return new Date(a.销售订单审核日期) - new Date(b.销售订单审核日期)
                }
                return new Date(a.要货日期) - new Date(b.要货日期)
            });
            for (var i = 0; i < data.length; i++) {
                data[i]["优先级"] = ((i + 1) * 5);
                if (data[i]["优先级"] == 0 || data[i]["优先级"] == "") {
                    data[i]["优先级"] = ((i + 1) * 5);
                }
            }
            option.data = data;
            table.render(option);
WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/ReportPODemandPlanBillList_S_TK.html
@@ -411,7 +411,7 @@
            var HXQD = $("#HXQD").val();//需求单号
            var HPURORDERNO = $("#HPURORDERNO").val();//采购订单号
            var HMaterNumber = $("#HMaterNumber").val();//物料代码
            var HMaterName = $("#HMaterName").val();//物料名称
            var HMATERIALNAME = $("#HMATERIALNAME").val();//物料名称
            var HSupNumber = $("#HSupNumber").val();//供应商代码
            var HSupName = $("#HSupName").val();//供应商名称
@@ -441,8 +441,8 @@
            if (HMaterNumber != "") {
                sWhere += " and t1.物料代码 like ''%" + HMaterNumber + "%'' ";
            }
            if (HMaterName != "") {
                sWhere += " and t1.物料名称 like ''%" + HMaterName + "%'' ";
            if (HMATERIALNAME != "") {
                sWhere += " and t1.物料名称 like ''%" + HMATERIALNAME + "%'' ";
            }
            if (HSupNumber != "") {
                sWhere += " and t3.HNumber like ''%" + HSupNumber + "%'' ";
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html
@@ -668,6 +668,19 @@
                                    num++;
                                }
                                var sql = "update a set HPrintDate = getdate() from Sc_ProcessExchangeBillMain a with(nolock) where HInterID = " + HInterID + " and HPrintDate is null";
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //方法所在页面和方法名
                                    async: false,
                                    data: { "sWhere": sql },
                                    success: function (result) {
                                        if (result.data.code != 1) {
                                            layer.alert("更新打印日期异常:" + result.data.Message);
                                        }
                                    }
                                })
                            } else {
                                layer.msg("查无数据!");
                            }
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html
@@ -1560,7 +1560,7 @@
                if (openType == 2) {
                    sWhere += " and HBillStatus=2 ";
                    $("#HOrgID").val(HOrgID);
                    form.render("select");zz
                    form.render("select");
                    return true;
                }
                return false;