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

Merge branch 'feature/NoScanning' into qms/develop 

# Conflicts:
#	nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java
#	nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/SRMController.java
This commit is contained in:
曹鹏飞 2026-06-26 14:14:06 +08:00
parent 9bc5ae4254 37bb24eadf
commit 05b0f80c77
4 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -460,9 +460,9 @@ public class StructuralPackageOrderController extends BaseController {
// 获取托盘号：如果物料项有关联的托盘，则使用托盘号；否则为空
if (item.getTrayId() != null) {
WmsStructuralPackageOrderTray tray = trays.stream()
.filter(t -> t.getId().equals(item.getTrayId()))
.findFirst()
.orElse(null);
.filter(t -> t.getId().equals(item.getTrayId()))
.findFirst()
.orElse(null);
if (tray != null) {
ivo.setNo(tray.getNo());
} else {
@ -533,7 +533,6 @@ public class StructuralPackageOrderController extends BaseController {
/**
* 获取托盘零件列表
*
* @param id 订单id
*/
@GetMapping("getItems")
@ -1089,9 +1088,9 @@ public class StructuralPackageOrderController extends BaseController {
it.setTrayNum(Math.toIntExact(structuralPackageOrderTrayService.lambdaQuery()
.eq(WmsStructuralPackageOrderTray::getOrderId, it.getId())
.in(WmsStructuralPackageOrderTray::getState,
OrderState.Packaged.getState(),
OrderState.InTransit.getState(),
OrderState.Received.getState())
OrderState.Packaged.getState(),
OrderState.InTransit.getState(),
OrderState.Received.getState())
.count()));
});
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
@ -1258,6 +1257,11 @@ public class StructuralPackageOrderController extends BaseController {
)
)
);
structuralPackageOrderService.lambdaUpdate()
.set(WmsStructuralPackageOrder::getMatDoc, pair.getValue().getKey())
.set(WmsStructuralPackageOrder::getDocYear, pair.getValue().getValue())
.eq(WmsStructuralPackageOrder::getId, request.getId())
.update();
if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) {
sapService.zwm3a18(new ZWM3A18DTO()
.setEbeln(order.getExternalOrderNo())
@ -2124,7 +2128,7 @@ public class StructuralPackageOrderController extends BaseController {
* @param ids 托盘id列表
*/
@PostMapping("exportPdfByTrayIds")
public void exportPdfByTrayIds(HttpServletResponse response,@RequestBody @NotEmpty List<Long> ids) throws Exception {
public void exportPdfByTrayIds(HttpServletResponse response, @RequestBody @NotEmpty List<Long> ids) throws Exception {
List<DeliverStructuralPackageOrderTrayItemVO> list = structuralPackageOrderTrayItemService.getListVOByTrayIds(ids);
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("数据不存在");
DeliverStructuralPackageOrderExtendVO trayVO = structuralPackageOrderTrayService.getInfo(list.get(0).getTrayId());

8
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -706,10 +706,10 @@ public class TransferCompanyController extends BaseController {
).toList()
)
);
transferCompanyTicketService.lambdaUpdate()
.set(WmsTransferCompanyTicket::getMatDoc, vo.getMblnr())
.set(WmsTransferCompanyTicket::getDocYear, vo.getMjahr())
.eq(WmsTransferCompanyTicket::getId, ticket.getId())
transferCompanyService.lambdaUpdate()
.set(WmsTransferCompany::getMatDoc, vo.getMblnr())
.set(WmsTransferCompany::getDocYear, vo.getMjahr())
.eq(WmsTransferCompany::getId, order.getId())
.update();
}

10
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
View File

@ -136,4 +136,14 @@ public class WmsStructuralPackageOrder implements Serializable {
* 状态，0：未打包；1：已打包；2-在途；3-已收货
*/
private Short state;
/**
* 凭证号
*/
private String matDoc;
/**
* 凭证年份
*/
private String docYear;
}

10
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompany.java
View File

@ -94,4 +94,14 @@ public class WmsTransferCompany implements Serializable {
* 备注
*/
private String remark;
/**
* 凭证号
*/
private String matDoc;
/**
* 凭证年份
*/
private String docYear;
}