器具点检记录表 功能优化(选点检规程带出子表 选点检计划 带出模具 点检规程 带出子表) 停工单增加刷卡验证 工序出站增加遗失字段 和取样字段 工...

yangle

2024-06-24 5c08046b29ae41eb3629cfec66ea84d94d001ffa

器具点检记录表  功能优化(选点检规程带出子表  选点检计划 带出模具 点检规程 带出子表)
停工单增加刷卡验证
工序出站增加遗失字段 和取样字段
工序流转卡增加批次号

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html

@@ -333,6 +333,10 @@

                        $("#HPlanNo").val(checkStatus.data[0].单据号);
                        $("#HPlanInterID").val(checkStatus.data[0].hmainid);
                        $("#HMouldID").val(checkStatus.data[0].HMouldID);
                        $("#HMouldName").val(checkStatus.data[0].产品模具);
                        $("#HMouldDotCheckRuleID").val(checkStatus.data[0].HMouldDotCheckRuleID);
                        $("#HMouldDotCheckRuleName").val(checkStatus.data[0].HMouldDotCheckRuleNo);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        //$.ajax({
                        //    url: GetWEBURL() + 'Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan',
@@ -453,6 +457,8 @@
                        console.log(checkStatus);
                        $("#HMouldDotCheckRuleName").val(checkStatus.data[0].单据号);
                        $("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
                        $("#HMouldID").val(checkStatus.data[0].HMouldID);
                        $("#HMouldName").val(checkStatus.data[0].模具名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_DocCheckItem2(checkStatus.data[0].hmainid);
                    }
@@ -806,8 +812,8 @@
                        if (result != null) {
                            if (result.count == 1) {
                                var BYData = result.list[0];//点检
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                //var PJData = result.list[1];//配件
                                //var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                table.render(option);

@@ -816,9 +822,9 @@
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
                                            "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerCode,
                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                            "HDotCheckItemID": BYData[i].点检项目ID, "HDotCheckItem": BYData[i].点检项目, "HDotCheckPart": BYData[i].点检部位,
                                            "HClaim": BYData[i].具体要求, "HManagerID": BYData[i].负责人ID, "HManagerNumber": BYData[i].负责代码,
                                            "HManagerName": BYData[i].负责人名称, "HRemark": BYData[i].表体备注, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].点检项目分类名称, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].点检方法名称, "HDotCheckResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -845,8 +851,8 @@
                        if (result != null) {
                            if (result.count == 1) {
                                var BYData = result.list[0];//点检
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                //var PJData = result.list[1];//配件
                                //var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y" }];
                                table.render(option);

@@ -855,9 +861,9 @@
                                    buttonArr = [];//清空数组
                                    for (var i = 0; i < BYData.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": BYData[i].HDotCheckItemID, "HDotCheckItem": BYData[i].HDotCheckItem, "HDotCheckPart": BYData[i].HDotCheckPart,
                                            "HClaim": BYData[i].HClaim, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HRemark": BYData[i].HRemark, "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "", "HDotCheckResult": "Y"
                                            "HDotCheckItemID": BYData[i].点检项目ID, "HDotCheckItem": BYData[i].点检项目, "HDotCheckPart": BYData[i].点检部位,
                                            "HClaim": BYData[i].具体要求, "HManagerID": BYData[i].负责人ID, "HManagerNumber": BYData[i].负责人代码,
                                            "HManagerName": BYData[i].负责人名称, "HRemark": BYData[i].子备注, "HDotCheckItemClassID": BYData[i].HDotCheckItemClassID, "HDotCheckItemClassName": BYData[i].点检项目分类名称, "HDotCheckItemMethodID": BYData[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": BYData[i].点检方法名称, "HDotCheckResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_SwipeCardStart.html

@@ -150,7 +150,7 @@
</html>
<script>
    layui.config({
        base: '../../layuiadmin/' //静态资源所在路径
        base: '../../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html

@@ -87,7 +87,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -359,6 +359,7 @@
    </div>
    <script>
        //获取参数
        var OptionData = [];
        var HBillType = "";  //单据类型
        var HSourceInterID = ""; //源单主内码
        var HSourceEntryID = "";  //源单子内码
@@ -647,6 +648,65 @@
            //保存提交
            form.on('submit(Saver)', function (data) {
                if (AllowLoadData(data)) {
                    //禁用保存按钮
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                    //判断系统参数是否勾选
                    Xt_AllowLoadData(data);
                }
            });

            //判断系统参数是否选中
            function Xt_AllowLoadData(data2) {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/Xt_AllowLoadData", //方法所在页面和方法名
                    async: false,
                    data: { "HKey": "Sc_MESBeginWorkBill_SwipeCardStart" },
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            if (data.Verify == "Y") //刷卡验证
                            {
                                layer.msg("需要进行刷卡验证!", { time: 1 * 1000, icon: 1 }, function (index) {
                                    layer.open({
                                        type: 2,
                                        skin: 'layui-layer-rim', //加上边框
                                        title: 'IC刷卡',
                                        closeBtn: 1,
                                        shift: 2,
                                        area: ['50%', '80%'],
                                        maxmin: true,
                                        content: '../../生产管理/报工台工序/开工/Sc_SwipeCardStart.html?HSourceInterID=' + HSourceInterID,
                                        end: function () {
                                            if (OptionData.length > 0) {
                                                if (OptionData[0]["data"] == "1") {
                                                    save(data2);
                                                } else if (OptionData[0]["data"] == "0") {
                                                    layer.msg("因为技能不匹配,无法保存!")
                                                }
                                                OptionData = [];
                                            } else {
                                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);
                                            }
                                        }
                                    });
                                });
                            }
                            else {
                                save(data2);
                            }
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }

            function save(data) {
              
                    var index = layer.load();
                    var sMainStr = JSON.stringify(data.field);
                    var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
@@ -694,10 +754,8 @@
                            layer.alert(err, { icon: 5 })
                        }
                    })
                }

           
            });
             
            }

            //审核按钮提交
            form.on('submit(VerIfySaver)', function (data) {
@@ -1018,6 +1076,9 @@
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
        }
        function GetSwipeCardStart(obj) {
            OptionData[0] = obj;
        }
    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/RetrospectiveQueryReport.html

@@ -257,6 +257,7 @@
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        col.push({ type: 'numbers', title: '序号' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -108,12 +108,19 @@
                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产组织</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">订单跟踪号</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
                            </div>
                        </div>-->
        <label class="layui-form-label">订单跟踪号</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
        </div>
    </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -164,10 +171,9 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产组织</label>
                                            <label class="layui-form-label">遗失数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                                <input type="text" class="layui-input" value="0" name="HLossQty" id="HLossQty" onfocus="this.select();">
                                            </div>
                                        </div>
                                    </div>
@@ -183,17 +189,23 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">核算工序</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
                            </div>
                        </div>-->
        <label class="layui-form-label">核算工序</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
            <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
        </div>
    </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"></label>
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="转下道" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled>
                                                <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">取样数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="HToCheckQty" id="HToCheckQty" onfocus="this.select();">
                                            </div>
                                        </div>
                                    </div>
@@ -897,6 +909,8 @@
                                "HBackWorkQty": data.返工数量,
                                "HShiftsID": data.HShiftsID,
                                "HShiftsName": data.班次名称,
                                "HToCheckQty": data.取样数量,
                                "HLossQty": data.遗失数量,
                            });
                            if (data.是否审核 == "true") {
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill_CurrentWork.html

@@ -203,7 +203,27 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">穴号</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;" >
                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">不良数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HBadCount" id="HBadCount" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">遗失数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HLossQty" id="HLossQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">取样数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
                                                <input type="text" class="layui-input" name="HToCheckQty" id="HToCheckQty" value="0" style="width: 150px;">
                                            </div>
                                        </div>
                                    </div>
@@ -1030,8 +1050,9 @@
                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: "温馨提示" });
            if ($("#HQty").val() == 0 && $("#HBadCount").val() == 0) {

                layer.msg("不良和合格数量不能同时为0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            }


 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html

@@ -1515,7 +1515,7 @@
                        }
                        , end: function () {
                            var sProcNo = $('#HProcNo').val();
                            var sBillNo = $('#HBarCode').val();
                            var sBillNo = $('#HProcExchBillNo').val();
                            if (sProcNo != "") {
                                txtHProcNo_KeyDown(sBillNo, sProcNo);
                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -174,12 +174,18 @@
                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">材质</label>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">批次号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
                                                <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
                                            </div>
                                        </div>-->
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">材质</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
        </div>
    </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs3 layui-inline">
@@ -1024,7 +1030,7 @@
            //判断操作类型
            if (OperationType == 1 ) {//无源单新增
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '3772' },
                    success: function (d) {
@@ -1062,7 +1068,7 @@
                            layer.alert(result.Message, { icon: 5 });
                        } else {
                            $.ajax({
                                url: GetWEBURL() + "/Web/GetMAXNum",
                                url: GetWEBURL() + "/Web/GetMAXNumPDA",
                                type: "GET",
                                data: { "HBillType": '3772' },
                                success: function (d) {
@@ -2269,6 +2275,7 @@
                                , "HMaterModel": data.材料规格
                                , "HWidth": data.幅宽
                                , "HWeight": data.克重
                                , "HBatchNo": data.批号

                                , "HAuxQty": data.辅数量
                                , "HAuxUnit": data.HAuxUnit

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_CF.html

@@ -81,7 +81,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">批号</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
                                                    <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" style="">
                                                </div>
                                            </div>
                                            <div class="layui-inline">