1
llj
2026-02-28 5403141e073965360a9836b890f552a2be396867
1
2个文件已添加
10个文件已修改
1035 ■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/成本基础资料/CB_Wip_excelImport.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html 195 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/成本管理/期初在产品表/Gy_WIPBal_Excel.html 275 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/成本管理/期初在产品表/Kf_WIPBal.html 463 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/成本管理/费用单引入/CB_CostAccounting.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/成本管理/费用单引入/CB_ItemMoneyBill_Excel.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -665,6 +665,8 @@
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\成本管理\期初在产品表\Gy_WIPBal_Excel.html" />
    <Content Include="views\成本管理\期初在产品表\Kf_WIPBal.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostAccounting.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
   /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/
     var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_PDA.html
@@ -100,6 +100,7 @@
                                                    <option value="3721">生产备料单</option>
                                                    <option value="1214">生产发料通知单</option>
                                                    <option value="3710">生产订单</option>
                                                    <option value="1256">生产领料申请单</option>
                                                    <option value="-1">手工录入</option>
                                                </select>
                                            </div>
@@ -694,6 +695,14 @@
                            $("#HMainSourceBillType").empty();
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产订单' + "</option>";
                            $("#HMainSourceBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HMainSourceBillType").attr("disabled", "disabled");
                        }
                        else if (d.data[0].HSourceBillType == "1256") {
                            $("#HMainSourceBillType").empty();
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产领料申请单' + "</option>";
                            $("#HMainSourceBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HMainSourceBillType").attr("disabled", "disabled");
@@ -1388,6 +1397,9 @@
                else if (HSourceBillType == '3710') {
                    HSourceTitle = "生产订单";
                }
                else if (HSourceBillType == '1256') {
                    HSourceTitle = "生产领料申请单";
                }
                layer.open({
                    type: 2
@@ -1706,6 +1718,14 @@
                                        layui.form.render('select');
                                        $("#HMainSourceBillType").attr("disabled", "disabled");
                                    }
                                    else if (result.data.hSourceBillTypeField == "1256") {
                                        $("#HMainSourceBillType").empty();
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '生产领料申请单' + "</option>";
                                        $("#HMainSourceBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HMainSourceBillType").attr("disabled", "disabled");
                                    }
                                    else {
                                        $("#HMainSourceBillType").empty();
                                        var optionHtml = '';
WebTM/views/»ù´¡×ÊÁÏ/³É±¾»ù´¡×ÊÁÏ/CB_Wip_excelImport.html
@@ -191,6 +191,7 @@
            if (monthSelect) {
                monthSelect.value = currentMonth;
            }
            form.render('select');
        }
        //#endregion
WebTM/views/³É±¾¹ÜÀí/³É±¾·ÑÓõ¥/CB_ItemMoneyBillEdit.html
@@ -264,14 +264,15 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
                , element = layui.element
                , laydate = layui.laydate;
            //模块名
            var HModName = "CB_ItemMoneyBillEdit";
@@ -314,6 +315,8 @@
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
@@ -363,18 +366,6 @@
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow =
                {
                    "HBeginAddr": "0"
                    , "HBeginAddrName": ""
                    , "HEndAddr": "0"
                    , "HEndAddrName": ""
                    , "HTransType": ""
                    , "HMoney": "0"
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        // èŽ·å–å½“å‰æ—¥æœŸ
@@ -406,9 +397,6 @@
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
                        // é‡æ–°ç»‘定日期选择器事件
                        bindDatePickers();
                        layer.msg('增加一行成功!');
                        break;
@@ -447,6 +435,22 @@
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
                var data = obj.data;  //获取当前行的数据                //将obj.data å­—符串类型 èµ‹å€¼ç»™data
                if (obj.event == 'HDate') {    //判断接受到的数据字段  id是否为 Hdata
                    var field = $(this).data('field');//获取日期字段
                    laydate.render({
                        elem: this.firstChild        //将日期选择器绑定到触发事件的元素的第一个子元素
                        , show: true                //直接显示       æ—¥æœŸé€‰æ‹©å™¨ï¼Œè€Œä¸æ˜¯ç­‰å¾…用户点击
                        , closeStop: this           // åˆ¤æ–­ç‚¹å‡»æ—¥æœŸé€‰æ‹©å™¨å¤–部时是否关闭
                        , done: function (nowDate) {    //当日期选择完成时执行的回调函数
                            //时间选择完成,行数据更新
                            data[field] = nowDate;  //data对象中的日期字段
                            obj.update(data);  //更新回调数据
                            //刷新复选框
                            //checkRefresh();
                        }
                    });
                }
            });
@@ -731,36 +735,6 @@
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
            // ç»‘定日期选择器事件
            function bindDatePickers() {
                // ç§»é™¤æ—§çš„事件绑定
                $(document).off('change', '#mainTable .date-picker');
                // ç»‘定新的事件
                $(document).on('change', '#mainTable .date-picker', function () {
                    var selectedDate = $(this).val();
                    var tr = $(this).closest('tr');
                    var index = tr.attr('data-index');
                    // èŽ·å–è¡¨æ ¼æ•°æ®
                    var tableData = table.cache.mainTable;
                    if (tableData && tableData[index]) {
                        // æ›´æ–°æ•°æ®
                        tableData[index].HDate = selectedDate;
                        // å¯é€‰ï¼šå¦‚果需要立即更新显示
                        $(this).val(selectedDate);
                        console.log('第' + (parseInt(index) + 1) + '行日期更新为:', selectedDate);
                    }
                });
            }
            // åœ¨é¡µé¢åŠ è½½åŽåˆå§‹åŒ–ç»‘å®š
            setTimeout(function () {
                bindDatePickers();
            }, 300);
            //#region èŽ·å–å‚æ•°
            function getUrlVars() {
                var vars = [], hash;
@@ -870,17 +844,7 @@
                        , { field: 'HWaster', title: '损耗', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { field: 'HQty', title: '数量', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { field: 'HPrice', title: '单价', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , {
                            field: 'HDate',
                            title: '日期',
                            width: 160,
                            edit: false,  // ç¦ç”¨layui的编辑,使用我们自己的
                            templet: function (d) {
                                // ä½¿ç”¨HTML5的date输入框
                                var dateValue = d.HDate || new Date().toISOString().split('T')[0];
                                return '<input type="date" class="layui-input date-picker" value="' + dateValue + '" style="height: 28px; padding: 0 5px; width: 100%; border: none; background: transparent;">';
                            }
                        }
                        , {field: 'HDate',title: '日期',width: 160,event: 'HDate'}
                        , { field: 'HBeginBalance', title: '开始数值', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { field: 'HEndBalance', title: '结束数值', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { field: 'HTimes', title: '时间周期', edit: 'text', style: 'background-color: #f9f9f9;' }
@@ -899,13 +863,13 @@
                    , "HProcName": ""
                    , "HProcID": "0"
                    , "HMoney": "0"
                    , "HWaster": ""
                    , "HWaster": "0"
                    , "HQty": "0"
                    , "HPrice": "0"
                    , "HDate": ""
                    , "HDate": Format(new Date(), "yyyy-MM-dd")
                    , "HBeginBalance": "0"
                    , "HEndBalance": "0"
                    , "HTimes": ""
                    , "HTimes": "0"
                }];
                option.data = rowdata;
@@ -1155,106 +1119,7 @@
            function setInit_PushBill() {
                //生成单据号和内码
                createBillNo();
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 400
                    , limit: 100
                    , cols: [[
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', field: '序号', title: '序号', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBeginAddr', title: '始发地ID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HBeginAddrName', title: '始发地', edit: 'text', event: "HAreaList", style: 'background-color: #f9f9f9;' }
                        , { field: 'HEndAddr', title: '目的地ID', hide: true, style: 'background-color: #f9f9f9;' }
                        , { field: 'HEndAddrName', title: '目的地', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
                        , { field: 'HTransType', title: '运输方式', templet: '#HTransType' }
                        , { field: 'HMoney', title: '运输费用', edit: 'text', style: 'background-color: #f9f9f9;' }
                        /*                        , { field: 'HTaxRate', title: '税率',  edit: 'text', style: 'background-color: #f9f9f9;' }*/
                        , { field: 'HRemark', title: '表体备注', edit: 'text', style: 'background-color: #f9f9f9;' }
                        , { fixed: 'right', field: '操作', title: '操作', toolbar: '#barDemo' }
                    ]]
                }
                //初始化日期、制单人、制单日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HReceiveDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                $("#HDeptID").val(sessionStorage["HDeptID"]);
                $("#HDeptName").val(sessionStorage["HDept"]);
                $("#HDeptName").val(sessionStorage["HDept"]);
                $("#HEmpID").val(sessionStorage["HEmpID"]);
                $("#HEmpName").val(sessionStorage["HEmpName"]);
                //设置源单类型
                //$("#HSourceBillType").val(HSourceBillType);
                //var temp = $("#HSourceBillType").val();
                //禁用组织选项
                $("#HOrgID").attr("disabled", true);
                //$("#HSourceBillType").val() == "3321"
                if (true) {
                    //获取 getUrlVars
                    var data = getUrlVars_JSON().data;
                    var dataArray = [];
                    for (var i = 0; i < data.length; i++) {
                        var temp = getPushSource_ICMOBillInit(data[i].HInterID, data[i].HEntryID);
                        if (temp != "none") {
                            dataArray.push(temp);
                            dataID = dataID + "," + data[i].HInterID;
                        } else {
                            layer.alert("目标承运商和运单承运商不同!", {
                                icon: 5,
                                btn: ['确定']
                            }, function () {
                                // å…³é—­å½“前弹窗
                                var index = parent.layer.getFrameIndex(window.name);
                                parent.layer.close(index);
                                parent.$("#btnSearch").trigger('click');
                            });
                            return;
                        }
                    }
                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                        "HMainSourceInterID": "0"
                        , "HMainSourceEntryID": "0"
                        , "HMainSourceBillNo": ""
                        , "HMainSourceBillType": $("#BillType").val()
                        , "HCarrierID": dataArray[0].承运商ID
                        , "HCarrierName": dataArray[0].承运商名称
                        , "HCurID": dataArray[0].币别
                        , "HCurName": dataArray[0].币别名称
                        // , "HExRate": dataArray[0].汇率
                    });
                    //子表  èµ‹å€¼
                    var rowdata = [];
                    for (var i = 0; i < dataArray.length; i++) {
                        rowdata.push(
                            {
                                'HBeginAddr': dataArray[i].始发地
                                , 'HBeginAddrName': dataArray[i].始发地名称 ?? ""
                                , 'HEndAddr': dataArray[i].目的地
                                , 'HEndAddrName': dataArray[i].目的地名称 ?? ""
                                , "HTransType": dataArray[i].运输方式 ?? ""
                                , "HMoney": dataArray[i].运输费用 ?? ""
                            }
                        );
                    }
                    option.data = rowdata;
                    table.render(option);
                }
                else {
                    return layer.msg('当前不支持该源单下推!!');
                }
            }
            //#endregion
@@ -1673,14 +1538,6 @@
                });
            }
        }
        setTimeout(function () {
            // é‡æ–°ç»‘定行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });
        }, 300);
