添康添加配件车间抓取订单排产;出厂检验单、工序、来料检验单、质检方案、首件检验单、明细行检验方法字段设置超长度自动隐藏
7个文件已修改
42 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
   /* 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:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    // var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_DayPlanPlatForm_TK2.html
@@ -1409,10 +1409,15 @@
            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 )";
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) 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 )";
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            }
            if ($("#HWorkShopID").val() == "15035828") {
                //根据排产标记删除没有锁定的数据(配件车间)
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = '配件订单' and HLockOrder != 1 )";
            }
            $.ajax({
WebTM/views/ÖÊÁ¿¹ÜÀí/³ö³§¼ìÑéµ¥/QC_OutCompCheckBill.html
@@ -2434,7 +2434,7 @@
                        , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                        , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                        , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: 'HInspectBasisName' }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
@@ -3237,12 +3237,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html
@@ -2752,7 +2752,7 @@
                        , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                        , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                        , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: 'HInspectBasisName' }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
@@ -3962,12 +3962,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/QC_Add_Edit_POStockInCheckBillList.html
@@ -293,6 +293,13 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">收货数量</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HQty" id="HQty"
                                                    style="background-color:#efefef4d;" readonly value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -2558,7 +2565,7 @@
            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–è¡¨ä½“æ£€éªŒé¡¹ç›®ä¿¡æ¯ã€‘
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -3149,7 +3156,7 @@
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: "HQualityStdID" },
                        , { field: 'HInspectMethodID', title: 'HInspectMethodID', edit: 'text', hide: true },
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: "HInspectMethodID" },
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: "HInspectMethodID", style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'},
                        , { field: 'HInspectBasisID', title: 'HInspectBasisID', edit: 'text', hide: true },
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: "HInspectBasisID" },
@@ -4317,12 +4324,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
@@ -4934,6 +4943,7 @@
                            $("#HMainSourceEntryID").val(res.data[0].HEntryID)
                            $("#HQCSchemeName").val(res.data[0].检验方案名称);
                            $("#HQCSchemeID").val(res.data[0].检验方案ID);
                            $("#HQty").val(res.data[0].实收数量);
                            //获取表体检验项目信息
                            get_CheckItem();
                        }
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html
@@ -319,7 +319,7 @@
        <select name="HCompareSymbol" lay-filter="HCompareSymbol" id="HCompareSymbol{{d.LAY_TABLE_INDEX+1}}">
            <option value="1" selected="selected">=</option>
            <option value="2">></option>
            <option value="3=">>=</option>
            <option value="3">>=</option>
            <option value="4"><</option>
            <option value="5"><=</option>
            <option value="6"><></option>
@@ -1157,7 +1157,7 @@
                    , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                    , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                    , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                    , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                    , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                    , { field: 'HInspectInstruMentID', title: '检验仪器ID', edit: 'text', hide: true }
                    , { field: 'HInspectInstruMentName', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentName' }
                    , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -40,6 +40,7 @@
            margin-left: -15px;
            margin-right: -15px;
        }
    </style>
</head>
<body>
@@ -2801,7 +2802,7 @@
                        , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                        , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                        , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: 'HInspectBasisName' }
                        , { field: 'HKeyInspect', title: '重点检查', templet: '#HKeyInspect', unresize: false }
@@ -3995,12 +3996,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色