diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index a2235107e..86c2303bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -116,6 +116,10 @@ public class PrintServiceImpl implements PrintService { // 生成txt文件 JSONObject jsonPrint = printTab.query("print_id = '" + whereJson.getString("print_type") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonPrint)) { + throw new BadRequestException("请选择打印机!"); + } + //10.1.3.21/LMSPrinter/ String filePath = jsonPrint.getString("print_route") + "外包标签.txt"; FileWriter fw = null; diff --git a/lms/nladmin-ui/src/assets/images/hailaing.png b/lms/nladmin-ui/src/assets/images/hailaing.png new file mode 100644 index 000000000..9675cc8b9 Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/hailaing.png differ diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index 7bcca713f..e14b13d20 100644 --- a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@