diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 9219cebd5..1f9d0b8ea 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java index b43f21b35..ee342135f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/rest/PrintController.java @@ -2,6 +2,7 @@ package org.nl.wms.pda.st.rest; +import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -43,4 +44,12 @@ public class PrintController { public ResponseEntity customerPrint(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(printService.customerPrint(whereJson),HttpStatus.OK); } + + @PostMapping("/printType") + @Log("打印机下拉框") + @ApiOperation("打印机下拉框") + @SaIgnore + public ResponseEntity printType(@RequestBody JSONObject whereJson){ + return new ResponseEntity<>(printService.printType(whereJson),HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java index a515f18d2..47751f66a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/PrintService.java @@ -23,4 +23,11 @@ public interface PrintService { * @return JSONObject / */ JSONObject customerPrint(JSONObject whereJson); + + /** + * 获取单据类型 + * @param whereJson / + * @return JSONObject / + */ + JSONObject printType(JSONObject whereJson); } 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 67ddc9979..fadbf171a 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 @@ -6,8 +6,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import jcifs.smb.NtlmPasswordAuthentication; -import jcifs.smb.SmbFile; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; @@ -92,30 +90,13 @@ public class PrintServiceImpl implements PrintService { } // 生成txt文件 - String filePath = "smb://10.1.3.21" + "/LMSPrinter" + "外包标签.txt"; - - String url = "smb://10.1.3.21/LMSPrinter/"+"外包标签.txt"; - String userName = "111"; - String password = "111"; + String filePath = "//10.1.3.21" + "/LMSPrinter/" + "外包标签.txt"; FileWriter fw = null; try { - /* File file = new File(filePath); + File file = new File(filePath); if (!file.exists()) { - // 判断此文件是否存在 不存在则创建 存在则覆盖 - file.createNewFile(); - }*/ - /* SmbFile file = new SmbFile(filePath); - if (!file.exists()) { - // 判断此文件是否存在 不存在则创建 存在则覆盖 - file.createNewFile(); - }*/ - NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication(null, userName, password); - SmbFile file = new SmbFile(url, auth); - if (!file.exists()) { - // 判断此文件是否存在 不存在则创建 存在则覆盖 file.createNewFile(); } - fw = new FileWriter(filePath); BufferedWriter bw = new BufferedWriter(fw); bw.write("package_box_sn,sale_order_name,product_description,product_name,width,pcsn,date_of_FG_inbound,box_weight,date_of_production,quanlity_in_box,quality_guaran_period,nspector,storage_conditions,weight\n"); @@ -138,18 +119,24 @@ public class PrintServiceImpl implements PrintService { bw.close(); } catch (Exception e) { - jo.put("message", "打印失败!" + e.getMessage()); - return jo; + jo.put("message", "打印失败!"+e.getMessage()); } finally { try { fw.close(); } catch (Exception e) { - jo.put("message", "打印失败!" + e.getMessage()); + jo.put("message", "打印失败!"+e.getMessage()); } } jo.put("message", "打印成功!"); return jo; } - + @Override + public JSONObject printType(JSONObject whereJson){ + JSONArray rows = WQL.getWO("PDA_ST_01").addParam("flag","6").process().getResultJSONArray(0); + JSONObject jo = new JSONObject(); + jo.put("data", rows); + jo.put("message", "查询成功!"); + return jo; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 7538481fd..760e17ca3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -163,4 +163,15 @@ sub.package_box_sn = 输入.box_no ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "6" + QUERY + SELECT + print_id AS value, + print_name AS text + FROM + pdm_bi_printinfo + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 843466d77..6f3c83113 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