diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 24cbfdce..c6ba13f1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -996,15 +996,13 @@ public class StructuralPackageOrderController extends BaseController { } } String materialNo = StrUtil.trim(data.get("钢构包物料*").toString()); - Long materialId = null; + PackageVO packageVO = null; if (StrUtil.isBlank(materialNo)) { sb.append("钢构包物料不能为空;"); } else { - PackageVO packageVO = structuralPackageService.getCurrent(materialNo); + packageVO = structuralPackageService.getCurrent(materialNo); if (Objects.isNull(packageVO)) { sb.append("钢构包物料无效;"); - } else { - materialId = packageVO.getId(); } } String expectDeliveryDate = StrUtil.trim(data.get("期望交期").toString()); @@ -1066,8 +1064,10 @@ public class StructuralPackageOrderController extends BaseController { .setModelNo(modelNo) .setWorkbenchId(workbenchId) .setWorkbenchNo(workbenchNo) - .setPackageId(materialId) - .setMaterialNo(materialNo) + .setPackageOrderNo(packageVO.getOrderNo()) + .setPackageId(packageVO.getId()) + .setPackageNo(materialNo) + .setPackageDesc(packageVO.getName()) .setDeliveryDate(expectDeliveryDate) .setExternalOrderNo(poNum) .setRowNo(rowNo) @@ -1092,6 +1092,7 @@ public class StructuralPackageOrderController extends BaseController { } else { list.forEach(item -> { item.setTray(generateTray(item.getPackageId(), item.getNum(), item.getTransportNum())); + item.setWeight(item.getTray().getItems().stream().map(TrayItemVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add)); }); return ApiResult.success(list); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java index 5771e9b3..4b879021 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/StructuralPackageOrderImportDTO.java @@ -10,10 +10,17 @@ import java.math.BigDecimal; @Accessors(chain = true) public class StructuralPackageOrderImportDTO { + private String packageOrderNo; + /** * 钢构包料号 */ - private String materialNo; + private String packageNo; + + /** + * 钢构包描述 + */ + private String packageDesc; /** * 钢构包id @@ -55,6 +62,12 @@ public class StructuralPackageOrderImportDTO { */ private String workbenchNo; + private String workbenchCode; + + public String getWorkbenchCode() { + return modelNo + workbenchNo; + } + /** * 期望交期 */ @@ -75,6 +88,11 @@ public class StructuralPackageOrderImportDTO { */ private BigDecimal num; + /** + * 总重 + */ + private BigDecimal weight; + /** * 未收货数量 */