zzr99
2021-12-10 e288d3d5138b9b7e69716d1a4e5cdbb0e0be3462
返工单
3个文件已修改
181 ■■■■■ 已修改文件
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/报工台工序/返工/Sc_MESReturnStepWorkBillList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainPlanBillList.html
@@ -197,7 +197,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " };
                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": " " };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -420,7 +420,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark" }];
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark":"" }];
                table.render(option);
            }
@@ -428,7 +428,7 @@
            function set_EditFromGrid() {
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark"}];
                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark":""}];
                table.render(option);
            }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_Add_MESReturnStepWorkBillList.html
@@ -118,13 +118,14 @@
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">任务单号:</label>
                                                        <label class="layui-form-label">任务单号</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HSourceBillNo" lay-verify="HSourceBillNo" id="HSourceBillNo" disabled autocomplete="off">
                                                            <input id="HSourceInterID" name="HSourceInterID" type="hidden" />
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillList" id="HSourceBillList" style="width:40px;">
                                                            <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                                            <input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HICMOBillList" id="HICMOBillList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                            </button>-->
                                                        </div>
                                                    </div>
                                                </div>
@@ -132,7 +133,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工工序</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HProcNo" id="HProcNo" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HProcID" id="HProcID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" id="HProcList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -166,13 +167,13 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品名称:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off">
                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off" readonly="readonly">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品规格:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off">
                                                            <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off" readonly="readonly">
                                                        </div>
                                                    </div>
                                                </div>