WebTM/views/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Gy_WIPBal_Excel.html
New file
@@ -0,0 +1,275 @@
<!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>
</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; ">
                            <div class="layui-inline" style="margin-left: 20px;">
                                <label class="layui-form-label">年月</label>
                                <div class="layui-input-inline">
                                    <input type="text" class="layui-input" id="ID-laydate-type-month" placeholder="选择年月" readonly>
                                </div>
                            </div>
                        <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();
        laydate.render({
            elem: '#ID-laydate-type-month',
            type: 'month',
            format: 'yyyy-MM',
            value: new Date(),
            done: function (value, date) {
                if (!option.data || option.data.length === 0) {
                    layer.msg('请先导入数据!', { icon: 0 });
                    return;
                }
                var parts = value.split('-');
                for (var i = 0; i < option.data.length; i++) {
                    option.data[i]['å¹´'] = parts[0];
                    option.data[i]['月'] = parts[1];
                }
                table.render(option);
                layer.msg('年月已更新为:' + value, { icon: 1, time: 1500 });
            }
        });
        //#endregion
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/Kf_WIPBal/Kf_WIPBal_Excel',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            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 });
            }
        });
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
        });
        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
            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: 'HWorkShopID', title: 'HWorkShopID', width: 120, hide: true }
                    , { field: '车间代码', title: '车间代码', width: 120 }
                    , { field: '车间名称', title: '车间名称', width: 120 }
                    , { field: 'HCostObjID', title: 'HCostObjID', width: 120, hide: true }
                    , { field: '成本对象代码', title: '成本对象代码', width: 120 }
                    , { field: '成本对象名称', title: '成本对象名称', width: 120 }
                    , { field: 'HOrgID', title: 'HOrgID', width: 120,hide:true }
                    , { field: '组织代码', title: '组织代码', width: 120}
                    , { field: '组织名称', title: '组织名称', width: 120 }
                    , { field: 'HCostItemID', title: 'HCostItemID', width: 120, hide: true }
                    , { field: '成本项目代码', title: '成本项目代码', width: 120 }
                    , { field: '成本项目名称', title: '成本项目名称', width: 120 }
                    , { field: 'HMaterID', title: 'HMaterID', width: 120, hide: true }
                    , { field: '物料代码', title: '物料代码', width: 120 }
                    , { field: '物料名称', title: '物料名称', width: 120 }
                    , { field: 'HProcID', title: 'HProcID', width: 120, hide: true }
                    , { field: '工序代码', title: '工序代码', width: 120 }
                    , { field: '工序名称', title: '工序名称', width: 120 }
                    , { field: '期初金额', title: '期初金额', width: 120}
                    , { field: '期初数量', title: '期初数量', width: 120}
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };
            //渲染页面
            table.render(option);
            //DisPlay_HideColumn();
        }
        //行内删除
        function set_GridDelete(obj) {
            var data = obj.data;
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗?', function (index) {
                    console.log("索引为:" + rowIndex);
                    if (rowIndex === '0') {
                        layer.msg('首行无法删除!!!');
                    } else {
                        var oldData = option.data;
                        oldData.splice(obj.tr.data('index'), 1)
                        option.data = oldData;//将数据绑定到data上
                        table.render(option);
                        layer.close(index);
                    }
                });
            }
        }
        //导入(保存)
        function set_AddNew(data) {
            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    num.push(option.data[i])
                }
            }
            var sSubStr = JSON.stringify(num);
            var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"];
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Kf_WIPBal/Kf_WIPBal_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/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Kf_WIPBal.html
New file
@@ -0,0 +1,463 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <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, maximum-scale=1">
    <!-- æ³¨æ„ï¼šæ‰€æœ‰å¼•用路径保持与原项目一致,确保功能完整 -->
    <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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body">
                    <form class="layui-form" action="" lay-filter="component-form-group" autocomplete="off">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!-- ç”Ÿäº§è½¦é—´ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptID" id="HDeptID" lay-verify="required" lay-search class="layui-input ForFilteringSchemes">
                                            <!-- åŠ¨æ€æ¸²æŸ“è½¦é—´ -->
                                        </select>
                                    </div>
                                </div>
                                <!-- ç‰©æ–™ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料</label>
                                    <div class="layui-input-inline">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="float:left;width:150px;">
                                        <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <!-- å¼€å§‹æ—¥æœŸ -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HBDate" id="HBDate" style="width:150px;">
                                    </div>
                                </div>
                                <!-- ç»“束日期 -->
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HEDate" id="HEDate" style="width:150px;">
                                    </div>
                                </div>
                                <!-- æŸ¥è¯¢æŒ‰é’® -->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <!-- é‡ç½®æŒ‰é’® -->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                            </div>
                        </div>
                    </form>
                    <div style="margin-top: 10px;">
                        <table class="" id="mainTable2" lay-filter="mainTable2"></table>
                        <!-- è¡¨æ ¼å¤´å·¥å…·æ  -->
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>导入</button>
                            </div>
                        </script>
                    </div>
                </div>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/'
        }).extend({
            index: 'lib/index',
        }).use(['index', 'form', 'table', 'element', 'laydate', 'soulTable', 'tableSelect'], function () {
            var $ = layui.$,
                admin = layui.admin,
                layer = layui.layer,
                table = layui.table,
                form = layui.form,
                element = layui.element,
                laydate = layui.laydate,
                soulTable = layui.soulTable,
                tableSelect = layui.tableSelect;
            // æ¨¡å—名(用于列设置存储)
            var HModName2 = "Pay_PaymentEntryReport2";
            // è¡¨æ ¼é€‰é¡¹
            var option2 = {
                elem: '#mainTable2',
                toolbar: '#toolbarDemo2',
                height: 'full-120',      // é€‚当留出底部空间
                page: true,
                cellMinWidth: 90,
                totalRow: true,
                limit: 500,
                limits: [50, 500, 5000, 20000],
                done: function (res, curr, count) {
                    soulTable.render(this);
                },
                cols: [[]]
            };
            // å…¨å±€æŸ¥è¯¢æ¡ä»¶å­—符串
            var sWhere = "";
            // ---------- åˆå§‹åŒ– ----------
            function initPage() {
                // æ¸²æŸ“车间下拉框
                loadDeptSelect();
                // è®¾ç½®é»˜è®¤æ—¥æœŸ: å¼€å§‹æ—¥æœŸä¸º7天前,结束日期为今天
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
                getFastQuery(2);
                // é‡æ–°æ¸²æŸ“表单元素(select等)
                form.render('select');
            }
            // èŽ·å–è½¦é—´ä¸‹æ‹‰
            function loadDeptSelect() {
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] || 1 }, // é»˜è®¤ç»„织1
                    success: function (result) {
                        var html = '<option value="0" style="color:red;" selected>全部车间</option>';
                        if (result.count == 1 && result.data) {
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                html += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                            }
                        }
                        $("#HDeptID").html(html);
                        form.render('select');
                    },
                    error: function () {
                        layer.alert('获取车间列表失败', { icon: 2 });
                    }
                });
            }
            // æŸ¥è¯¢å¹¶æ¸²æŸ“阶梯报表
            function getFastQuery(type) {
                var HBeginDate = $("#HBDate").val();
                var HEndDate = $("#HEDate").val();
                var HCostObjID = $("#HMaterID").val() || '0';
                var HWorkShopID = $("#HDeptID").val() || '0';
                var spParams = "'" + HBeginDate + "','" + HEndDate + "','" + HWorkShopID + "','" + HCostObjID+ "'";
                sWhere = spParams; // ç”¨äºŽå†…部
                if (type == 2) {
                    get_Display(spParams);
                }
            }
            // åŠ è½½é˜¶æ¢¯è®¡ä»¶æ•°æ®
            function get_Display(params) {
                var loadIndex = layer.load(1, { shade: false });
                var sql = "exec h_p_Kf_WIPBalReport" + params;
                $.ajax({
                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                    type: "GET",
                    data: { "sWhere": sql },
                    success: function (data1) {
                        layer.close(loadIndex);
                        if (data1.count == 1) {
                            // è§£æžåˆ—定义
                            var colDefs = []; // å­˜æ”¾ {id, name, Type}
                            if (data1.list && data1.list.length > 0) {
                                for (var k in data1.list) {
                                    colDefs.push({
                                        id: data1.list[k].ColmCols,
                                        name: data1.list[k].ColmCols,
                                        Type: data1.list[k].ColmType
                                    });
                                }
                            }
                            // æž„建表格列
                            var cols = [];
                            // å¤šé€‰æ¡†åˆ—
                            cols.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            // è¾…助判断日期字段(形如"2025-02-20"),原代码用isValidDate但未定义,简单按字段名是否含横线判断,实际根据业务调整
                            for (var i = 0; i < colDefs.length; i++) {
                                var fieldName = colDefs[i].name;
                                var fieldId = colDefs[i].id;
                                var fieldType = colDefs[i].Type;
                                // é’ˆå¯¹é˜¶æ¢¯æŠ¥è¡¨ï¼Œæœ‰äº›åˆ—可能是动态日期(例如“02-20”),原代码用isValidDate判断,我们简单模拟:如果字段名包含 '-' ä¸”长度<=10 è§†ä¸ºæ—¥æœŸçŸ­åˆ—
                                var isShortDate = (fieldName.indexOf('-') > 0 && fieldName.length <= 10);
                                if (isShortDate) {
                                    // æ˜¾ç¤ºæˆ MM-dd æ ¼å¼ï¼ŒåŽŸä»£ç å°è¯•Format但未定义,此处直接显示原字段名
                                    cols.push({
                                        field: fieldId,
                                        title: fieldName,  // åŽŸä»£ç : Format(fieldName,'MM-dd') ä½†Format函数可能未引入,保持原样
                                        width: 70,
                                        totalRow: true,
                                        filter: true,
                                        align: 'center'
                                    });
                                } else if (fieldType == 'DateTime') {
                                    cols.push({
                                        field: fieldId,
                                        title: fieldName,
                                        align: 'center',
                                        sort: true,
                                        filter: true,
                                        templet: "<div>{{ d." + fieldId + " == '' ? '' : layui.util.toDateString(d." + fieldId + ", 'yyyy-MM-dd HH:mm:ss') }}</div>",
                                        width: 180
                                    });
                                } else {
                                    cols.push({
                                        field: fieldId,
                                        title: fieldName,
                                        align: 'center',
                                        sort: true,
                                        width: 150,
                                        filter: true
                                    });
                                }
                            }
                            // æ›´æ–°è¡¨æ ¼é…ç½®
                            option2.cols = [cols];
                            option2.data = data1.data || [];
                            // åº”用列隐藏设置(如果存在)
                            DisPlay_HideColumn(HModName2, sessionStorage["HUserName"] || 'admin', option2, []);
                            // æ¸²æŸ“表格
                            table.render(option2);
                        } else {
                            layer.alert(data1.code + ' ' + data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(loadIndex);
                        layer.alert("接口请求失败", { icon: 5 });
                    }
                });
            }
            // é‡ç½®è¿‡æ»¤æ¡ä»¶
            function clearQuery() {
                $("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDeptID").val(0);
                $("#HEmpID").val(0);
                $("#HEmpName").val("");
                $("#HGroupID").val(0);
                $("#HGroupName").val("");
                $("#HMaterID").val("0");
                $("#HMaterName").val("");
                form.render('select');
            }
            // ---------- äº‹ä»¶ç»‘定 ----------
            // æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function () {
                getFastQuery(2);
                return false;
            });
            // é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function () {
                clearQuery();
                getFastQuery(2);
                return false;
            });
            // ç­ç»„弹出框(保留原有弹窗方式,与tableSelect共存,优先使用tableSelect;同时支持弹窗选择)
            form.on('submit(HGroupList)', function () {
                openGroupDialog();
                return false;
            });
            // èŒå‘˜å¼¹å‡ºæ¡†
            form.on('submit(HMaterList)', function () {
                openHMaterDialog();
                return false;
            });
            // æ‰“开班组弹窗(原函数 get_checkGroup)
            function openGroupDialog() {
                layer.open({
                    type: 2,
                    skin: "layui-layer-rim",
                    title: "班组列表",
                    closeBtn: 1,
                    shift: 2,
                    area: ["90%", "90%"],
                    maxmin: true,
                    content: ['../../基础资料/工资基础资料/Gy_Group.html?Type=HGroup', 'yes'],
                    btn: ["确定", "取消"],
                    btn1: function (index, laero) {
                        var iframeWindow = window["layui-layer-iframe" + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");
                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(index);
                    }
                });
            }
            // æ‰“开职员弹窗 (原 get_checkEmp)
            function openHMaterDialog() {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim',
                    title: '职',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_Material.html?Type=HMaterList', 'yes'],
                    btn: ['确定', '取消'],
                    btn1: function (index, layero) {
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        layer.close(index);
                    }
                });
            }
            // å¤´å·¥å…·æ äº‹ä»¶ (mainTable2)
            table.on('toolbar(mainTable2)', function (obj) {
                switch (obj.event) {
                    case 'set_HideColumn2':
                        get_HideColumnNoPage(HModName2, sessionStorage["HUserName"] || 'admin', option2, function () { getFastQuery(2); });
                        break;
                    case 'btn-reload2':
                        getFastQuery(2);
                        break;
                    case 'get_export2':
                        exportExcel2();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    default:
                        break;
                }
            });
            // å¯¼å‡ºExcel (原 get_Export2)
            function exportExcel2() {
                var ModRightNameCheck = "Pay_PaymentEntryReportExcel";
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck",
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = option2.data || [];
                            // æ¸…洗数据
                            data.forEach(function (item) {
                                for (var key in item) {
                                    if (item[key] == null) item[key] = "";
                                    if (typeof item[key] === 'string') {
                                        item[key] = item[key].replace(/[\r\n]+/g, '').replace(/,/g, '');
                                    }
                                }
                            });
                            table.exportFile("mainTable2", data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '资料导入'
                    , shift: 0//弹出动画
                    , content: './Gy_WIPBal_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            // å…¨å±€è¾…助函数 Format (如果不存在,简单定义)
            if (typeof Format !== 'function') {
                window.Format = function (date, fmt) {
                    if (!date) return '';
                    var d = new Date(date);
                    var o = {
                        "M+": d.getMonth() + 1,
                        "d+": d.getDate(),
                        "H+": d.getHours(),
                        "m+": d.getMinutes(),
                        "s+": d.getSeconds()
                    };
                    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
                    for (var k in o)
                        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
                    return fmt;
                };
            }
            // å¯åŠ¨é¡µé¢
            initPage();
        });
        // ä¸‹é¢ä¸¤ä¸ªæ–¹æ³•供弹窗回调使用 (Gy_EmployeeList.html å’Œ Gy_Group.html ä¼šè°ƒç”¨)
        function GetHEmpListValue(obj) {
            $("#HEmpID").val(obj.HItemID);
            $("#HEmpName").val(obj.职员名称);
        }
        function GetHGroupValue(obj) {
            if (obj && obj.length > 0) {
                $("#HGroupName").val(obj[0].班组名称);
                $("#HGroupID").val(obj[0].HItemID);
            }
        }
    </script>
