zgq
2021-08-11 191775789f86fbc70dc4f700d8dc6a0d201779e6
生产任务单下推工序流转卡
4个文件已修改
274 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 228 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -639,7 +639,7 @@
      <publishTime>03/23/2021 14:14:38</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>08/05/2021 13:45:42</publishTime>
      <publishTime>08/05/2021 15:19:15</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -846,7 +846,7 @@
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/WMSBarCodeDetailsList.html">
      <publishTime>07/06/2021 17:08:14</publishTime>
      <publishTime>08/05/2021 17:05:23</publishTime>
    </File>
    <File Include="views/component/anim/index.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1299,7 +1299,7 @@
      <publishTime>04/16/2021 14:21:33</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>07/16/2021 17:40:57</publishTime>
      <publishTime>08/05/2021 17:07:15</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html">
      <publishTime>03/29/2021 10:47:31</publishTime>
@@ -1494,7 +1494,7 @@
      <publishTime>03/29/2021 10:48:23</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Source.html">
      <publishTime>08/03/2021 09:44:15</publishTime>
      <publishTime>08/06/2021 21:23:02</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/H_ProcessDetail.html">
      <publishTime>03/23/2021 14:14:38</publishTime>
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Sc_ICMOBillListView.html
@@ -48,7 +48,7 @@
                //var sMainStr = JSON.stringify(table.cache['ck-table']);
                var checkStatus = table.checkStatus('ck-table')
                 , data = checkStatus.data;
                parent.GetICMOBillValue(data);
                parent.GetICMOBillValue(data[0].hmainid);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html
@@ -66,13 +66,13 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>下推</button>
                            </div>
                        </script>
                    </form>
@@ -103,13 +103,14 @@
            var option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , toolbar: '#toolbarDemo'
                ,height: 'full-50' 
                , page: true
                ,cellMinWidth: 90
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
                    //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
                    { field: '日期', title: '日期', sort: true, width: 120 }
                    , { field: '日期', title: '日期', sort: true, width: 120 }
                    , { field: '单据号', title: '单据号', sort: true, width: 170 }
                    , { field: '订单跟踪号', title: '订单跟踪号', width: 105 }
                    //, { field: 'HDeptID', title: 'HDeptID' }
@@ -238,7 +239,32 @@
                sWhere = "";//调用接口后清空sWhere缓存
            });
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //下推
                    case 'set_pushDown': set_pushDown();
                        break;
                };
            });
            //下推单据
            function set_pushDown() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序流转卡-编辑'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3772'
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //laydate.render({
            //    elem: '#HDate'
            //    , type: 'datetime'
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -9,6 +9,11 @@
    <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; /*调整按钮左右空隙大小*/
@@ -31,19 +36,11 @@
        <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 layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">预览</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">新增</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">修改</span></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">保存</span></i>
                        </button>
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="btnSave">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
@@ -504,6 +501,7 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                        </div>
                    </script>
                    <input id="HItemID" name="HItemID" type="hidden" />
                </form>
            </div>
        </div>