@@ -202,9 +203,17 @@
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HWorkerName" id="HWorkerName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HWorkerID" id="HWorkerID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList" id="HEmpList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <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:780px"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
@@ -398,23 +407,22 @@
                $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //返工日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
                //加源单类型区分(可以写不同的方法)
                $('#HICMOBillNo').attr("disabled", true);
                $('#HICMOInterID').attr("disabled", true);
                $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HBeginDate').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMainSourceBillNo').attr("disabled", true);
                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HProcID').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HPlanBeginDate').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#SourceType').attr("disabled", true);
                form.render('select');
                $('#HICMOBillNo').attr("disabled", true);
                $.ajax(
                    {
@@ -432,23 +440,24 @@
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                $("#HProcID").val(LoadData[0].HProcID); //当前工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //当前工序
                                $("#HMaterID").val(LoadData[0].HMaterID); //产品ID
                                $("#HMaterCode").val(LoadData[0].HMaterNumber); //产品代码
                                $("#HMaterName").val(LoadData[0].HMaterName); //产品名称
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号(暂时取值订单编号)
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HMainSourceBillType").val(HSourceBillType); //源单类型
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //任务单主内码ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //任务单子内码ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //任务单号
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HProcID").val(LoadData[0].HProcID); //返工工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //返工工序
                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
                                $("#HDeptName").val(LoadData[0].HDeptName); //车间
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //生产订单ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //生产订单子ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //生产订单
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
@@ -464,23 +473,23 @@
            //编辑
            function set_EditFromGrid() {
                refSav = "Update";
                $('#HICMOBillNo').attr("disabled", true);
                $('#HICMOInterID').attr("disabled", true);
                $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterCode').attr("disabled", true);
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HBeginDate').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMainSourceBillNo').attr("disabled", true);
                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HProcID').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HPlanBeginDate').attr("disabled", true);
                $('#HDeptName').attr("disabled", true);
                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#SourceType').attr("disabled", true);
                form.render('select');
                $('#HICMOBillNo').attr("disabled", true);
                $.ajax({
                    url: GetWEBURL() + "Sc_MESBeginStepWorkBill/Sc_MESBeginStepWorkBillListCheckDetai",
                    url: GetWEBURL() + "Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai",
                    type: "GET",
                    data: {
                        "HID": linterid
@@ -488,33 +497,32 @@
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
                            var data = result.data.h_v_Sc_MESReturnWorkBillList[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HInterID": data.hmainid
                                , "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOBillNo": data.任务单                        //生产订单
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序名称
                                , "HProcName": data.返工工序名称
                                , "HQty": data.返工数量
                                , "HPlanBeginDate": formatDate(data.返工时间)
                                , "HMaterID": data.HMaterID
                                , "HMaterCode": data.产品代码
                                , "HMaterName": data.产品名称
                                , "HMaterSpec": data.规格型号
                                , "HBeginDate": data.开工时间
                                , "HSourceID": data.HSourceID              //资源ID
                                , "HSourceName": data.资源名称             //资源名称
                                , "HEmpID": data.HEmpID                   //操作员ID
                                , "HEmpName": data.申请开工人员           //操作员
                                , "HMainSourceInterID": data.HMainSourceInterID                 //源单ID
                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //源单子ID
                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //源单单号
                                , "HMainSourceBillType": data.HMainSourceBillType               //源单类型
                                , "HGroupID": data.HGroupID                //班组ID
                                , "HGroupName": data.班组名称              //班组名称
                                , "HDeptID": data.HDeptID                  //部门ID
                                , "HDeptName": data.部门名称               //部门名称
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                                , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                                , "HWorkerID": data.HWorkerID                   //操作员ID
                                , "HWorkerName": data.操作员           //操作员
                                , "HRemark": data.备注                    //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
@@ -558,30 +566,7 @@
                $("#HInterID").val(linterid);//修改时主表ID
            }
            //获取下拉选中值
            form.on('select(SourceType)', function (data) {
                Sctag = data.value;
                form.render('select');
                if (Sctag != "2")  //无源单
                {
                    $("#HMainSourceInterID").val("");
                    $("#HMainSourceEntryID").val("");
                    $("#HMainSourceBillNo").val("");
                    $("#HMainSourceBillType").val("");
                    $('#HMainSourceBillNo').attr("disabled", false);
                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                    OperationType = 1;
                }
                else {
                    $('#HMainSourceBillNo').attr("disabled", true);
                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
                    OperationType = 2;
                }
            });
            //保存提交
            form.on('submit(Saver)', function (data) {
@@ -594,7 +579,7 @@
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkFrom", //方法所在页面和方法名
                    url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom", //方法所在页面和方法名
                    async: false,
                    data: { "msg": sMainSub },
                    dataType: "json",
@@ -708,17 +693,17 @@
            });
            //返工工序
            form.on('submit(HSourceList)', function () {
            form.on('submit(HProcList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '资源列表',
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
                    content: ['../../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
@@ -746,7 +731,7 @@
            });
            //操作员
            form.on('submit(HEmpList)', function () {
            form.on('submit(HWorkerList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -766,8 +751,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        $("#HWorkerName").val(checkStatus.data[0].HName);
                        $("#HWorkerID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -879,15 +864,11 @@
                layer.msg("产品编码不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HBeginDate").val() == '' || $("#HBeginDate").val() == null) {
                layer.msg("开工时间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            if ($("#HPlanBeginDate").val() == '' || $("#HPlanBeginDate").val() == null) {
                layer.msg("返工时间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
                layer.msg("生产资源不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
            if ($("#HWorkerID").val() == '' || $("#HWorkerID").val() == null) {
                layer.msg("操作员不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
@@ -896,14 +877,8 @@
                return Result = false;
            }
            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                layer.msg("车间不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                layer.msg("部门不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if (OperationType == "2") {
                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                    layer.msg("生产订单不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
            }
            return Result;
        }
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_MESReturnStepWorkBillList.html
@@ -64,7 +64,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -285,7 +285,7 @@
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../返工/Sc_Add_MESReturnStepWorkBill.html?OperationType=1&linterid=&HSouceBillType=',
                    content: '../返工/Sc_Add_MESReturnStepWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
@@ -318,7 +318,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../返工/Sc_Add_MESReturnStepWorkBill.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
                        , content: '../返工/Sc_Add_MESReturnStepWorkBillList.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
                        ,resize: false,
                        end: function () {
                            //刷新页面,