打印流转卡更新打印时间；凯贝另外添加excel导入日计划模块；添康排产添加同时获取护理床，椅架的订单进行排查；工作中心明细行异常修复

yusijie

2025-07-31 eaec591f9b3474aa13ca0491ff54c64715b86dbc

打印流转卡更新打印时间；凯贝另外添加excel导入日计划模块；添康排产添加同时获取护理床，椅架的订单进行排查；工作中心明细行异常修复

 WebTM/WebTM.csproj

@@ -638,6 +638,7 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanForm.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanImport.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />

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

@@ -610,9 +610,9 @@
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
                        , { field: 'HCenterID', title: 'HCenterID', width: 100, hide: true }
                        , { field: 'HCenterName', title: '工作中心名称', width: 100, edit: 'text' }
                        , { field: 'HCenterName', title: '工作中心名称', width: 400, edit: 'text' }
                        , { field: 'HSourceID', title: 'HSourceID', width: 100, hide: true }
                        , { field: 'HSourceName', title: '生产资源名称', event: "HSourceNameSelect", width: 100, edit: 'text' }
                        , { field: 'HSourceName', title: '生产资源名称', event: "HSourceNameSelect", width: 400, edit: 'text' }
                        , { title: '操作', toolbar: '#barDemo', width: 70 }
                    ]]
                }
