Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zgq

2021-07-21 42aee5b9502267881fe29584ce32898f83206eb5

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -6,7 +6,7 @@
     //var WEBURL = "http://101.37.171.70/API/";   //公司服务器
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://10.1.4.154/API/";   //江丰客户
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器

 WebTM/views/IpadIndex.html

@@ -63,7 +63,7 @@
        });
        function TSLoad() {
            $("#topleft").html("");
            var HUserName = sessionStorage["HUserName"];     //默认当前登录人员
            var HUserName = "Admin";  //sessionStorage["HUserName"];     //默认当前登录人员
            $.ajax({
                url: GetWEBURL() + "/ReportPlatForm/SearchGetLineBindBillList",
                type: "GET",
@@ -161,6 +161,8 @@
                                        html1 += '<h1 style="display:none;"><span>源单子内码：</span><span id="sb' + (i + 1) + '">' + LoadData1[i].HSourceEntryID + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>源单单号：</span><span id="sw' + (i + 1) + '">' + LoadData1[i].HSourceBillNo + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>源单类型：</span><span id="st' + (i + 1) + '">' + LoadData1[i].HSourceBillType + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>生产订单号主ID：</span><span id="df' + (i + 1) + '">' + LoadData1[i].HICMOInterID + '</span></h1>';
                                        html1 += '<h1 style="display:none;"><span>生产订单子ID：</span><span id="ds' + (i + 1) + '">' + LoadData1[i].HICMOEntryID + '</span></h1>';
                                       
                                        
                                        html1 += '<h1><span>工单号：</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
@@ -364,7 +366,9 @@
            HSourceEntryID = $("#sb" + i + "").html(); //通过样式ID获取html内容(源单子内吗)
            HSourceBillNo = $("#sw" + i + "").html(); //通过样式ID获取html内容(源单单号)
            HSourceBillType = $("#st" + i + "").html(); //通过样式ID获取html内容(源单类型)

            HICMOInterID = $("#df" + i + "").html();     //生产订单主内码
            HICMOEntryID = $("#ds" + i + "").html();     //生产订单子内码
     

            if (workcode != "" && workcode != null) {
                $('.cns').removeClass('check1');  //删除不同父级clss样式相同的所有元素
@@ -710,7 +714,10 @@
                    data.push({
                        "workcode": workcode,
                        "HSourceID": HSourceID1,
                        "HSourceName": HSourceName1
                        "HSourceName": HSourceName1,
                        "HICMOInterID": HICMOInterID,
                        "HICMOEntryID": HICMOEntryID,
                        "HMaker": "Admin"    //sessionStorage["HUserName"]
                    });

                    //通过索引获取到当前iframe弹出层
@@ -892,7 +899,7 @@
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4">
                                <div class="cnt bottomright">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
                                    <span class="layui-icon layui-icon-chart imgicon"></span>
                                    <span class="imgtitle">不良采集</span>
                                </div>
@@ -912,7 +919,7 @@
                                </div>
                            </div>
                            <div class="layui-col-sm12 layui-col-md4">
                                <div class="cnt bottomright">
                                <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%)">
                                    <span class="layui-icon layui-icon-close imgicon"></span>
                                    <span class="imgtitle">退出</span>
                                </div>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_Add_MouldScrapInBillList.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>新增/编辑模具报废入库单</title>
    <title>新增/编辑报废入库单</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -215,6 +215,7 @@
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            var tableReload = table.reload;
            //初始化网格
            var option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
@@ -254,13 +255,16 @@
                ]]
                , limit: 500 //每页默认显示的数量
            };
            //判断是否新增

            //根据递入得ID åˆ¤æ–­æ˜¯å¦æ–°å¢ž
            if (hID == null || hID == 0) {
                //新增
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"","HSPName":"", "HRemark": "" }];
                table.render(option);
            }
            else {
                //修改
                $("#HInterID").val(hID);//修改时主表ID
                //编辑加载数据
                $.ajax({
@@ -295,7 +299,7 @@
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
                switch (obj.event) {
                    case 'btn-AddLine':
                    case 'btn-AddLine': //增行
                        //table.cache["mainTable"].push(AddRow[rows]);
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
@@ -303,7 +307,7 @@
                        rows++;
                        layer.msg('增加一行按钮！')
                        break;
                    case 'btn-CopyLine':
                    case 'btn-CopyLine'://复制行
                        var copydata = JSON.stringify(data);
                        if (data.length <= 0) {
                            layer.alert("请选择需要复制的一行！");
@@ -322,7 +326,7 @@
                        break;
                }
            });
            //行内事件
            //行内事件  åˆ é™¤è¡Œ
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
@@ -344,9 +348,9 @@

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event === 'HMaterCode')  //模具信息
                        if (obj.event === 'HMaterCode')  //模具信息  å¦‚果在模具代码列 æŒ‰F7
                        {
                            //页面层-自定义
                            //页面层-自定义  //F7选择模具
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
@@ -600,7 +604,7 @@
           
            });

            //监听单元格编辑
            //监听单元格编辑  å•å…ƒæ ¼ç¼–辑后 å˜æ›´
            table.on('edit(mainTable)', function (obj) {
                // å•å…ƒæ ¼ç¼–辑之前的值
                var oldText = $(this).prev().text();
@@ -665,9 +669,9 @@
            });


            function RoadBillMain(hID)//加载表头
            function RoadBillMain(hID)//加载表头  ä¿®æ”¹æ—¶ä»Žæ•°æ®åº“ èŽ·å–数据加载到表头
            {
                alert(hID);
                //alert(hID);
                //查询检验方案单是否存在
                $.ajax({
                    url: GetWEBURL() + "Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai",
@@ -708,7 +712,7 @@
                });
            }


            //日期框 é»˜è®¤ä¸ºä»Šå¤©
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;

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

