rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: bug-883 出库业务先进先出控制，推荐批次，异常业务审批功能

This commit is contained in:
曹鹏飞 2025-11-12 14:06:51 +08:00
parent cca3b41182
commit 59b2a4b92f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -15,6 +15,8 @@ import com.nflg.wms.admin.util.NoUtil;
import com.nflg.wms.admin.util.PdfGeneratorUtil; import com.nflg.wms.admin.util.PdfGeneratorUtil;
import com.nflg.wms.admin.util.QRCodeUtil; import com.nflg.wms.admin.util.QRCodeUtil;
import com.nflg.wms.admin.util.ThymeleafUtil; 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.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.*; import com.nflg.wms.common.pojo.dto.*;
@ -271,8 +273,9 @@ public class OutAssistanceController extends BaseController {
.toList()); .toList());
outAssistanceTicketService.save(ticket); outAssistanceTicketService.save(ticket);
} }
outMaterialScanRecordRespository.saveAll(records); throw new NflgException(STATE.SystemErr, "测试");
return ApiResult.success(); // outMaterialScanRecordRespository.saveAll(records);
// return ApiResult.success();
} }
private void submitSap(WmsOutAssistance order, WmsOutAssistanceTicket ticket, List<OutMaterialScanRecord> records private void submitSap(WmsOutAssistance order, WmsOutAssistanceTicket ticket, List<OutMaterialScanRecord> records

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryForOutItemVO.java
View File

@ -1,6 +1,5 @@
package com.nflg.wms.common.pojo.vo; package com.nflg.wms.common.pojo.vo;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -16,7 +15,6 @@ public class InventoryForOutItemVO {
/** /**
* 批次号 * 批次号
*/ */
@NotBlank
private String batchNo; private String batchNo;
/** /**

1
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java
View File

@ -154,6 +154,7 @@ public class WmsInventoryServiceImpl extends ServiceImpl<WmsInventoryMapper, Wms
.eq(WmsInventory::getFactoryNo, factoryNo) .eq(WmsInventory::getFactoryNo, factoryNo)
.eq(WmsInventory::getWarehouseNo, warehouseNo) .eq(WmsInventory::getWarehouseNo, warehouseNo)
.in(WmsInventory::getMaterialNo, materialNos) .in(WmsInventory::getMaterialNo, materialNos)
.gt(WmsInventory::getNum, BigDecimal.ZERO)
.orderByAsc(WmsInventory::getId) .orderByAsc(WmsInventory::getId)
.list(); .list();
} }