yangle
2024-06-05 e1aa3d69d50d8b268a21450058a6ff0619d485af
斯莫尔当前工单优化
6个文件已修改
79 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/IpadIndex.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/工单/Sc_CurrentTicket.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/开工/Sc_SwipeCardStart.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\编码\发布\layui</PublishUrl>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>
WebTM/views/IpadIndex.html
@@ -1057,7 +1057,7 @@
        }
        //当前工单(赋码)按钮点击事件
        //当前工单(汇报)按钮点击事件
        function CodingReport(event, obj) {
            if (wktag == 0) {
                layer.alert("请选择工单列表", { icon: 5 });
@@ -1071,7 +1071,7 @@
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '车间管理/工序出站汇报单/Cj_StationOutBill_CodingReport.html?OperationType=2&linterid=&HSouceBillType=',
                content: '车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html?OperationType=2&linterid=&HSouceBillType=',
                end: function () {
                },
@@ -1331,7 +1331,7 @@
                            <div class="layui-col-sm12 layui-col-md4" onclick="CodingReport(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-console imgicon"></span>
                                    <span class="imgtitle">当前工单(赋码)</span>
                                    <span class="imgtitle">当前工单(汇报)</span>
                                </div>
                            </div>
                        </div>
WebTM/views/Éú²ú¹ÜÀí/¹¤µ¥/Sc_CurrentTicket.html
@@ -462,8 +462,8 @@
            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
                Pub_Close(2);
                //window.parent.location.reload();
            });
            //刷新
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_SwipeCardStart.html
@@ -168,7 +168,7 @@
        //#region åˆå§‹åŒ–界面
        //进入页面默认光标在条形码上
        $("#HBarCode").focus();
        $("#HBardCode").focus();
        var params = get_UrlVars();
        if (typeof (params[params[0]]) != "undefined") {
@@ -206,7 +206,7 @@
                        if (result.code == "2") {
                            layer.close(index);
                            layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
                            layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
                                parent.GetSwipeCardStart({ "data": 0 });
                                setTimeout(function () {
                                    var index2 = parent.layer.getFrameIndex(window.name);
@@ -253,7 +253,7 @@
                                }, 30000);
                            })
                        } else {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
                            layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
                                parent.GetSwipeCardStart({ "data": 0 });
                                setTimeout(function () {
                                    var index2 = parent.layer.getFrameIndex(window.name);
@@ -265,7 +265,7 @@
                    else {
                        layer.close(index);
                        layer.msg(result.Message, { time: 1 * 1000, icon: 5 }, function (index) {
                        layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
                            parent.GetSwipeCardStart({ "data": 0 });
                            setTimeout(function () {
                                var index2 = parent.layer.getFrameIndex(window.name);
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html
@@ -207,13 +207,13 @@
                                        <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="HWidth" lay-verify="HWidth" id="HWidth" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </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="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                    </div>
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html
@@ -311,11 +311,11 @@
        //初始化界面
        set_ClearBill();
        //$("#HEquipName").text(HEquipName);//设备名称
        //$("#HEquipCode").text(HEquipCode);//设备编号
        //$("#HEmpName").text(HEmpName);//操作员
        //$("#HManagerName").text(HManagerName);//负责人
        //$("#HGroupName").text(HGroupName);//班组
        $("#HEquipName").text(HEquipName);//设备名称
        $("#HEquipCode").text(HEquipCode);//设备编号
        $("#HEmpName").text(HEmpName);//操作员
        $("#HManagerName").text(HManagerName);//负责人
        $("#HGroupName").text(HGroupName);//班组
        //#endregion
        //#region ã€ä»ªè¡¨ç›˜ã€‘
@@ -691,7 +691,7 @@
        //退出
        form.on('submit(Exit)', function (data) {//提交
            Pub_Close(2);
            Pub_Close(1);
        })
        
@@ -711,6 +711,7 @@
            $("#HPRDOrgID").val(sessionStorage["OrganizationID"]);
            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
            $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//新增按钮禁用
            //get_Display();
            get_Display_OutBillList();
            get_Display_UserList();
            get_ConfigFileInfo_EquipFile();
@@ -801,6 +802,43 @@
            sWhere = "";//调用接口后清空sWhere缓存
        }
        //#endregion
        function get_Display(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_CurrentTicket/list',
                type: "GET",
                async: false,
                data: { "HSourceID": HSourceID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HSourceInterID": HSourceInterID, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        var data = result.data.h_p_JIT_GetCurrentTicketInfo[0];
                        $("#HICMOBillNo").text(data.HSourceBillNo);//工单号
                        $("#HICMOBillStatus").text('');//当前状态
                        $("#HMaterNumber").text(data.HMaterNumber);//产品代码
                        $("#HMaterName").text(data.HMaterName);//产品名称
                        $("#HMaterModel").text(data.HModel);//规格型号
                        $("#HPlanQty").text(data.HPlanQty);//计划数量
                        $("#HReportQty").text(data.HRelationQty);//汇报总数
                        $("#HPickMtrlStatus").text('');//领料状态
                        $("#HFCheckNum").text(data.首检次数);//首检次数
                        $("#HPrCheckNum").text(data.过程检次数);//过程检次数
                        $("#HPPCheckNum").text(data.巡检次数);//巡检次数
                        HFinishRate = data.完成率;//完成率
                        HQualifiedRate = data.合格率;//合格率
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(result.code + result.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#region æŸ¥è¯¢
        function get_PanelDisplay(sWhere) {
@@ -969,10 +1007,15 @@
        //保存
        function Saver(data) {
            if ($("#HProcExchBillNo").val() == "") {
                layer.msg("请扫流转卡!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            if ($("#HQty").val() == 0) {
                layer.msg("数量不能为0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }
            var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";Add";
            var index = layer.load();
            $.ajax({