完成 日计划工单列表 添加下推 工序流转卡功能，完成 工序流转卡(生产日计划的改造)

chenhaozhe

2025-05-13 89ceabaec369ebf9efaf9f36cdc5100e7ca6011e

完成 日计划工单列表 添加下推 工序流转卡功能，完成 工序流转卡(生产日计划的改造)

 WebTM/WebTM.csproj

@@ -628,7 +628,6 @@
    <Content Include="views\生产管理\生产报表\Sc_NutInspectionCCDPassRate.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产日计划工单\JIT_DayPlanBillList1.html" />
    <Content Include="views\生产管理\生产物料清单\sc_Gy_ICBomBillEdit.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />

 WebTM/WebTM.csproj.user

@@ -4,7 +4,7 @@
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_CusType.html

@@ -948,9 +948,7 @@
                                        break;
                                }

                                // é™åˆ¶æ ‡é¢˜è®¾ç½®
                                option.cols[0][i + 1]["title"] = dataCols[5]
                                // å­—段设置
                                option.cols[0][i + 1]["title"] = dataCols[4]
                                option.cols[0][i + 1]["field"] = dataCols[5]
                                // æ¶ˆé™¤åŽŸæœ‰çš„列模板，基于新的列配置新的模板
                                option.cols[0][i + 1]["templet"] = null;

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier.html

