From 038b61449b2d25a425162be0d07bc0ab69d6da57 Mon Sep 17 00:00:00 2001 From: zhangke Date: Thu, 25 Sep 2025 16:05:44 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9D=A1=E7=A0=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84ID?= =?UTF-8?q?=E5=8F=B7=202=E3=80=81=E6=B5=8B=E8=AF=95=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9D=9E=E8=B4=A8=E6=A3=80=E7=9A=84=E6=97=A0?= =?UTF-8?q?=E7=A0=81=E6=94=B6=E8=B4=A7=E3=80=81=E4=B8=8A=E6=9E=B6=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/NormalPGIController.java | 57 ++++++++++++------- .../admin/controller/POReceiptController.java | 2 +- .../admin/controller/QCReceiptController.java | 2 +- .../SrmMaterialReceiptNoScanCodes.java | 9 ++- .../document/SrmMaterialReceiptScanCodes.java | 4 ++ ...mMaterialReceiptNoScanCodesRepository.java | 2 +- ...SrmMaterialReceiptScanCodesRepository.java | 1 + .../service/NormalPGIControllerService.java | 27 +++++---- .../java/com/nflg/wms/admin/DeployTest.java | 2 +- 9 files changed, 65 insertions(+), 41 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index a0082164..a2d11812 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -196,17 +196,18 @@ public class NormalPGIController extends BaseController { //数量验证(判断收货数量是否大于了未收数量) VUtil.trueThrowBusinessError(item.getReceiptNum().compareTo(materialInfoInOrder.getTransportNum()) > 0).throwMessage("物料收货数量[" + item.getReceiptNum() + "]大于了未收数量[" + materialInfoInOrder.getTransportNum() + "]，订单号：" + item.getPoNum()); + Long orderItemId = IdUtil.getSnowflakeNextId(); //序列号和批次号验证 - List codes = normalPGIControllerService.validateScanCodes(item, materialInfoInOrder); + List codes = normalPGIControllerService.validateScanCodes(item, materialInfoInOrder, orderItemId); if (CollectionUtil.isNotEmpty(codes)) { srmMaterialReceiptScanCodes.addAll(codes); } boolean isQuality = materialInfoInOrder.getKzkri().equals("X"); // 如果是质检单 if (isQuality) { - setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId()); + setQcMaterialSyncDto(qcMaterialSyncDTOS, item, order, codes, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), orderItemId); } else { - setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder); + setPoReceive(item, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, orderItemId); } } // 盘点条码是否重复 @@ -333,7 +334,7 @@ public class NormalPGIController extends BaseController { List item1 = zwm3A17DTO.getItem1(); List item2 = zwm3A17DTO.getItem2(); - List scanCode = srmMaterialReceiptScanCodesRepository.findByOrderItemId(item.getOrderItemId()); + List scanCode = srmMaterialReceiptScanCodesRepository.findByReceiveItemId(item.getId()); if (CollectionUtil.isNotEmpty(scanCode)) { scanCode = scanCode.stream().filter(code -> code.getIsIntoStorage() == false) .toList(); @@ -438,11 +439,12 @@ public class NormalPGIController extends BaseController { private void setPoReceive(SrmMaterialReceiptQO item, List wmsPoReceiptItems, Long receiveId, - SAPSyncParamsDTO materialInfoInOrder + SAPSyncParamsDTO materialInfoInOrder, + Long receiveItemId ) { WmsPoReceiptItem receiptItem = new WmsPoReceiptItem() - .setId(IdUtil.getSnowflakeNextId()) + .setId(receiveItemId) .setLineNumber(item.getLineNumber()) .setItemCode(item.getItemCode()) .setUomCode(materialInfoInOrder.getMeins()) @@ -570,7 +572,8 @@ public class NormalPGIController extends BaseController { List codes, SAPSyncParamsDTO materialInfoInOrder, List wmsQcReceiveItems, - Long receiveId + Long receiveId, + Long receiveItemId ) { ZWM3A17DTO zwm3A17DTO = null; QCMaterialSyncDTO qcDto = null; @@ -619,7 +622,7 @@ public class NormalPGIController extends BaseController { setSrmData(srmPushDto, codes, item, materialInfoInOrder); WmsQcReceiveItem qmsReceiptItem = new WmsQcReceiveItem() - .setId(IdUtil.getSnowflakeNextId()) + .setId(receiveItemId) .setLineNumber(item.getLineNumber()) .setItemCode(item.getItemCode()) .setUomCode(materialInfoInOrder.getMeins()) @@ -668,6 +671,7 @@ public class NormalPGIController extends BaseController { .eq(WmsSrmOrder::getNoteNum, request.getOrderNo()) .eq(WmsSrmOrder::getIsCompleted, false) .list(); + request.setId(CollectionUtil.isNotEmpty(orders) ? orders.get(0).getId() : 0L); } VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("不存在未完成收货的物料!"); @@ -716,7 +720,9 @@ public class NormalPGIController extends BaseController { private List validateNoScanCodes(BarcodeLessReceivingVO item, SAPSyncParamsDTO materialInfoInOrder, - List scanCodeQOS) { + List scanCodeQOS + , Long receiveItemId + ) { String lbprt = materialInfoInOrder.getLbprt(); //判断序列号、批次号是否规范 // 1 - 批次号为空，序列号为空 @@ -737,19 +743,22 @@ public class NormalPGIController extends BaseController { } List srmMaterialReceiptScanCodes = new ArrayList<>(); List codeIds = new ArrayList<>(); + String batchCode = Objects.isNull(item.getBatchNumber()) ? "" : item.getBatchNumber(); if (StrUtil.isBlank(item.getSerialNumbers())) { String codeContent = item.getItemCode() + "&" + item.getPoNum() + "&" + item.getPoLineNumber() + "&" + item.getLineNumber() + "&" + item.getNoteNum() + "&" + item.getIuCode() + "&" + item.getSupplierNum() + "&" + item.getUnRecieveQty() - + "&" + item.getUomCode() + "&" + item.getReceivedWarehouse() + "&" + item.getBatchNumber() + + "&" + item.getUomCode() + "&" + item.getReceivedWarehouse() + "&" + batchCode + "&" + item.getSerialNumbers() + "&" + LocalDateTime.now(); String codeId = DigestUtil.md5Hex(codeContent); srmMaterialReceiptScanCodes.add(new SrmMaterialReceiptNoScanCodes() .setCodeId(codeId) .setOrderNo(item.getNoteNum()) .setOrderItemId(item.getId()) + .setBatchNumber(batchCode) .setCodeNum(item.getUnRecieveQty()) .setSerialNumbers(item.getSerialNumbers()) .setCodeContent(codeContent) + .setReceiveItemId(receiveItemId) .setIsIntoStorage(false)); scanCodeQOS.add(new SrmMaterialReceiptScanCodes() @@ -757,6 +766,8 @@ public class NormalPGIController extends BaseController { .setOrderNo(item.getNoteNum()) .setOrderItemId(item.getId()) .setIsIntoStorage(false) + .setBatchNumber(batchCode) + .setReceiveItemId(receiveItemId) .setCodeNum(item.getUnRecieveQty()) .setBatchNumber(item.getBatchNumber()) .setSerialNumbers(item.getSerialNumbers()) @@ -771,24 +782,29 @@ public class NormalPGIController extends BaseController { String codeContent = item.getItemCode() + "&" + item.getPoNum() + "&" + item.getPoLineNumber() + "&" + item.getLineNumber() + "&" + item.getNoteNum() + "&" + item.getIuCode() + "&" + item.getSupplierNum() + "&1" - + "&" + item.getUomCode() + "&" + item.getReceivedWarehouse() + "&" + item.getBatchNumber() + + "&" + item.getUomCode() + "&" + item.getReceivedWarehouse() + "&" + batchCode + "&" + serialNumbers[i] + "&" + LocalDateTime.now(); String codeId = DigestUtil.md5Hex(codeContent); srmMaterialReceiptScanCodes.add(new SrmMaterialReceiptNoScanCodes() .setCodeId(codeId) .setOrderNo(item.getNoteNum()) .setOrderItemId(item.getId()) + .setBatchNumber(batchCode) .setCodeNum(new BigDecimal(1)) .setSerialNumbers(serialNumbers[i]) .setCodeContent(codeContent) + .setReceiveItemId(receiveItemId) .setIsIntoStorage(false)); + scanCodeQOS.add(new SrmMaterialReceiptScanCodes() .setCodeId(codeId) .setOrderNo(item.getNoteNum()) .setOrderItemId(item.getId()) + .setBatchNumber(batchCode) .setIsIntoStorage(false) .setCodeNum(new BigDecimal(1)) .setBatchNumber(item.getBatchNumber()) + .setReceiveItemId(receiveItemId) .setSerialNumbers(serialNumbers[i]) .setCodeContent(codeContent) ); @@ -860,8 +876,9 @@ public class NormalPGIController extends BaseController { VUtil.trueThrowBusinessError(item.getUnRecieveQty().compareTo(materialInfoInOrder.getTransportNum()) > 0) .throwMessage("物料收货数量[" + item.getUnRecieveQty() + "]大于了未收数量[" + materialInfoInOrder.getTransportNum() + "]，订单号：" + item.getPoNum()); //序列号和批次号验证以及条码信息的组装 + Long receiveItemId = IdUtil.getSnowflakeNextId(); List scanCodeQOS = new ArrayList<>(); - List itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS); + List itemCodes = validateNoScanCodes(item, materialInfoInOrder, scanCodeQOS,receiveItemId); if (CollectionUtil.isNotEmpty(itemCodes)) { codes.addAll(itemCodes); } @@ -885,18 +902,16 @@ public class NormalPGIController extends BaseController { .setReceiptNum(item.getUnRecieveQty()); // 如果是质检单 if (isQuality) { - setQcMaterialSyncDto(qcMaterialSyncDTOS, materialSyncDTO, order, scanCodeQOS, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId()); + setQcMaterialSyncDto(qcMaterialSyncDTOS, materialSyncDTO, order, scanCodeQOS, materialInfoInOrder, wmsQcReceiveItems, wmsQcReceive.getId(), receiveItemId); } else { WmsPoReceipt wmsPoReceipt = wmsPoReceipts.stream().filter(it -> it.getOrderNo().equals(item.getNoteNum())) .findFirst().orElse(null); if (Objects.isNull(wmsPoReceipt)) { continue; } - - setPoReceive(materialSyncDTO, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder); + setPoReceive(materialSyncDTO, wmsPoReceiptItems, wmsPoReceipt.getId(), materialInfoInOrder, receiveItemId); } } - // 盘点条码是否重复 Map duplicateCodes = codes.stream() .collect(Collectors.groupingBy( @@ -970,7 +985,7 @@ public class NormalPGIController extends BaseController { List item1 = zwm3A17DTO.getItem1(); List item2 = zwm3A17DTO.getItem2(); - List scanCode = srmMaterialReceiptNoScanCodesRepository.findByOrderItemId(item.getOrderItemId()); + List scanCode = srmMaterialReceiptNoScanCodesRepository.findByReceiveItemId(item.getId()); if (CollectionUtil.isNotEmpty(scanCode)) { scanCode = scanCode.stream().filter(code -> code.getIsIntoStorage() == false) .toList(); @@ -981,7 +996,7 @@ public class NormalPGIController extends BaseController { // 库存 InventoryDTO inventoryDTO = inventories.stream() .filter(inventoriesDTO -> inventoriesDTO.getMaterialNo().equals(item.getItemCode()) - && inventoriesDTO.getBatchNumber().equals(code.getBatchNumber()) + && inventoriesDTO.getBatchNumber().equals(Objects.isNull(code.getBatchNumber()) ? "" : code.getBatchNumber()) && inventoriesDTO.getFactoryNo().equals(wmsPoReceipt.getFactoryCode()) && inventoriesDTO.getWarehouseNo().equals(item.getReceivedWarehouse()) ).findFirst().orElse(null); @@ -991,7 +1006,7 @@ public class NormalPGIController extends BaseController { .setMaterialNo(item.getItemCode()) .setFactoryNo(wmsPoReceipt.getFactoryCode()) .setWarehouseNo(item.getReceivedWarehouse()) - .setBatchNumber(code.getBatchNumber()) + .setBatchNumber(Objects.isNull(code.getBatchNumber()) ? "" : code.getBatchNumber()) .setNum(code.getCodeNum()); inventories.add(inventoryDTO); } else { @@ -1002,7 +1017,7 @@ public class NormalPGIController extends BaseController { dto1.getEBELP().equals(item.getPoLineNumber()) && dto1.getMATNR().equals(item.getItemCode()) && dto1.getMeins().equals(item.getUomCode()) - && dto1.getCHARG().equals(code.getBatchNumber()) + && dto1.getCHARG().equals(Objects.isNull(code.getBatchNumber()) ? "" : code.getBatchNumber()) && dto1.getWERKS().equals(wmsPoReceipt.getFactoryCode()) && dto1.getLGORT().equals(item.getReceivedWarehouse()) ).findFirst().orElse(null); @@ -1012,7 +1027,7 @@ public class NormalPGIController extends BaseController { .setMATNR(item.getItemCode()) .setERFMG(code.getCodeNum()) .setMEINS(item.getUomCode()) - .setCHARG(code.getBatchNumber()) + .setCHARG(Objects.isNull(code.getBatchNumber()) ? "" : code.getBatchNumber()) .setWERKS(wmsPoReceipt.getFactoryCode()) .setLGORT(item.getReceivedWarehouse()) .setKZKRI("") diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java index a78ba8d4..fb79d2eb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java @@ -66,7 +66,7 @@ public class POReceiptController { @GetMapping("getScanCodes") @ApiMark(moduleName = "采购单入库管理", apiName = "获取扫码的详情信息") public ApiResult> getScanCodes(@RequestParam Long orderItemId) { - List scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId); + List scanCodes = srmMaterialReceiptCanCodesRepository.findByReceiveItemId(orderItemId); List pdas = Convert.toList(PDAScanCodeVO.class, scanCodes); return ApiResult.success(pdas); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java index 335a9cc5..64334477 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java @@ -70,7 +70,7 @@ public class QCReceiptController { @GetMapping("getScanCodes") @ApiMark(moduleName = "质检物料入库单", apiName = "获取扫码的详情信息") public ApiResult> getScanCodes(@RequestParam Long orderItemId) { - List scanCodes = srmMaterialReceiptCanCodesRepository.findByOrderItemId(orderItemId); + List scanCodes = srmMaterialReceiptCanCodesRepository.findByReceiveItemId(orderItemId); List pdas = Convert.toList(PDAScanCodeVO.class, scanCodes); return ApiResult.success(pdas); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptNoScanCodes.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptNoScanCodes.java index af0c5410..5a790fa6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptNoScanCodes.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptNoScanCodes.java @@ -17,12 +17,12 @@ public class SrmMaterialReceiptNoScanCodes { private String id; /** - * 收货单的单号 + * 发货单的单号 */ private String orderNo; /*** - * 收货单的单行ID号 + * 发货单的单行ID号 * */ private Long orderItemId; @@ -62,4 +62,9 @@ public class SrmMaterialReceiptNoScanCodes { * 是否已上架 */ private Boolean IsIntoStorage; + + /** + * 收货单的单行ID号 + */ + private Long receiveItemId; } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptScanCodes.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptScanCodes.java index ff052d68..7a00452f 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptScanCodes.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/SrmMaterialReceiptScanCodes.java @@ -63,4 +63,8 @@ public class SrmMaterialReceiptScanCodes { */ private Boolean IsIntoStorage; + /** + * 收货单的单行ID号 + */ + private Long receiveItemId; } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptNoScanCodesRepository.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptNoScanCodesRepository.java index f55ce32f..030b3379 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptNoScanCodesRepository.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptNoScanCodesRepository.java @@ -12,7 +12,7 @@ import java.util.List; public interface SrmMaterialReceiptNoScanCodesRepository extends MongoRepository { List findByOrderItemId(Long orderItemId); - + List findByReceiveItemId(Long receiveItemId); List findByCodeIdIn(List attr0); @Query("{ 'codeId' : { $in : ?0 } }") diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java index d90ea90e..af2e2e40 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/SrmMaterialReceiptScanCodesRepository.java @@ -12,6 +12,7 @@ import java.util.List; public interface SrmMaterialReceiptScanCodesRepository extends MongoRepository { List findByOrderItemId(Long orderItemId); + List findByReceiveItemId(Long receiveItemId); List findByCodeIdIn(List attr0); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java index d499e9fe..0dd56e22 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/NormalPGIControllerService.java @@ -167,7 +167,7 @@ public class NormalPGIControllerService { } - public List validateScanCodes(SrmMaterialReceiptQO item, SAPSyncParamsDTO materialInfoInOrder) { + public List validateScanCodes(SrmMaterialReceiptQO item, SAPSyncParamsDTO materialInfoInOrder, Long receiveItemId) { String lbprt = materialInfoInOrder.getLbprt(); //判断序列号、批次号是否规范 // 1 - 批次号为空，序列号为空 @@ -199,6 +199,7 @@ public class NormalPGIControllerService { .setCodeId(scanCode.getCodeId()) .setCodeNum(scanCode.getCodeNum()) .setBatchNumber(scanCode.getBatchNumber()) + .setReceiveItemId(receiveItemId) .setSerialNumbers(scanCode.getSerialNumbers()) .setIsIntoStorage(false) .setCodeContent(scanCode.getCodeContent())); @@ -325,15 +326,15 @@ public class NormalPGIControllerService { .update(); } } - //修改二维码的入库状态 - if (CollectionUtil.isNotEmpty(scanCodes)) { - List codeIds = scanCodes.stream().map(SrmMaterialReceiptScanCodes::getId).toList(); - srmMaterialReceiptCanCodesRepository.updateIsIntoStorage(codeIds, true); - } +// //修改二维码的入库状态 +// if (CollectionUtil.isNotEmpty(scanCodes)) { +// List codeIds = scanCodes.stream().map(SrmMaterialReceiptScanCodes::getId).toList(); +// srmMaterialReceiptCanCodesRepository.updateIsIntoStorage(codeIds, true); +// } } - + @Transactional public void takeNoScanDelivery(List wmsPoReceipts, List wmsQcReceives , List wmsPoReceiptItems , List wmsQcReceiveItems, List codes @@ -355,7 +356,6 @@ public class NormalPGIControllerService { for (WmsPoReceiptItem wmsPoReceiptItem : items) { wmsSrmOrderItemService.addReceiveQty(wmsPoReceiptItem.getOrderItemId(), wmsPoReceiptItem.getReceiptNum()); } - } } } @@ -378,7 +378,6 @@ public class NormalPGIControllerService { } - for (Long orderId : orderIds) { //更新收货单的完结状态 List orders = wmsSrmOrderService.getUnCompletedItem(orderId); @@ -415,7 +414,7 @@ public class NormalPGIControllerService { } } - + @Transactional public void takeDeliveryConfirmUnScan(List receiptItems, List storageLocationDTOS, List inventories, List zwm3A17DTOS, Long id, List scanCodes) { @@ -460,10 +459,10 @@ public class NormalPGIControllerService { } } //修改二维码的入库状态 - if (CollectionUtil.isNotEmpty(scanCodes)) { - List codeIds = scanCodes.stream().map(SrmMaterialReceiptNoScanCodes::getId).toList(); - srmMaterialReceiptNoCodesRepository.updateIsIntoStorage(codeIds, true); - } +// if (CollectionUtil.isNotEmpty(scanCodes)) { +// List codeIds = scanCodes.stream().map(SrmMaterialReceiptNoScanCodes::getId).toList(); +// srmMaterialReceiptNoCodesRepository.updateIsIntoStorage(codeIds, true); +// } } /** 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 ae3eab5c..fd765391 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 @@ -36,7 +36,7 @@ public class DeployTest { //处理主jar包 handleFile(sshUtil, localPath + jarName, remotePath + jarName); //处理lib目录 - handleDir(sshUtil, localPath, remotePath, "lib"); + // handleDir(sshUtil, localPath, remotePath, "lib"); //执行脚本启动服务 sshUtil.exec("cd " + remotePath + " && ./restart.sh"); sshUtil.disconnect();