@@ -117,7 +117,9 @@
        //获取参数
        var workcode = "";  //工单号
        var HSourceID = ""; //资源ID

        var HICMOInterID = ""; //生产订单主ID
        var HICMOEntryID = ""; //生产订单子ID
        var SchWhere = ""; //按钮查询参数
        function getUrlVars() {
            var vars = [], hash;
            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -137,6 +139,9 @@
            workcode = data[0].workcode;
            HSourceID = data[0].HSourceID;
            HSourceName = data[0].HSourceName;
            HICMOInterID = data[0].HICMOInterID;
            HICMOEntryID = data[0].HICMOEntryID;
            HMaker = data[0].HMaker;
        }

        layui.config({
@@ -162,7 +167,7 @@
                ,cellMinWidth: 90
                , cols: [[
                     { type: 'checkbox', fixed: 'left' }
                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true, width: 200}
                    , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200}
                    , { 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 }
@@ -196,7 +201,9 @@
            //有源单新增
            if (Type == 2)
            {
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "'";
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null"?0: HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESProductReportBillList',
@@ -211,6 +218,7 @@
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                        sWhere = "";
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
@@ -225,12 +233,12 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var InterID = data[0].HInterID.toString();
                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sc_ICMOReportBill/DeltetICMOReportBill", //方法所在页面和方法名
                            url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESProductReportBill", //方法所在页面和方法名
                            data: { "HInterID": InterID },
                            success: function (result) {
                                if (result.count == 1) {
@@ -316,6 +324,8 @@
                    var HBillNo = $("#HBillNo").val(); //单据号
                    var Part = $("#Part").val();       //物料信息
                    var Source = $("#Source").val();  //资源
                    sWhere += SchWhere;
                    console.log(sWhere);
                    if (HDate) {
                        sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                    }
@@ -333,7 +343,7 @@
                    }
                    $.ajax({
                        //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                        url: GetWEBURL() + '/Sc_ICMOReportBill/DeltetICMOReportBill',
                        url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESProductReportBillList',
                        type: "GET",
                        data: { "sWhere": sWhere },
                        success: function (data1) {