diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java index ad0e5230..6dd5080b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java @@ -15,6 +15,8 @@ import com.nflg.wms.admin.util.NoUtil; import com.nflg.wms.admin.util.PdfGeneratorUtil; import com.nflg.wms.admin.util.QRCodeUtil; import com.nflg.wms.admin.util.ThymeleafUtil; +import com.nflg.wms.common.constant.STATE; +import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.dto.*; @@ -271,8 +273,9 @@ public class OutAssistanceController extends BaseController { .toList()); outAssistanceTicketService.save(ticket); } - outMaterialScanRecordRespository.saveAll(records); - return ApiResult.success(); + throw new NflgException(STATE.SystemErr, "测试"); +// outMaterialScanRecordRespository.saveAll(records); +// return ApiResult.success(); } private void submitSap(WmsOutAssistance order, WmsOutAssistanceTicket ticket, List records diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java index de6aa011..eeb4be4f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java @@ -1,6 +1,5 @@ package com.nflg.wms.common.pojo.vo; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,7 +15,6 @@ public class InventoryForOutItemVO { /** * 批次号 */ - @NotBlank private String batchNo; /** diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java index 1dc7ea9a..dd2720b4 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java @@ -154,6 +154,7 @@ public class WmsInventoryServiceImpl extends ServiceImpl