</body>
</html>
WebTM/views/³É±¾¹ÜÀí/·ÑÓõ¥ÒýÈë/CB_CostAccounting.html
@@ -273,7 +273,7 @@
                var Type = $("#HType").val();
                //欠料运算
                
                var sql = `exec h_p_CB_ItemMoneyBillImport ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
                var sql = `exec h_p_CB_CostAccounting ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
                var startTime = new Date().getTime();
                $.ajax({
                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
WebTM/views/³É±¾¹ÜÀí/·ÑÓõ¥ÒýÈë/CB_ItemMoneyBill_Excel.html
@@ -190,6 +190,7 @@
            if (monthSelect) {
                monthSelect.value = currentMonth;
            }
            form.render('select');
        }
        //#endregion
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMainList.html
@@ -192,6 +192,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-UpdateMaterTechParam" id="btn-UpdateMaterTechParam"><i class="layui-icon layui-icon-form"></i>更新分组物料</button>
                            </div>
                        </script>
                    </form>
@@ -297,6 +298,9 @@
                    case 'btn-DeDrop': set_DropBill(1);
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //更新相同物料组+模具的工艺参数
                    case 'btn-UpdateMaterTechParam': set_UpdateMaterTechParam();
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme();
@@ -1022,6 +1026,37 @@
            }
            //#endregion
            //更新同一物料组下 æ¨¡å…·ç›¸åŒçš„产品工艺参数清单
            function set_UpdateMaterTechParam() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HInterID.toString();
                    layer.confirm("确认要更新这个物料组相关的标准吗?", function (index) {
                        var wait = layer.load();
                        $.ajax({
                            url: GetWEBURL() + '/Gy_MaterialTechParamBill/SaveGy_MaterialTechParamBill_Update',
                            type: "GET",
                            data: { "HInterID": InterID,"user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery(1);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
            }
            //获取组织
            function Organ() {
                //获取登录页组织列
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_batchKeyElement.html
@@ -426,36 +426,17 @@
        });
        //换产品
        form.on('submit(btnNextProc)', function (data) {
            //for (var i = 0; i < option.data.length; i++) {
            //    if (option.data[i].HBindingQty < 1 || option.data[i].HBarCode == "") {
            //        layer.alert("第<span style='color: red;'>" + (i + 1) + "</span>行,配件 <span style='color: blue;'>" + option.data[i].HMaterName + "</span> æœªç»‘定齐整!")
            //        return;
            //    }
            //}
            //保存关键件
            if (AllowLoadData(data)) {
                set_SaveBill(data);
            }
            $("#HBarCode_SN").val("");
            $("#HBarCode_Key").val("");
            option.data = [];
            table.render(option);
            //启用输入框,背景色恢复
            $("#HBarCode_SN").prop("readonly", false);
            $("#HBarCode_SN").css('background', '#FFFFFF')//产品码文本框背景色恢复
            $("#HBarCode_SN").focus();
            //重新获取单据号
            //$.ajax({
            //    url: GetWEBURL() + "/Web/GetMAXNumPDA",
            //    type: "GET",
            //    data: { "HBillType": '3727' },
            //    success: function (d) {
            //        $("#HInterID").val(d.data[0].HInterID);
            //        $("#HBillNo").val(d.data[0].HBillNo);
            //        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));  //默认为当前日期
            //        //重新启用保存按钮
            //        $("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
            //    }
            //});
            //历史绑定记录查询
            //get_Display();
        });
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_generateSNCode.html
@@ -602,6 +602,10 @@
        function dy_PL(HBarCode) {
            var sWhere = "select Top 1 * from h_v_IF_BarCodeBillList with(nolock) where æ¡ç ç¼–号 = '" + HBarCode + "'"
            if ($("#HProcName").val() == "打印69码标签" ) {
                sWhere = "exec h_p_IF_BarCodeBillList_XWPrint '" + HBarCode + "'"
            }
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名