diff --git a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java index 9309c923..00f54ae8 100644 --- a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java +++ b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java @@ -33,9 +33,9 @@ public class DeployTest { //处理主jar包 handleFile(sshUtil, localPath + jarName, remotePath + jarName); //处理字体目录 -// handleDir(sshUtil, localPath, remotePath, "fonts"); + handleDir(sshUtil, localPath, remotePath, "fonts"); //处理lib目录 -// handleDir(sshUtil, localPath, remotePath, "lib"); + handleDir(sshUtil, localPath, remotePath, "lib"); //执行脚本启动服务 sshUtil.exec("cd " + remotePath + " && ./restart.sh"); sshUtil.disconnect(); diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml index 41d4d506..d4a1e86b 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml @@ -33,7 +33,7 @@ and a.note_num =#{ request.deliveryNo} - and a.supplier_code =#{ request.supplierCode} + and a.supplier_num =#{ request.supplierCode} group by