@@ -829,8 +829,8 @@
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                    if (checkStatus.length === 1) {
                                        let data = checkStatus[0]
                                    if (checkStatus.data.length === 1) {
                                        let data = checkStatus.data[0]
                                        obj.update({
                                            HSourceID: data["HItemID"],
                                            HSourceName: data["生产资源名称"]

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

@@ -14,7 +14,11 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.销售订单号,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求,a.辅数量2,a.HAuxUnit2,a.辅助单位2,b.出站关联数量 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","select 1");

            //20250731调整，查询打印数据时，更新打印日期到流转卡主表
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.销售订单号,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,case when ISNULL(a.生产规格,'')='' then a.产品规格 else a.生产规格 end äº§å“è§„æ ¼,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,case when ISNULL(a.生产幅宽,0)=0 then a.幅宽 else a.生产幅宽 end å¹…宽,case when ISNULL(a.生产克重,0) = 0 then a.克重 else a.生产克重 end å…‹é‡,a.白坯要求,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求,a.辅数量2,a.HAuxUnit2,a.辅助单位2,b.出站关联数量 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.流水号 as int)","update Sc_ProcessExchangeBillMain set HPrintDate = getdate() where HInterID in ("+Request.Params["linterid"] + ") and HPrintDate is null");

           
        }
    </script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/¿­±´Èռƻ®µ¼Èë/JIT_DayPlanPlatForm_KB.html

New file
@@ -0,0 +1,489 @@
<!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; ">
                        <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 class="layui-row">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">单据日期</label>
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 75px;">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">订单类型</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                                <select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
                                                    <option value="生产订单">生产订单</option>
                                                    <option value="委外订单">委外订单</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <div class="layui-input-block" style="margin-left: 120px;">
                                                    <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>

                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>批量填充</button>
                        </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(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {

        //#region å…¬å…±å˜é‡

        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , laydate = layui.laydate
            , excel = layui.excel
            , upload = layui.upload
            , element = layui.element;

        var option = [];
        //#endregion

        //#region è¿›å…¥é¡µé¢å³åŠ è½½

        var params = getUrlVars();
        var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  æ·»åŠ  ä¿å­˜

        //初始化界面
        set_ClearBill();

        //#endregion

        //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
            set_GridCellCheck(obj);//行内快捷键筛选
        });

        //文件上传
        upload.render({
            elem: '#UpLoad',
            url: GetWEBURL() + '/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_KB',
            contentType: 'application/json',
            exts: 'xls|xlsx', //允许上传的类型
            before: function (data) {
                layer.load();
            },
            done: function (data1) {
                layer.closeAll('loading');
                if (data1.count == 1) {
                    var HVersion_Import_Temp = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                    for (var i = 0; i < data1.data.length; i++) {
                        data1.data[i].HVersion_Import = HVersion_Import_Temp;
                    }

                    option.data = data1.data;
                    table.render(option);
                } else {
                    layer.alert(data1.code + data1.Message, { icon: 5 });
                }
            },
            error: function (err) {
                debugger
                layer.closeAll('loading');
                layer.alert('导入出现异常', { icon: 2 });
            }
        });

        //退出
        form.on('submit(Cancel)', function () {
            if (OperationType == 1) {
                Pub_Close(1);
            }
            else {
                Pub_Close(2);
            }
        })

        //导入  ä¿å­˜æ•°æ®
        form.on('submit(btnSave)', function (data) {
            if (table.cache["mainTable"] != null) {
                set_AddNew(data);
            }
            else {
                layer.msg("无数据,请先导入数据!");
            }
        })


        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        //#region åˆå§‹åŒ–界面
        function set_ClearBill() {
            //初始化时间
            $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
            //初始化表格
            set_InitGrid();
        }

        //#endregion

        //初始化表格
        function set_InitGrid() {
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
            var MM = myDate.getMonth() + 1;
            var dd = myDate.getDate();
            var SumMonth = 31; //动态两月之差 new Date(yyyy, MM, 0).getDate()
            var columns = [];
            var HBEGINDATE = new Date(new Date($("#HDate").val())).getDate(); //获取开始日期天数

            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ field: 'hmainid', title: 'hmainid', width: 200, hide: true });
            columns.push({ field: '单据号', title: '单据号', width: 200 });
            columns.push({ field: '生产订单号*', title: '生产订单号', width: 150 });
            columns.push({ field: '生产订单明细行号*', title: '生产订单明细行号', width: 200 });
            columns.push({ field: '组织编码*', title: '组织编码', width: 150 });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: '生产车间编码*', title: '生产车间', width: 150 });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: '生产资源编码*', title: '生产资源', edit: 'text', event: "HSourceID" });
            columns.push({ field: '产能', title: '产能', edit: 'text' });
            columns.push({ field: '优先级', title: '优先级' });
            columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
            columns.push({ field: '员工', title: '员工', width: 150 });
            columns.push({ field: '员工编码', title: '员工编码', width: 150 });
            columns.push({ field: 'HMaterID', title: '物料ID', hide: true });
            columns.push({ field: '物料编码*', title: '物料编码', width: 150 });
            columns.push({ field: '物料名称', title: '物料名称', width: 200 });
            columns.push({ field: '规格型号', title: '规格型号', width: 150 });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: '计量单位', title: '计量单位', width: 150 });
            columns.push({ field: '批次号', title: '批次', width: 150 });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width: 200 });
            columns.push({ field: '生产订单数量', title: '生产订单数量', width: 200 });
            columns.push({ field: '总齐套数量', title: '总齐套数量', width: 200 });
            columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true });
            columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
            columns.push({ field: 'HVersion_Import', title: '导入序列号' });

            var k = 0;//收集循环次数
            var Days = 7;
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
                    MM = 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    HBEGINDATE = 0;
                    k += j;
                    j = 0;
                } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åŠ ä¸€  å¤©æ•°ä»Žä¸€å¼€å§‹
                    HBEGINDATE = 0;
                    MM += 1;
                    SumMonth = new Date(yyyy, MM, 0).getDate();
                    k += j;
                    j = 0;
                }
            }

            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });

            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , height: 'full-190'
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [columns]
            };

            //渲染页面
            table.render(option);
        }

        //导入(保存)
        function set_AddNew(data) {
            var msgError = "";

            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;

                    if (table.cache["mainTable"][i].物料名称.indexOf("\"") != -1 || table.cache["mainTable"][i].物料名称.indexOf(";") != -1) {
                        table.cache["mainTable"][i].物料名称 = table.cache["mainTable"][i].物料名称.replaceAll("\"", "”").replaceAll(";", "；")
                    }
                    if (table.cache["mainTable"][i].规格型号.indexOf("\"") != -1 || table.cache["mainTable"][i].规格型号.indexOf(";") != -1) {
                        table.cache["mainTable"][i].规格型号 = table.cache["mainTable"][i].规格型号.replaceAll("\"", "”").replaceAll(";", "；")
                    }

                    num.push(table.cache["mainTable"][i])
                }
            }

            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i].物料名称.indexOf("\"") != -1 || option.data[i].物料名称.indexOf(";") != -1) {
                    option.data[i].物料名称 = option.data[i].物料名称.replaceAll("\"", "”").replaceAll(";", "；")
                }
                if (option.data[i].规格型号.indexOf("\"") != -1 || option.data[i].规格型号.indexOf(";") != -1) {
                    option.data[i].规格型号 = option.data[i].规格型号.replaceAll("\"", "”").replaceAll(";", "；")
                }
            }

            //判断是否有导入权限，如果有则将总装车间之前的日计划工单作废
            if (!set_ModCheck("Sc_WorkBillSortBill_Edit")) {
                layer.msg("导入失败！无导入权限！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return;
            } else {
                if (!setWorkBillSortBillForDelete()) {
                    layer.msg("导入失败！往期日计划作废失败！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
            }


            var HDataSub = [];

            //JIT导入计划，每次导入100行数据,可修改i的自增值决定每次循环导入的行数
            for (var i = 0; i < option.data.length; i += 100) {
                HDataSub = option.data.slice(i, i + 100)

                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(HDataSub);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
                var index = layer.load();

                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_KB",
                    async: false,
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(index);
                            /* layer.msg("提交成功");*/
                        }
                        else {
                            layer.close(index);
                            msgError += data.Message + "；";
                            //layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        msgError += err + "；";
                        //layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
            }

            if (msgError.length == 0) {
                layer.msg("提交成功");
            } else {
                layer.msg(msgError, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            }
        }

        //行内删除
        function set_GridDelete(obj) {
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗？', function (index) {
                    obj.del();
                    table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    table.reload(option);
                    layer.close(index);
                });
            }
        }

        //行内删除快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //生产资源
                    if (obj.event == "HSourceID") {
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "生产资源列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/生产基础资料/Gy_Source.html", "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("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HSourceID": checkStatus.data[0].HItemID
                                    , "生产资源编码*": checkStatus.data[0].生产资源代码
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    obj.event = "";
                    return false;
                }

            })
        }

        //获取参数
        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;
        }

        //#region æƒé™åˆ¤å®š
        function set_ModCheck(ModRightNameCheck) {
            var Permission = false;
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                async: false,
                data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                success: function (result) {
                    if (result.count == 1) {
                        Permission = true;
                    } else {
                        //layer.alert("当前模块没有查询权限!", { icon: 5 });
                    }
                }, error: function (e) {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
            return Permission;
        }
        //#endregion

        //#region ä½œåºŸå¯¹åº”生产车间的日计划工单
        function setWorkBillSortBillForDelete() {
            //拼接生产车间的ID
            var HWorkShopIDArrayList = [];
            for (var i = 0; i < option.data.length; i++) {
                option.data[i]["单据号"] = "";
                option.data[i]["hmainid"] = "";


                if ($.inArray(option.data[i]["HWorkShopID"], HWorkShopIDArrayList) == -1) {
                    HWorkShopIDArrayList.push(option.data[i]["HWorkShopID"]);
                }
            }
            var HWorkShopIDListStr = "";
            for (var i = 0; i < HWorkShopIDArrayList.length; i++) {
                if (i == HWorkShopIDArrayList.length - 1) {
                    HWorkShopIDListStr = HWorkShopIDArrayList[i];
                } else {
                    HWorkShopIDListStr = HWorkShopIDArrayList[i] + ",";
                }
            }

            //作废对应生产车间ID的日计划工单
            var resultBool = false;
            var sql = "";
            if (HWorkShopIDListStr != "") {
                sql = "update Sc_WorkBillSortBillMain set HDeleteMan = '" + sessionStorage["HUserName"] + "',HDeleteDate = getdate(),HBillStatus = 4 where HWorkShopID in (" + HWorkShopIDListStr + ")";
            } else {
                return resultBool;
            }
            var ModRightNameCheck = "";
            $.ajax({
                url: GetWEBURL() + '/CommonModel/commonMethod',
                type: "GET",
                async: false,
                data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
                success: function (data1) {
                    if (data1.count == 1) {
                        resultBool = true;
                    } else {
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function (e) {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });

            return resultBool;
        }
        //#endregion

        //#endregion

    });

</script>

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -251,7 +251,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">备注:</label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入详细内容" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
                                                            <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark" style="width:1080px;"></textarea>
                                                        </div>
                                                    </div>
                                                </div>

 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_DayPlanPlatForm_TK2.html

@@ -28,6 +28,7 @@
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">要料运算</button>-->
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">提料运算</button>-->
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">添加订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO_Batch" id="btnAddICMO_Batch">添加护理床-椅架订单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">组装排产</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">锁定工单</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">解锁工单</button>
@@ -69,8 +70,17 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">多车间排产</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMergeDept" id="HMergeDept" lay-verify="HMergeDept">
                                            <option value="否" selected="selected">否</option>
                                            <option value="是">是</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">排产天数</label>
                                    <div class="layui-input-block">
                                    <div class="layui-input-block" style="width: 120px;">
                                        <select name="HArrangeProductDayQty" id="HArrangeProductDayQty" class="ForFilteringSchemes" lay-filter="HArrangeProductDayQty" style="width:190px;">
                                        </select>
                                    </div>
@@ -632,6 +642,16 @@
            get_btnAddICMO();
        })

        //添加护理床-椅架生产订单
        form.on('submit(btnAddICMO_Batch)', function (data) {
            if ($("#HMergeDept").val() == "是") {
                get_btnAddICMO_Batch();
            } else {
                layer.alert("当前不为多车间排产模式");
            }
            
        })        

        //组装排产
        form.on('submit(btnProZZPC)', function (data) {
            var HWorkShopID = $("#HWorkShopID").val();//生产车间
@@ -793,11 +813,9 @@

            columns.push({ type: 'checkbox', fixed: 'left', sort: true });
            columns.push({ type: 'numbers', field: '序号', title: '序号', sort: true });
            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150, sort: true, filter: true });
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;', sort: true, filter: true });
            columns.push({ field: '锁定工单', title: '锁定工单', width: 150, sort: true, filter: true });//0
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '物料代码', title: '物料编码', width: 150, sort: true, filter: true });
            columns.push({ field: '物料名称', title: '物料名称', width: 150, sort: true, filter: true });
            columns.push({ field: '规格型号', title: '规格型号', width: 150, sort: true, filter: true });
