diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/OrderDeclare.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/OrderDeclare.java index 232656bc..8acb8e6d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/OrderDeclare.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/OrderDeclare.java @@ -84,6 +84,10 @@ public class OrderDeclare extends BaseEntity { @Schema(description = "状态名称") private String podStatusName; + @TableField(exist = false) + @Schema(description = "申报人") + private String createUserName; + @TableField(exist = false) @Schema(description = "库存部门") private String deptNo; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DeductionPreserveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DeductionPreserveController.java index 9cb51061..13864087 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DeductionPreserveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DeductionPreserveController.java @@ -21,6 +21,8 @@ import org.springblade.desk.produce.pojo.vo.DeductionPreserveVO; import org.springblade.desk.produce.service.IDeductionPreserveService; import org.springblade.desk.produce.service.IOrderDeclareService; import org.springblade.erpdata.pojo.vo.QueryBatchVO; +import org.springblade.system.cache.UserCache; +import org.springblade.system.pojo.entity.User; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -74,6 +76,8 @@ public class DeductionPreserveController extends BladeController { IPage page = orderDeclareService.page(Condition.getPage(query), wrapper); for (OrderDeclare pageRecord : page.getRecords()) { pageRecord.setPodStatusName(OrderDeclare.podStatusMap.get(pageRecord.getPodStatus())); + User user = UserCache.getUser(pageRecord.getCreateUser()); + pageRecord.setCreateUserName(user == null ? "" : user.getName()); } return R.data(page); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java index eac490bc..16ca72b5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/OrderDeclareServiceImpl.java @@ -41,10 +41,10 @@ public class OrderDeclareServiceImpl extends BaseServiceImpl queryBatchVOList = new ArrayList<>(); - QueryBatchVO queryBatchVO = new QueryBatchVO(); - queryBatchVO.setDeptno("4300"); - queryBatchVO.setInvalqty("2"); - queryBatchVO.setInvqty("2"); - queryBatchVO.setPrtlotno("JHT"); - queryBatchVO.setPrtno("21E8-004-17506-E9"); - queryBatchVO.setSchemer("430010063"); - queryBatchVO.setSplcode("L20425030871"); - queryBatchVO.setSplydate("2025-04-01 13:33:27"); - queryBatchVO.setWarctlr("43002046"); - queryBatchVO.setWarlocno("LJ0000125274"); - queryBatchVO.setWarno("4300LJ"); - queryBatchVOList.add(queryBatchVO); - - QueryBatchVO queryBatchVO1 = new QueryBatchVO(); - queryBatchVO1.setDeptno("4300"); - queryBatchVO1.setInvalqty("6"); - queryBatchVO1.setInvqty("17"); - queryBatchVO1.setPrtlotno("JHT"); - queryBatchVO1.setPrtno("21E8-004-17506-E9"); - queryBatchVO1.setSchemer("430010063"); - queryBatchVO1.setSplcode("L20426040115"); - queryBatchVO1.setSplydate("2025-04-15 19:19:33"); - queryBatchVO1.setWarctlr("43002046"); - queryBatchVO1.setWarlocno("LJ0000204247"); - queryBatchVO1.setWarno("4300LJ"); - queryBatchVOList.add(queryBatchVO1); - - QueryBatchVO queryBatchVO2 = new QueryBatchVO(); - queryBatchVO2.setDeptno("4300"); - queryBatchVO2.setInvalqty("0"); - queryBatchVO2.setInvqty("3"); - queryBatchVO2.setPrtlotno("JII"); - queryBatchVO2.setPrtno("21E8-004-17506-E9"); - queryBatchVO2.setSchemer("430010063"); - queryBatchVO2.setSplcode("L20425030871"); - queryBatchVO2.setSplydate("2025-04-01 13:33:27"); - queryBatchVO2.setWarctlr("43002046"); - queryBatchVO2.setWarlocno("LJ0000125274"); - queryBatchVO2.setWarno("4300LJ"); - queryBatchVOList.add(queryBatchVO2); - return queryBatchVOList; -// return erpDataProduceClient.queryBatch(partCode).getData(); + return erpDataProduceClient.queryBatch(partCode).getData(); } @Override @@ -109,11 +66,11 @@ public class OrderDeclareServiceImpl extends BaseServiceImpl