20210720v1

zgq

2021-07-20 5127038d4716728cf1b7f291dfc0dfa9e2c58f9d

20210720v1

 WebTM/views/IpadIndex.html

@@ -63,7 +63,7 @@
        });
        function TSLoad() {
            $("#topleft").html("");
            var HUserName = "Admin" //sessionStorage["HUserName"];     //默认当前登录人员
            var HUserName = sessionStorage["HUserName"];     //默认当前登录人员
            $.ajax({
                url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
                type: "GET",
@@ -199,7 +199,7 @@
                                        html1 += '<div class="layui-col-sm12 layui-col-md12">';
                                        html1 += '<dl class="topright">;'
                                        html1 += '<dt>';
                                        html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../ layuiadmin/layui/images/erro.png";">';
                                        html1 += '<img src="../layuiadmin/layui/images/device.png" onError="this.src="../layuiadmin/layui/images/erro.png";">'
                                        html1 += '</dt>';
                                        html1 += '<dd>';
                                        html1 += '<h1><span>当前设备：</span><span>' + LoadData2[i].HSourceName + '</span></h1>';
@@ -573,6 +573,10 @@
                layer.alert("请选择工单列表", { icon: 5 });
                return false;
            }
            if (WorkStaus(HSourceID1, workcode, HSourceInterID, "汇报")) {
                layer.alert("单据状态不满足完工条件!", { icon: 5 });
                return false;
            }
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
@@ -733,7 +737,7 @@
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID +"' and hicmostatus not in('1')";   //停工挂起状态
                    break;
                case "汇报":
                    html1 = '';
                    sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1')";   //汇报状态
                    break;
                case "报检申请":
                    
@@ -763,7 +767,7 @@
                    flag = false;
                }
            });
            console.log(flag);
        
            return flag;
        }
    </script>
@@ -809,7 +813,7 @@
                    </ul>
                    <div class="layui-tab-content content3">
                        <div class="layui-tab-item layui-show">
                            <div class="layui-row layui-col-space10" id="btomleft">
                            <div class="layui-row layui-col-space10" id="btomleft" style="height:600px;display:block;overflow-y:auto;">

                            </div>
                        </div>
@@ -874,8 +878,8 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10" onclick="OpenInSpection(event,this)">
                            <div class="layui-col-sm12 layui-col-md4">
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenInSpection(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-release imgicon"></span>
                                    <span class="imgtitle">报检申请</span>
@@ -894,8 +898,8 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-row layui-col-space10" onclick="OpenStop(event,this)">
                            <div class="layui-col-sm12 layui-col-md4">
                        <div class="layui-row layui-col-space10">
                            <div class="layui-col-sm12 layui-col-md4" onclick="OpenStop(event,this)">
                                <div class="cnt bottomright">
                                    <span class="layui-icon layui-icon-play imgicon"></span>
                                    <span class="imgtitle">停工</span>

 WebTM/views/index.html

@@ -321,7 +321,7 @@
                                <dd>
                                    <a>报工管理</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="">报工平台n</a></dd>
                                        <dd><a lay-href="IpadIndex.html">报工平台</a></dd>
                                        <dd><a lay-href="">报检申请n</a></dd>
                                    </dl>
                                </dd>

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_Add_ProductReportBillList.html

@@ -108,7 +108,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                            <input id="HInterID" name="HInterID" type="hidden" />
                                                            <input id="HMaker" name="HMaker" type="hidden" /><!--制单人-->
                                                            
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -133,6 +133,8 @@
                                                            <input class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" autocomplete="off">
                                                            <input id="HSourceInterID" name="HSourceInterID" type="hidden" />
                                                            <input id="HSourceEntryID" name="HSourceEntryID" type="hidden" />
                                                            <input type="hidden" name="HSourceBillNo" id="HSourceBillNo">
                                                            <input type="hidden" name="HSourceBillType" id="HSourceBillType">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -184,6 +186,7 @@
                                                            </button>
                                                        </div>
                                                    </div>

                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">生产班组:</label>
                                                        <div class="layui-input-inline">
@@ -199,8 +202,8 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">操作员:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="text" name="HWorkManName" id="HWorkManName" class="layui-input" value="" style="float:left;width:150px;">
                                                            <input type="hidden" name="HWorkManID" id="HWorkManID" 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;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
@@ -431,7 +434,8 @@


            //有源单新增
            if (Type == 2) {
            if (Type == 2)
            {

                //加源单类型区分(可以写不同的方法)
                $('#HICMOBillNo').attr("disabled", true);
@@ -463,7 +467,8 @@
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
                                var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
                                console.log(LoadData);
                                $("#HProcID").val(LoadData[0].HProcID); //当前工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //当前工序
                                $("#HMaterID").val(LoadData[0].HMaterID); //产品ID
@@ -472,10 +477,10 @@
                                $("#HMaterSpec").val(LoadData[0].HModel); //产品规格
                                $("#HSourceID").val(LoadData[0].HSourceID); //生产资源ID
                                $("#HSourceName").val(LoadData[0].HSourceName); //生产资源
                                $("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //源单单号
                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码
                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HMainSourceBillType").val(HSourceBillType); //源单类型
                                $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //源单单号（暂时取值订单编号）
                                $("#HSourceInterID").val(LoadData[0].HSourceInterID); //源单主内码(取值HInterID)
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
                                $("#HDeptName").val(LoadData[0].HDeptName); //车间
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //生产订单ID
@@ -483,6 +488,7 @@
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //生产订单
                                $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //开工时间
                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //计划数量
                             
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
@@ -493,6 +499,7 @@
                            layer.alert(err, { icon: 5 });
                        }
                    });
                console.log($("#HSourceInterID").val());
            }


