yangle
2023-06-09 e01ecae9e86f379f735b1eeb4570a4f5acc79228
提料计划信息导入
7个文件已修改
1个文件已添加
309 ■■■■■ 已修改文件
WebTM/App_Data/MssqlReportData.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html 272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +18,8 @@
    //public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch测试
    public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL测试
    public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//帅威
    //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//乔一
    //public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//龙山汽配
    //public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸井地址
WebTM/WebTM.csproj
@@ -205,6 +205,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Change.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,8 +6,8 @@
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
@@ -20,6 +20,7 @@
    //var WEBURL = "http://192.168.80.90:9090/API/";    //安瑞服务器
    //var WEBURL = "http://192.168.16.53:8081/API/";    //龙山汽配
    //var WEBURL = "http://122.227.158.218:8090/API/";    //龙山汽配外网
     //var WEBURL = "http://192.168.0.244:8082/API/";    //帅威内网
    return WEBURL
}
WebTM/views/index.html
@@ -348,6 +348,7 @@
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">车间仓库对照列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">提料计划信息列表</a></dd>
                                                <!--<dd><a lay-href="生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html" style="margin: 0 0 0 13px;">导入</a></dd>-->
                                                <dd><a lay-href="生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">要料计划信息列表</a></dd>
                                            </dl>
                                        </dd>
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBillList.html
@@ -76,6 +76,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excel导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
@@ -133,7 +134,11 @@
                    break;
                //删除
                case 'set_DeleteBill': set_DeleteBill();
                    break; //列设置
                    break;
                //导入
                case 'set_Excel': set_Excel();
                    break;
                //列设置
                case 'set_HideColumn': get_HideColumn();
                    break;
                case 'btn-back': set_Back();
@@ -512,6 +517,22 @@
            }
        }
        //导入
        function set_Excel() {
            layer.open({
                type: 2
                , skin: 'layui-layer-rim' //加上边框
                , area: ['100%', '100%']
                , title: '提料计划信息列表-导入'
                , shift: 0//弹出动画
                , content: '../日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html'
                , end: function () {
                    //刷新页面,
                    location.reload();
                }
            })
        }
        //#region æ–°å¢ž
        function set_AddNew() {
            layer.open({
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Add.html
@@ -423,7 +423,7 @@
                        form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                            "HBillNo": d.data[0].单据号
                            , "HInterID": d.data[0].hmainid
                            , "HPRDORGID": d.data[0].组织
                            , "HPRDORGID": d.data[0].HOrgID
                        });
                        var rowdata = [];
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Excel.html
New file
@@ -0,0 +1,272 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>提料计划信息导入</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
            height: 30px;
            line-height: 30px;
        }
        .btn-title {
            font-size: 16px;
        }
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 10px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                </div>
                            </div>
                        </div>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                        </div>
                    </script>
                </form>
            </div>
        </div>
    </div>
</body>
</html>
<script type="text/html" id="barDemo">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<script>
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {
        //#region å…¬ç”¨å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , tree = layui.tree
            , util = layui.util
            , upload = layui.upload
        var option = [];
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化界面
        set_ClearBill();
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            //data: {
            //    "WorkBookName": function () {
            //        return $("#WorkBookName").val();
            //    },
            //    "HOrgID": function () {
            //        return sessionStorage["OrganizationID"];
            //    }
            //},
            //before: function (data) {
            //    loadIndex = layer.load(2);
            //    this.data = {
            //        "WorkBookName": $("#WorkBookName").val(),
            //        "HOrgID": sessionStorage["OrganizationID"]
            //    }
            //},
            done: function (data1) {
                if (data1.count == 1) {
                    option.data = data1.data;
                    table.render(option);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.alert('导入出现异常', { icon: 2 });
            }
        });
        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
            if ($("input[name='SqlAppend']").prop("checked")) {
                set_AddNew(data);
            }
            else {
                if (table.cache["mainTable"] != null) {
                    set_AddNew(data);
                }
                else {
                    layer.msg("无数据,请先导入数据!");
                }
            }
        })
        //退出
        form.on('submit(Cancel)', function () {
            Pub_Close(1);
        })
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化表格
            set_InitGrid();
        }
        //#endregion
        //初始化表格
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-120'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    , { field: '组织编码', title: '组织编码', width: 120 }
                    , { field: '组织', title: '组织', width: 120 }
                    , { field: '供应商代码', title: '供应商代码', width: 120 }
                    , { field: '供应商', title: '供应商', width: 120 }
                    , { field: '物料代码', title: '物料代码', width: 120 }
                    , { field: '物料名称', title: '物料名称', width: 120 }
                    , { field: '规格型号', title: '规格型号', width: 120 }
                    , { field: '计量单位', title: '计量单位', width: 120 }
                    , { field: 'JIT物料分类', title: 'JIT物料分类', width: 120 }
                    , {field: 'JIT拉动安全库存量', title: '拉动安全库存量', width: 120 }
                    , { field: 'JIT物料需求供货周期', title: '物料需求供货周期', width: 120 }
                    , { field: 'JIT提货经济批量', title: 'JIT提货经济批量', width: 120 }
                    , { field: 'JIT提货批量对应周期(天)', title: 'JIT提货批量对应周期(天)', width: 120 }
                    , { field: 'JIT供货提前期(天)', title: 'JIT供货提前期(天)', width: 120 }
                    , { field: 'JIT到货前置期(天)', title: 'JIT到货前置期(天)', width: 120 }
                    , { field: 'JIT送货控制天数', title: 'JIT送货控制天数', width: 120 }
                    , { field: 'JIT最小起送量', title: 'JIT最小起送量', width: 120 }
                    , { field: '备注', title: '备注', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            table.render(option);
            //DisPlay_HideColumn();
        }
        //导入(保存)
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            //data.field.HOrgID = sessionStorage["OrganizationID"];//组织
            //var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + ';' + sessionStorage["HUserName"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave",
                async: true,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
                    if (data.count == 1) {
                        layer.close(index);
                        layer.msg(data.Message);
                        option.data = null;
                        table.cache["mainTable"] = null;
                        table.render(option);
                    }
                    else {
                        layer.close(index);
                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
        //#endregion
    });
</script>
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA_QiaoYi.html
@@ -1044,7 +1044,7 @@
                                        "HPRDOrg": data.组织,
                                        "HPRDOrgID": data.组织,
                                        "HmaterOutqty": data.出站数量,
                                        "HQty": result.data.length > 1 ? (result.data[0].流转卡数量 < result.data[1].出站关联数量 ? data.流转卡数量: result.data[1].出站关联数量): data.流转卡数量,
                                        "HQty": result.data.length > 1 ? (result.data[1].进站关联数量 == 0 ? (result.data[0].出站关联数量 == 0 ? result.data[0].流转卡数量 : result.data[0].出站关联数量) : result.data[0].流转卡数量 < result.data[1].进站关联数量 ? data.流转卡数量 : result.data[1].进站关联数量) : data.流转卡数量,
                                      
                                    });