Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

llj

2025-12-16 1b5293c8ca79ce81b0ce5de7f4a89cc96aee6cb3

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_UnbindList.html

@@ -500,16 +500,19 @@
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HICMOBillNo) {
                    sWhere += " and ç”Ÿäº§è®¢å•å· like '%" + HICMOBillNo + "%'";
                    sWhere += " and å·¥å•ç¼–号 like '%" + HICMOBillNo + "%'";
                }

                if (HBarcode_SN) {
                    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                }
                if (HBarcode_ZB) {
                    sWhere += "and  ç®¡åˆ¶åºå· like 'P%' and ç®¡åˆ¶åºå· like '%XXX' and ç®¡åˆ¶åºå·='" + HBarcode_ZB+"'";
                    sWhere += "and  æ ˆæ¿ç  like '%" + HBarcode_ZB + "%'";

                }
                if (HBarcode_ZX) {
                    sWhere += "and ç®¡åˆ¶åºå· like 'MZXH%' and ç®¡åˆ¶åºå·='" + HBarcode_ZX+"'";
                    sWhere += "and  ä¸­ç®±ç  like '%" + HBarcode_ZX + "%'";

                }

                get_Display(sWhere);
@@ -550,7 +553,7 @@
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                            item[itemobj] = item[itemobj].toString().replaceALL(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                            item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '').replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                        }
                    }
                });