diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index 84e8ae83..55377e41 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -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> getPackingPdaItem(@RequestParam @NotNull Long packingId) { + WmsComponentPacking packing = wmscomponentPackingService.getById(packingId); + VUtil.trueThrowBusinessError(Objects.isNull(packing)).throwMessage("装箱单不存在"); // 查询退库单对应的明细项 List tasks = wmsComponentPackingItemService.lambdaQuery() .select(WmsComponentPackingItem::getId, WmsComponentPackingItem::getIdnrk, @@ -192,6 +190,9 @@ public class ComponentPackingController { List daVos = tasks.stream() .map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item)) .collect(Collectors.toList()); + daVos.forEach(vo -> { + vo.setFactoryNo(packing.getFactoryNo()); + }); return ApiResult.success(daVos); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java index fe541f4f..0fa94d69 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java @@ -54,4 +54,8 @@ public class ComponentPackingItemPdaVO { return menge.subtract(outQty); } + /** + * 工厂 + */ + private String factoryNo; }