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

Merge branch 'feature/bug-813' into develop

This commit is contained in:
曹鹏飞 2025-10-11 11:20:22 +08:00
parent 309ec6bdba 8a4e2de9d2
commit c36fa6590d
10 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
View File

@ -11,7 +11,6 @@ import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.ZWM3A19DTO;
import com.nflg.wms.common.pojo.dto.ZWM3A19ITEMDTO;
import com.nflg.wms.common.pojo.qo.ComponentOrderQO;
import com.nflg.wms.common.pojo.qo.ComponentPackingEditInputQO;
import com.nflg.wms.common.pojo.qo.ComponentPackingInputQO;
@ -30,10 +29,7 @@ import jakarta.validation.constraints.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -168,13 +164,15 @@ public class ComponentPackingController {
/**
* 装箱单详情列表
* 装箱单项详情列表
*
* @param packingId 装箱单号或是分销凭证号
* @return 装箱单详情列表
* @return 装箱单项详情列表
*/
@GetMapping("pda/taskitem")
public ApiResult<List<ComponentPackingItemPdaVO>> getPackingPdaItem(@RequestParam @NotNull Long packingId) {
WmsComponentPacking packing = wmscomponentPackingService.getById(packingId);
VUtil.trueThrowBusinessError(Objects.isNull(packing)).throwMessage("装箱单不存在");
// 查询退库单对应的明细项
List<WmsComponentPackingItem> tasks = wmsComponentPackingItemService.lambdaQuery()
.select(WmsComponentPackingItem::getId, WmsComponentPackingItem::getIdnrk,
@ -192,6 +190,9 @@ public class ComponentPackingController {
List<ComponentPackingItemPdaVO> daVos = tasks.stream()
.map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item))
.collect(Collectors.toList());
daVos.forEach(vo -> {
vo.setFactoryNo(packing.getFactoryNo());
});
return ApiResult.success(daVos);
}

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InCostCenterBackController.java
View File

@ -167,6 +167,7 @@ public class InCostCenterBackController extends BaseController {
.setId(order.getId())
.setAufnr(order.getAufnr())
.setRsnum(order.getRsnum())
.setFactoryNo(order.getWerks())
.setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> {

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
View File

@ -214,6 +214,7 @@ public class InProduceBackController extends BaseController {
.setId(order.getId())
.setAufnr(order.getAufnr())
.setRsnum(order.getRsnum())
.setFactoryNo(order.getDwerk())
.setItems(datas.stream()
.filter(item -> item.getSqsl().compareTo(item.getNum()) > 0)
.map(item -> new OutProduceItemVO()

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

@ -168,6 +168,7 @@ public class OutAssistanceController extends BaseController {
.setAufnr(order.getEbeln())
.setRsnum("")
.setLgort(order.getLgort1())
.setFactoryNo(order.getWerks())
.setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> new OutProduceItemVO()

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -163,6 +163,7 @@ public class OutCostCenterController extends BaseController {
.setId(order.getId())
.setAufnr(order.getAufnr())
.setRsnum(order.getRsnum())
.setFactoryNo(order.getWerks())
.setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> new OutProduceItemVO()

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -272,6 +272,7 @@ public class OutProduceController extends BaseController {
.setAufnr(order.getAufnr())
.setRsnum(order.getRsnum())
.setLgort(order.getLgort2())
.setFactoryNo(order.getDwerk())
.setItems(datas.stream()
.filter(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) > 0)
.map(item -> new OutProduceItemVO()

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -192,6 +192,7 @@ public class TransferFactoryController extends BaseController {
.setMblnr(order.getMblnr())
.setBwart(order.getBwart())
.setLgort(order.getLgort())
.setFactoryNo(order.getWerks())
.setItems(datas.stream()
.map(item -> new TransferFactoryPdaItemVO()
.setId(item.getId())
@ -309,6 +310,7 @@ public class TransferFactoryController extends BaseController {
.setMblnr(ticket.getMblnr())
.setLgort(ticket.getLgort())
.setLgort1(ticket.getUmlgo())
.setFactoryNo(ticket.getWerks())
.setItems(itemVOS.stream().map(it -> new TransferFactoryPdaItemVO()
.setId(it.getId())
.setMatnr(it.getMatnr())

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java
View File

@ -54,4 +54,8 @@ public class ComponentPackingItemPdaVO {
return menge.subtract(outQty);
}
/**
* 工厂
*/
private String factoryNo;
}

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduce1VO.java
View File

@ -36,5 +36,10 @@ public class OutProduce1VO {
*/
private String supplierName;
/**
* 工厂
*/
private String factoryNo;
private List<OutProduceItemVO> items;
}

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java
View File

@ -34,5 +34,10 @@ public class TransferFactoryPdaVO {
*/
private String lgort1;
/**
* 工厂
*/
private String factoryNo;
private List<TransferFactoryPdaItemVO> items;
}