@@ -505,7 +512,7 @@
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetMESProductReportFrom", //方法所在页面和方法名
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportFrom", //方法所在页面和方法名
                    async: true,
                    data: { "msg": sMainStr },
                    dataType: "json",
@@ -631,8 +638,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        $("#HWorkManName").val(checkStatus.data[0].HName);
                        $("#HWorkManID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -707,11 +714,11 @@
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HWorkBeginDate").val() == '' || $("#HBeginDate").val() == null) {
            if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
                layer.msg("开工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HWorkReportDate").val() == '' || $("#HBeginDate").val() == null) {
            if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
                layer.msg("开工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
@@ -719,7 +726,7 @@
                layer.msg("生产资源不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
            if ($("#HWorkManID").val() == '' || $("#HWorkManID").val() == null) {
                layer.msg("操作员不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -163,7 +163,7 @@
                , cols: [[
                     { type: 'checkbox', fixed: 'left' }
                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true, width: 200}
                    , { field: 'HDate', title: '日期', width: 160,templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"}
                    , { field: 'HDate', title: '日期', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                    , { field: 'HBillNo', title: '单据号', width: 200}
                    , { field: 'HBillType', title: '单据类型', width: 200 }
                    , { field: 'HICMOBillNo', title: '生产订单号', width: 200 }
@@ -187,7 +187,7 @@
                    , { field: 'HWorkManID', title: '操作员ID', width: 200, hide: true}
                    , { field: 'HWorkManName', title: '操作员', width: 200 }
                    , { field: 'HMaker', title: '制单人', width: 200 }
                    , { field: 'HMakeDate', title: '制单日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'HMakeDate', title: '制单日期', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                    , { field: 'HReportType', title: '汇报类型', width: 200 }
                ]]
            };

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

@@ -470,6 +470,7 @@
                            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
@@ -781,6 +782,10 @@
                layer.msg("生产订单不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
                layer.msg("停工原因不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            return Result;
        }
    </script>

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -491,7 +491,7 @@

            //保存提交
            form.on('submit(Saver)', function (data) {
                alert("aa");
         
                var sMainStr = JSON.stringify(data.field);
                if (!AllowLoadData())//数据验证
                {

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -177,6 +177,19 @@
                , laydate = layui.laydate
                , element = layui.element;

            var fn1 = function (field) {
                return function (data) {
                    var value = data[field];
                    return [
                        '<select name="type" lay-filter="type" lay-search="true" value="' + value + '">',
                        '<option value="" >请选择状态</option>',
                        '<option value="0"' + (value === 0 ? 'selected' : '') + '>国产</option>',
                        '<option value="1"' + (value === 1 ? 'selected' : '') + '>进口</option>',
                        '</select>'
                    ].join('');
                };
            };

            //常规用法
            laydate.render({
                elem: '#HDate'
@@ -200,7 +213,7 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                    , { field: 'HMaterCode', title: '物料代码', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: 'HMaterCode', title: '物料代码', edit: 'text', event: 'HMaterCode', width: 100, templet: fn1('HMaterCode') }
                    , { field: 'HMaterName', title: '物料名称', edit: 'text', width: 100 }
                    , { field: 'HMaterSpec', title: '规格型号', edit: 'text', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
@@ -218,6 +231,8 @@
                ]]
                , limit: 500 //每页默认显示的数量
            };
          

            //判断是否新增
            if (hID == null || hID == 0) {
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }

 WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_Fast.html

@@ -629,7 +629,7 @@
                $.ajax({
                    url: GetWEBURL() + "/OtherOutBill/get_CheckTypeByBarCode_Out_Json",
                    type: "GET",
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {

 WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_Fast.html

@@ -606,8 +606,8 @@
                $.ajax(
                {
                    type: "POST",                    
                    //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/set_SaveOtherInStockBill_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
                     //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //方法所在页面和方法名
                    async: true,
                        data: { "oMain": sMain },
                    dataType: "json",
@@ -679,10 +679,10 @@
                }
                //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//非空验证
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///OtherInStockBill/get_InfoByBarCode_Source_Json",
                    //url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/OtherInStockBill/get_InfoByBarCode_Source_Json",
                    type: "GET",
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0},
                    data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {

 WebTM/views/ÑéÊÕÈë¿â/ίÍâÈë¿â/Kf_EntrustInBill_Fast.html

@@ -524,9 +524,9 @@
                    $.ajax(
                        {
                            type: "POST",
                            url: "http://localhost:12761/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", //方法所在页面和方法名
                            //url: "http://localhost:12761/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", //方法所在页面和方法名
                            //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
                            //url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
                            url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
                            async: true,
                            data: { "oMain": sMainStr },
                            dataType: "json",