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

工厂间调拨

This commit is contained in:
zhangke 2026-06-12 16:23:41 +08:00
parent 2ca23d1f04
commit a12a36f479
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import com.nflg.wms.admin.pojo.request.UpdateItemNumRequest;
import com.nflg.wms.admin.repository.InMaterialScanRecordRespository;
import com.nflg.wms.admin.repository.InventoryForOutRepository;
import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository;
import com.nflg.wms.admin.repository.TransferCompanyNoScanRecordRespository;
import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
import com.nflg.wms.admin.service.NoScanningBaseControllerService;
import com.nflg.wms.admin.service.SapService;
@ -29,6 +30,8 @@ import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.document.InMaterialScanRecord;
import com.nflg.wms.common.pojo.document.OutMaterialScanRecord;
import com.nflg.wms.common.pojo.document.TransferCompanyNoScanRecord;
import com.nflg.wms.common.pojo.document.TransferFactoryNoScanRecord;
import com.nflg.wms.common.pojo.dto.*;
import com.nflg.wms.common.pojo.qo.*;
import com.nflg.wms.common.pojo.vo.*;
@ -117,6 +120,9 @@ public class TransferCompanyController extends BaseController {
@Resource
private NoScanningBaseControllerService noScanningBaseControllerService;
@Resource
private TransferCompanyNoScanRecordRespository transferCompanyNoScanRecordRespository;
/**
* 查询SAP订单数据
*/
@ -628,6 +634,28 @@ public class TransferCompanyController extends BaseController {
transferCompanyTicketItemService.saveBatch(ticketItems);
transferCompanyTicketService.save(ticket);
submitSap(order, ticket, records, datas, ticketItems, Collections.emptyList());
if (!Objects.isNull(request) && CollectionUtil.isNotEmpty(request.getItems())) {
List<TransferCompanyNoScanRecord> temRecords = new ArrayList<>();
request.getItems().forEach(item -> {
if (CollectionUtil.isNotEmpty(item.getDatas())) {
item.getDatas().forEach(data -> {
temRecords.add(new TransferCompanyNoScanRecord()
.setId(request.getId())
.setItemId(item.getOrderItemId())
.setNum(data.getNum())
.setBatchNo(data.getBatchNo())
.setSerialNo(data.getSerialNo())
.setBinNo(data.getBinNo())
);
});
} });
if(CollectionUtil.isNotEmpty(temRecords))
{
transferCompanyNoScanRecordRespository.saveAll(temRecords);
}
}
return ApiResult.success();
}
@ -689,7 +717,54 @@ public class TransferCompanyController extends BaseController {
*/
@GetMapping("pda/getTicketForIn")
public ApiResult<List<TransferCompanyTicketVO>> getTicketForOut(@Valid @RequestParam @NotBlank String no) {
return ApiResult.success(transferCompanyTicketService.getVOByOrderNo(no));
List<TransferCompanyTicketVO> vos=transferCompanyTicketService.getVOByOrderNo(no);
if(CollectionUtil.isNotEmpty(vos))
{
vos.forEach(p -> {
List<NoScanningItemQO> items = new ArrayList<>();
List<WmsTransferCompanyItem> wmsItems=transferCompanyItemService.lambdaQuery()
.eq(WmsTransferCompanyItem::getOrderId, p.getId())
.list();
if(CollectionUtil.isNotEmpty(wmsItems))
{
wmsItems.forEach(wmsItem -> {
List<NoScanningItemDataQO> dataQOS=new ArrayList<>();
List<TransferCompanyNoScanRecord> mongoRecords=
transferCompanyNoScanRecordRespository.getTransferCompanyNoScanRecordBy(
p.getId(),
wmsItem.getId());
if(CollectionUtil.isNotEmpty(mongoRecords))
{
mongoRecords.forEach(mongoRecord -> {
dataQOS.add(new NoScanningItemDataQO()
.setBinNo(mongoRecord.getBinNo())
.setNum(mongoRecord.getNum())
.setSerialNo(mongoRecord.getSerialNo())
.setBatchNo(mongoRecord.getBatchNo())
);
});
}
items.add(new NoScanningItemQO()
.setOrderItemId(wmsItem.getId())
.setWarehouseNo(p.getLgort())
.setMaterialNo(wmsItem.getMatnr())
.setDatas(dataQOS)
);
});
}
NoScanningQO qo = new NoScanningQO()
.setId(p.getId())
.setNo(p.getNo())
.setItems(items);
p.noScannings.add(qo);
});
}
return ApiResult.success(vos);
}
/**

6
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyTicketVO.java
View File

@ -1,6 +1,7 @@
package com.nflg.wms.common.pojo.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nflg.wms.common.pojo.qo.NoScanningQO;
import lombok.Data;
import java.time.LocalDateTime;
@ -125,4 +126,9 @@ public class TransferCompanyTicketVO {
}
private List<TransferCompanyItemVO> items;
/**
* 未扫描的物料凭证
*/
public List<NoScanningQO> noScannings;
}