@@ -1069,7 +1069,7 @@
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
@@ -1079,7 +1079,7 @@
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
@@ -1116,8 +1116,7 @@
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
@@ -1170,7 +1169,7 @@
                                // æ ¼å¼åŒ–名字中含有某些词汇的列
                                if ((dataCols[4] + dataCols[5]).search('时间') !== -1) {
                                    option.cols[0][i + 1]["templet"] =
                                        option.cols[0][i + 1]["templet"] = "<div>{{d." + option.cols[0][i + 1]["field"] + " ==null ?'':layui.util.toDateString(d." + option.cols[0][i + 1]["field"] + ", 'yyyy-MM-dd HH:mm-ss')}}</div>"
                                        option.cols[0][i + 1]["templet"] = "<div>{{d." + option.cols[0][i + 1]["field"] + " ==null ?'':layui.util.toDateString(d." + option.cols[0][i + 1]["field"] + ", 'yyyy-MM-dd HH:mm:ss')}}</div>"
                                } else if ((dataCols[4] + dataCols[5]).search('供应商代码') !== -1) {
                                    option.cols[0][i + 1]["templet"] = function (d) {
                                        return '<span style="color: blue; cursor: pointer;">' + d.供应商代码 + '</span>'
@@ -1183,7 +1182,7 @@
                                    option.cols[0][i + 1]["totalRow"] = true;
                                }
                            }

                            
                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {

 WebTM/views/»ù´¡×ÊÁÏ/²É¹º»ù´¡×ÊÁÏ/Gy_Supplier_Edit.html

@@ -352,13 +352,12 @@
                                        </div>
                                    </div>
                                    <!--<div class="title">基本信息</div>-->
                                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="display:none">
                                    <!-- <div class="layui-tab" lay-filter="tab-POStockInBill" style="display:none">
                                        <ul class="layui-tab-title" lay-filter="tab-all">
                                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                                            <li lay-id="2" style="padding:1px;">其他</li>
                                        </ul>
                                        <div class="layui-tab-content">
                                            <!--基本信息-->
                                            <div class="layui-tab-item ">
                                                <div class="layui-form-item" style="padding-top: 10px;">
                                                    <div class="layui-row">
@@ -433,11 +432,10 @@
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                    </div> -->
                                    <!--隐藏字段-->
                                    <input type="hidden" name="lngBillKey" id="lngBillKey">
                                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
                                    <input type="hidden" name="HMaker" id="HMaker"><!--制单人-->
                                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                                        <ul class="layui-tab-title" lay-filter="tab-all">
                                            <li lay-id="1" style="padding:1px;" class="layui-this">联系人</li>
@@ -1194,13 +1192,13 @@
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            //初始化页面
            function set_AddFNew() {
                $("#HMaker").val(sessionStorage["HMaker"])
                $.ajax({
                    url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
                    type: "GET",
                    data: {},
                    success: function (d) {
                        $("#HInterID").val(d.data[0].hitemid);
                        $("#HMaker").val(sessionStorage["HUserName"])
                    }
                });
            }
@@ -1321,7 +1319,7 @@
                        "HInterID": linterid
                    },
                    success: function (d) {
                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data; 
                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
                        $("#HCREATEORGID").val(d.data[0].HCREATEORGID).attr("disabled", true);
                        //$("#HCREATEORGID").val(d.data[0].创建组织);
                        $("#HUSEORGID").val(d.data[0].HUSEORGID).attr("disabled", true);
@@ -1359,11 +1357,12 @@
                        $('#HMaterClass').find("option[value='" + d.data[0].供货材料类别 + "']").attr("selected", true);
                        $('#HSupTypeID').val(d.data[0].HSupTypeID);
                        $('#HSupClsName').val(d.data[0].供应商分类);
                        $('#HMakeDate').val(d.data[0].制单时间);
                        $('#HCheckMan').val(d.data[0].审核人);
                        $('#HCheckDate').val(d.data[0].审核时间);
                        $("#HMaker").val(d.data[0].制单人)
                        $('#HMakeDate').val(layui.util.toDateString(d.data[0].制单日期, 'yyyy-MM-dd'));
                        $('#HChecker').val(d.data[0].审核人);
                        $('#HCheckDate').val(layui.util.toDateString(d.data[0].审核时间, 'yyyy-MM-dd'));
                        $('#HStopMan').val(d.data[0].禁用人);
                        $('#HStopDate').val(d.data[0].禁用时间);
                        $('#HStopDate').val(layui.util.toDateString(d.data[0].禁用时间, 'yyyy-MM-dd'));
                        form.render('select');
                        layui.form.render();//实时渲染选中和不选中的样式,最好添加这句话

@@ -1381,7 +1380,7 @@
                        }

                        // åœ¨å¤åˆ¶çš„状态下，获取到源单信息后将原单IDç½®0
                        if(OperationType == 6){
                        if (OperationType == 6) {
                            $("#HInterID").val(0);
                        }


 WebTM/views/»ù´¡×ÊÁÏ/ÏúÊÛ»ù´¡×ÊÁÏ/Gy_Customer.html

@@ -1111,7 +1111,7 @@
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -108,6 +108,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-logout"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_TuiBill" id="set_TuiBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_TuiBill_ProcExch" id="set_TuiBill_ProcExch"><i class="layui-icon layui-icon-form"></i>下推(工序流传卡)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display: none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                            </div>
@@ -175,6 +176,8 @@
                    break;
                //下推
                case 'set_TuiBill': set_TuiBill();
                    break;
                case 'set_TuiBill_ProcExch': set_TuiBill_ProcExch();
                    break;
                //列设置
                case 'set_HideColumn':
@@ -616,6 +619,29 @@
            }
        }

        // å·¥åºæµè½¬å¡ ä¸‹æŽ¨
        function set_TuiBill_ProcExch() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (data.length === 1) {
                var linterid = data[0].源单主内码.toString();
                var HEntryID = data[0].源单子内码.toString();
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '工序流转卡-新增'
                    , shift: 0
                    , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill_Exchange.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=5016'
                    , end: function () {
                        location.reload()
                    }
                })
            } else {
                layer.msg("请选择一条生产日计划下推!");
            }

        }

        //隐藏列设置
        function get_HideColumn() {
            var colName = "";

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList1.html

File was deleted

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_Exchange.html

@@ -1048,7 +1048,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    type: "GET",
                    data: { "HBillType": '3772' },
                    data: { "HBillType": '5016' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
@@ -1087,7 +1087,7 @@
                            $.ajax({
                                url: GetWEBURL() + "/Web/GetMAXNumPDA",
                                type: "GET",
                                data: { "HBillType": '3772' },
                                data: { "HBillType": '5016' },
                                success: function (d) {
                                    //console.log(d.data);
                                    $("#HInterID").val(d.data[0].HInterID);
@@ -1139,7 +1139,7 @@
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3772' },
                    data: { "HBillType": '5016' },
                    success: function (d) {
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
@@ -1162,7 +1162,7 @@
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3772' },
                    data: { "HBillType": '5016' },
                    success: function (d) {
                        var HBillNo = d.data[0].HBillNo.replace('GXLX', 'ZYK0');
                        $("#HInterID").val(d.data[0].HInterID);
@@ -1414,7 +1414,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                                content: ['../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
@@ -1874,7 +1874,7 @@
                                    $.ajax({
                                        url: GetWEBURL() + "/Web/GetMAXNumPDA",
                                        type: "GET",
                                        data: { "HBillType": '3772' },
                                        data: { "HBillType": '5016' },
                                        success: function (d) {
                                            //console.log(d.data);
                                            $("#HInterID").val(d.data[0].HInterID);