@@ -808,8 +826,11 @@
            columns.push({ field: '昨日数量', title: '昨日数量', filter: true });
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text', sort: true });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID", filter: true });
            columns.push({ field: '使用工装', title: '使用工装', width: 150, hide: true });            
            columns.push({ field: '销售订单审核日期', title: '销售订单审核日期', width: 150, templet: "<div>{{d.销售订单审核日期 ==null ?'':layui.util.toDateString(d.销售订单审核日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '要货日期', title: '要货日期', width: 150, templet: "<div>{{d.要货日期 ==null ?'':layui.util.toDateString(d.要货日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });           
            columns.push({ field: '开工日期', title: '开工日期', width: 150, templet: "<div>{{d.开工日期 ==null ?'':layui.util.toDateString(d.开工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '完工日期', title: '完工日期', width: 150, templet: "<div>{{d.完工日期 ==null ?'':layui.util.toDateString(d.完工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '生产车间', title: '生产车间', width: 150 });
            
            columns.push({ field: '业务状态', title: '业务状态', width: 150, sort: true, hide: true });
            columns.push({ field: '产线入库数量', title: '产线入库数量', width: 150, sort: true, hide: true });
            columns.push({ field: '未排数量', title: '可排数量', width: 150, sort: true, hide: true });
@@ -820,6 +841,9 @@
                columns.push(dateColumns[i]);//0
            }

            columns.push({ field: '单据号', title: '单据号', hide: true, sort: true });
            columns.push({ field: '销售订单审核日期', title: '销售订单审核日期', width: 150, templet: "<div>{{d.销售订单审核日期 ==null ?'':layui.util.toDateString(d.销售订单审核日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '生产组织', title: '生产组织', width: 150, sort: true });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150, sort: true });
            columns.push({ field: '订单类型', title: '订单类型', width: 150, sort: true });
            columns.push({ field: '生产订单单据类型', title: '源单订单单据类型', width: 150, sort: true });
@@ -830,7 +854,7 @@
            columns.push({ field: '生产周期', title: '生产周期', width: 150, sort: true });
            columns.push({ field: '最迟开工日期', title: '最迟开工日期', width: 150, templet: "<div>{{d.最迟开工日期 =='' ?'':layui.util.toDateString(d.最迟开工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
            columns.push({ field: '生产车间', title: '生产车间', width: 150 });
           
            columns.push({ field: '源单主内码', title: '源单主内码', width: 150, sort: true });
            columns.push({ field: '源单子内码', title: '源单子内码', width: 150, sort: true });
            columns.push({ field: 'hmainid', title: '日计划工单主码', width: 150, sort: true });
@@ -859,6 +883,7 @@
            columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
            columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
            columns.push({ field: '所需工位数', title: '所需工位数', width: 150 });
            columns.push({ field: '使用工装', title: '使用工装', width: 150, hide: true });
            columns.push({ fixed: 'right', title: '操作', toolbar: '#barDemo' });
            option_columns = columns;
            option = {
@@ -933,6 +958,11 @@
            if (number == 1) {
                HProdORGID = sessionStorage["OrganizationID"];//生产订单组织
            }

            if (HWorkShopID == 102357 && $("#HMergeDept").val() == "是" ) {
                HWorkShopID = "102357,102359";
            }

            var HMastersDate = $("#HMastersDate").val();//排产日期
            var HSeOrderBillNo = $("#HSeOrderBillNo").val();//销售订单号
            var HMaterID = $("#HMaterID").val();//物料编码id
@@ -1113,6 +1143,52 @@
        }
        //#endregion

        
        //#region æ·»åŠ æŠ¤ç†åºŠ-椅架生产订单
        function get_btnAddICMO_Batch() {
            var HDeptID = "102357,102359" //102357=护理床 102359=椅架

            $.ajax({
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept',
                type: "GET",
                data: { "HDeptID": HDeptID },
                success: function (data1) {
                    if (data1.count == 1) {
                        //var dataPush = [];
                        //var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                        //buttonArr = [];//清空数组
                        //for (var i = 0; i < tableBak.length; i++) {
                        //    dataPush.push(tableBak[i]);  //将之前的数据存储
                        //}

                        //for (var i = 0; i < dataPush.length; i++) {
                        //    if (dataPush[i]["单据号"] == "") {
                        //        for (var j = 0; j < data1.data.length; j++) {
                        //            if (data1.data[j]["源单主内码"] == dataPush[i]["源单主内码"] && data1.data[j]["源单子内码"] == dataPush[i]["源单子内码"]) {
                        //                return layer.alert("生产明细行重复,重复的生产订单号:" + dataPush[i]["生产订单号"] + ",明细行号:" + dataPush[i]["生产订单明细行号"], { icon: 5 });

                        //            }
                        //        }
                        //    }
                        //}
                        ////存储数据
                        //for (var i = 0; i < data1.data.length; i++) {
                        //    dataPush.push(data1.data[i]);
                        //}
                        //option.data = dataPush;
                        //table.render(option);

                        get_FastQuery(1);
                    } else {
                        layer.alert(data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion

        //#region åˆå§‹åŒ–下拉列表 æŽ’产时间
        function setSelect_HArrangeProductDayQty() {

@@ -1122,8 +1198,8 @@
            var lastDay = new Date(year, month, 0).getDate();               //当月最后一天
            var thisDay = new Date().getDay();                              //当天是本月第几天

                       var valueList = [7, 21, 28 , 30, 40, 50, 60, 70, 80, 90, 100];
            var titleList = ["7天","21天","28天", "30天", "40天", "50天", "60天", "70天", "80天", "90天", "100天"];
                       var valueList = [7, 21, 28 , 30, 40];
            var titleList = ["7天","21天","28天", "30天", "40天"];

            var HArrangeProductDayQty_ArrayList = '';
            for (var i = 0; i < valueList.length; i++) {
@@ -1191,8 +1267,14 @@
                }
            });

            //根据车间删除没有锁定的数据
            var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            if ($("#HMergeDept").val() == "是") {
                //根据车间删除没有锁定的数据
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
            } else {
                //根据车间删除没有锁定的数据
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            }           

            $.ajax({
                url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
                type: "GET",
@@ -1357,6 +1439,7 @@
                                option.data[i]["生产资源代码"] = sSourceNumber;

                                var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;

                                $.ajax({
                                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                                    type: "GET",
@@ -2146,13 +2229,20 @@
            var old_date = new Date();
            var data = option.data;//table.cache["mainTable"];

            //根据销售订单审核日期排序数组
            //根据销售订单要货日期，销售订单审核日期排序数组

            data.sort(function (a, b) {
                return new Date(a.销售订单审核日期) - new Date(b.销售订单审核日期)
                // é»˜è®¤æ ¹æ®æœ€æ—©å¼€å·¥æ—¥æœŸæŽ’序，最早开工日期相同则按照销售订单审核日期排序
                if (new Date(a.要货日期) == new Date(b.要货日期)) {
                    return new Date(a.销售订单审核日期) - new Date(b.销售订单审核日期)
                }
                return new Date(a.要货日期) - new Date(b.要货日期)
            });

            for (var i = 0; i < data.length; i++) {
                data[i]["优先级"] = ((i + 1) * 5);
                if (data[i]["优先级"] == 0 || data[i]["优先级"] == "") {
                    data[i]["优先级"] = ((i + 1) * 5);
                }                
            }
            option.data = data;
            table.render(option);

 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/ReportPODemandPlanBillList_S_TK.html

@@ -411,7 +411,7 @@
            var HXQD = $("#HXQD").val();//需求单号
            var HPURORDERNO = $("#HPURORDERNO").val();//采购订单号
            var HMaterNumber = $("#HMaterNumber").val();//物料代码
            var HMaterName = $("#HMaterName").val();//物料名称
            var HMATERIALNAME = $("#HMATERIALNAME").val();//物料名称
            var HSupNumber = $("#HSupNumber").val();//供应商代码
            var HSupName = $("#HSupName").val();//供应商名称

@@ -441,8 +441,8 @@
            if (HMaterNumber != "") {
                sWhere += " and t1.物料代码 like ''%" + HMaterNumber + "%'' ";
            }
            if (HMaterName != "") {
                sWhere += " and t1.物料名称 like ''%" + HMaterName + "%'' ";
            if (HMATERIALNAME != "") {
                sWhere += " and t1.物料名称 like ''%" + HMATERIALNAME + "%'' ";
            }
            if (HSupNumber != "") {
                sWhere += " and t3.HNumber like ''%" + HSupNumber + "%'' ";

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

@@ -668,6 +668,19 @@
                                    num++;
                                }

                                var sql = "update a set HPrintDate = getdate() from Sc_ProcessExchangeBillMain a with(nolock) where HInterID = " + HInterID + " and HPrintDate is null";
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //方法所在页面和方法名
                                    async: false,
                                    data: { "sWhere": sql },
                                    success: function (result) {
                                        if (result.data.code != 1) {
                                            layer.alert("更新打印日期异常：" + result.data.Message);
                                        }
                                    }
                                })

                            } else {
                                layer.msg("查无数据!");
                            }

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillList.html

@@ -1560,7 +1560,7 @@
                if (openType == 2) {
                    sWhere += " and HBillStatus=2 ";
                    $("#HOrgID").val(HOrgID);
                    form.render("select");zz
                    form.render("select");
                    return true;
                }
                return false;