@@ -513,10 +511,6 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </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>
        layui.config({
@@ -538,28 +532,25 @@
            //    }, function () { window.location.href = "../../user/login.html"; });
            //}
            var params = getUrlVars();
            //获取参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
                for (var i = 0; i < hashes.length; i++) {
                    hash = hashes[i].split('=');
                    vars.push(hash[0]);
                    vars[hash[0]] = hash[1];
                }
                return vars;
            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
            }
            var linterid = params[params[0]]; //从参数中获取 å•据内码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•类型
            //判断是否新增
            if (linterid == null || linterid == 0) {
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                $("#HItemID").val(0);
            }
            else if (OperationType == 2) {//有源单新增
                $("#HItemID").val(linterid);//修改时主表ID
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3772' },
                    data: { "HBillType": '7505' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
@@ -568,11 +559,24 @@
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
                GetICMOBillValue(linterid)
            }
            else {//如果修改则走下面 new
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                RoadBillSub(linterid);
                //RoadBillSub(linterid);
            }
            else if (OperationType == 4) {//浏览
                $("#HItemID").val(linterid);//
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存后加载数据时保存按钮禁用
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            //初始表格数据
            var rowdata = [{
                "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "工序": "", "加工说明": "",
@@ -924,17 +928,23 @@
            //选择生产任务单
            form.on('submit(btnSearchICMOBill)', function () {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '生产任务单列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '生产任务单列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../../views/Baseset/基础资料/Sc_ICMOBillListView.html', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        GetICMOBillValue(checkStatus.data[0].hmainid)
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            });
@@ -1010,13 +1020,80 @@
            });
            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                Pub_Close(1);
            })
            //获取明细行
            window.GetICMOBillDetail = function (hmainid) {  //返回责任人
            ////获取明细行
            //window.GetICMOBillDetail = function (hmainid) {
            //    $.ajax({
            //        url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
            //        type: "GET",
            //        data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
            //        success: function (result) {
            //            if (result.count == 1) {
            //                option.data = result.data;
            //                table.render(option);
            //            }
            //            else {
            //                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //            }
            //        }
            //    })
            //}
            //返回生产任务单
            function GetICMOBillValue(hmainid) {
                $.ajax({
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
                    type: "GET",
                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[result.data.length - 1];
                            $("#HICMOInterID").val(data.hmainid);
                            $("#HICMOBillNo").val(data.生产订单号);
                            $("#HICMOEntryID").val(data.HEntryID);
                            $("#HOrderProcNO").val(data.订单跟踪号);
                            $("#HMaterID").val(data.hmaterid);
                            $("#HMaterName").val(data.物料名称);
                            $("#HMaterID2").val(data.hmaterid);
                            $("#HMaterName2").val(data.物料名称);
                            $("#HMaterNumber").val(data.物料代码);
                            $("#HMaterNumber2").val(data.物料代码);
                            $("#HModel").val(data.规格型号);
                            $("#HBatchNo").val(data.批号);
                            $("#HUnitID").val(data.hunitid);
                            $("#HUnitName").val(data.计量单位名称);
                            $("#HUnitNumber").val(data.计量单位代码);
                            $("#HPlanQty").val(data.计划生产数量);
                            $("#HQty").val(data.流转卡数量);
                            $("#HprocExQty").val(data.流转卡数量);
                            $("#HPlanBeginDate").val(data.计划开工日期);
                            $("#HPlanEndDate").val(data.计划完工日期);
                            $("#HWorkShopID").val(data.hdeptid);
                            $("#HWorkShopName").val(data.生产车间名称);
                            $("#HProdMaterCode").val(data.产品CODE);
                            $("#HSeOrderBillNo").val(data.销售订单号);
                            $("#HCusShortName").val(data.客户简称);
                            $("#HCusNeedMaterial").val(data.客户要求材料成分);
                            $("#HPlanSendGoodsDate").val(data.预计出货日期);
                            $("#HProdMaterName").val(data.产品名称);
                            $("#HCusName").val(data.客户名称);
                            $("#HWorkRemark").val(data.生产备注);
                            $("#HImportNote").val(data.重要提示);
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }
                })
                //txtHBillNo.Text = sBillNo;
                GetICMOBillDetail(hmainid);
            }
            function GetICMOBillDetail(hmainid) {
                $.ajax({
                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
                    type: "GET",
@@ -1045,55 +1122,6 @@
            ZRProcName, QRName;
        //返回生产任务单
        function GetICMOBillValue(obj) {
            $.ajax({
                url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
                type: "GET",
                data: { "hmainid": obj[0].hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) {
                        var data = result.data[result.data.length-1];
                        $("#HICMOInterID").val(data.hmainid);
                        $("#HICMOBillNo").val(data.生产订单号);
                        $("#HICMOEntryID").val(data.HEntryID);
                        $("#HOrderProcNO").val(data.订单跟踪号);
                        $("#HMaterID").val(data.hmaterid);
                        $("#HMaterName").val(data.物料名称);
                        $("#HMaterID2").val(data.hmaterid);
                        $("#HMaterName2").val(data.物料名称);
                        $("#HMaterNumber").val(data.物料代码);
                        $("#HMaterNumber2").val(data.物料代码);
                        $("#HModel").val(data.规格型号);
                        $("#HBatchNo").val(data.批号);
                        $("#HUnitID").val(data.hunitid);
                        $("#HUnitName").val(data.计量单位名称);
                        $("#HUnitNumber").val(data.计量单位代码);
                        $("#HPlanQty").val(data.计划生产数量);
                        $("#HQty").val(data.流转卡数量);
                        $("#HprocExQty").val(data.流转卡数量);
                        $("#HPlanBeginDate").val(data.计划开工日期);
                        $("#HPlanEndDate").val(data.计划完工日期);
                        $("#HWorkShopID").val(data.hdeptid);
                        $("#HWorkShopName").val(data.生产车间名称);
                        $("#HProdMaterCode").val(data.产品CODE);
                        $("#HSeOrderBillNo").val(data.销售订单号);
                        $("#HCusShortName").val(data.客户简称);
                        $("#HCusNeedMaterial").val(data.客户要求材料成分);
                        $("#HPlanSendGoodsDate").val(data.预计出货日期);
                        $("#HProdMaterName").val(data.产品名称);
                        $("#HCusName").val(data.客户名称);
                        $("#HWorkRemark").val(data.生产备注);
                        $("#HImportNote").val(data.重要提示);
                    }
                    else {
                        layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                }
            })
            //txtHBillNo.Text = sBillNo;
            GetICMOBillDetail(obj[0].hmainid);
        }
        function GetHReasonValue(obj)  //返回不良原因
        {
            HReasonName = obj[0].HName;