添康获取多车间订单排产；小卫彩盒SN校验标题调整；过站解绑列表添加日期区间过滤；香囊标签打印，添加暂停打印，继续打印功能

yusijie

2026-01-14 a5e8fb4e50f285538ad6800d5abdb66ea367db00

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/sc_ICOMReport.html

@@ -38,7 +38,7 @@
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                                <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -46,7 +46,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">-</label>
                                            <div class="layui-input-inline">
                                                <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                                <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                            </div>
                                        </div>
                                    </div>
@@ -143,7 +143,34 @@
                                        </div>
                                    </div>

                                

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -225,7 +252,7 @@
                        get_Export();
                        break;
                    //退出
                    case 'btn-exit': Pub_Close(2); 
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //关闭订单
                    case 'btn-Close': btn_Close(obj);
@@ -310,6 +337,8 @@

                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');

               
@@ -400,19 +429,19 @@
                sWhere = " and æ—¥æœŸ between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";

                if (HMaterNumber != "") {
                    sWhere += " and äº§å“ä»£ç =''" + HMaterNumber + "'' ";
                    sWhere += " and ç‰©æ–™ä»£ç  like ''%" + HMaterNumber + "%'' ";
                }

                if (HBillNo != "") {
                    sWhere += " and å•æ®å·=''" + HBillNo + "'' ";
                    sWhere += " and å•æ®å· like ''%" + HBillNo + "%'' ";
                }

                if (HProductName != "") {
                    sWhere += " and äº§å“åç§°=''" + HProductName + "'' ";
                    sWhere += " and ç‰©æ–™åç§° like ''%" + HProductName + "%'' ";
                }

                if (HProductModel != "") {
                    sWhere += " and è§„格型号=''" + HProductModel + "'' ";
                    sWhere += " and è§„格型号 like ''%" + HProductModel + "%'' ";
                }

                //任意字段条件过滤 æ¡ä»¶æå–
@@ -422,7 +451,9 @@

                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColContent1 = $("#ColContent1").val(); var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

        
                //拼接任一字段过滤查询条件
@@ -468,6 +499,27 @@
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like''%" + ColContent2 + "%''";
                            break;
                        case "8":
                            com2 = "like''%" + ColContent2 + "''";
                            break;
                        case "9":
                            com2 = "like''" + ColContent2 + "%''";
                            break;
                        case "10":
                            com2 = "not like''%" + ColContent2 + "%''";
                            break;
                        default:
                            com2 = "" + Comparator2 + "''" + ColContent2 + "''";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                
             
                //根据用户过滤用户关联客户的记录
@@ -494,7 +546,10 @@
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");

                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');
                ColFilter();
                sWhere = "";
            }
@@ -527,7 +582,7 @@
                        });
                    }
                })
               

            }

            function btn_AddHRemark() {
@@ -537,7 +592,7 @@
                } else {
                    layer.prompt({ title: '添加备注', formType: 2 }, function (text, index) {

                        var sMainSub = checkStatus.data[0]["生产订单号"]+ ";"+text + ";" + sessionStorage["HUserName"];
                        var sMainSub = checkStatus.data[0]["生产订单号"] + ";" + text + ";" + sessionStorage["HUserName"];
                        $.ajax({
                            url: GetWEBURL() + "/LEMS/sc_ICOMReportAddHRemark",
                            type: "POST",
@@ -559,7 +614,7 @@
                                });
                            }
                        })
                       

                    });
                }
            }
@@ -710,7 +765,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '客户订单明细报表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../车间管理/报表分析/Sc_ICOMProBarCodeReport.html?OperationType=1&HICMOBillNo=' + HICMOBillNo , 'yes']
                    , content: ['../../车间管理/报表分析/Sc_ICOMProBarCodeReport.html?OperationType=1&HICMOBillNo=' + HICMOBillNo, 'yes']
                })
            }