报工

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/ItemRequisitionController.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutDO;
 import cn.iocoder.yudao.module.mes.controller.admin.feedingrecord.vo.FeedingRecordRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionDetailRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionPageReqVO;
@@ -16,10 +17,14 @@ import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequi
 import cn.iocoder.yudao.module.mes.dal.dataobject.itemrequisition.ItemRequisitionDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.itemrequisition.ItemRequisitionDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.orgworker.OrgWorkerDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.orgworker.OrgWorkerMapper;
 import cn.iocoder.yudao.module.mes.service.itemrequisition.ItemRequisitionService;
 import cn.iocoder.yudao.module.mes.service.organization.OrganizationService;
 import cn.iocoder.yudao.module.mes.service.plan.PlanService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -34,6 +39,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -51,6 +57,10 @@ public class ItemRequisitionController {
     private PlanService planService;
     @Resource
     private OrganizationService organizationService;
+    @Resource
+    private AdminUserApi adminUserApi;
+    @Resource
+    private OrgWorkerMapper workerMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建生产领料")
@@ -101,9 +111,15 @@ public class ItemRequisitionController {
                 convertSet(list, ItemRequisitionDO::getFeedingPipeline));
         Map<Long, PlanDO> map = planService.getPlanMap(
                 convertSet(list, ItemRequisitionDO::getPlanId));
+        // 1.4 领料员信息
+        Map<Long, AdminUserRespDTO> workerMap = adminUserApi.getUserMap(
+                convertSet(list, ItemRequisitionDO::getWorkerId));
         return BeanUtils.toBean(list, ItemRequisitionRespVO.class, item -> {
             MapUtils.findAndThen(map, item.getPlanId(), plan -> item.setPlanCode(plan.getCode()));
             MapUtils.findAndThen(organizationMap, item.getFeedingPipeline(), organization -> item.setFeedingPipelineName(organization.getName()));
+            MapUtils.findAndThen(workerMap, item.getWorkerId(),
+                    //如果这个org在orgWorkMap里面则根据org的workerId去userMap找到对应的人名
+                    user -> item.setWorkerName(user.getUsername()));
         });
     }
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/vo/ItemRequisitionRespVO.java

@@ -57,6 +57,10 @@ public class ItemRequisitionRespVO {
     @Schema(description = "领料人ID", example = "15546")
     private Long workerId;
 
+    @Schema(description = "领料人", example = "15546")
+    @ExcelProperty("领料人")
+    private String workerName;
+
     @Schema(description = "制浆线")
     private Long feedingPipeline;
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/vo/ItemRequisitionSaveReqVO.java

@@ -44,7 +44,7 @@ public class ItemRequisitionSaveReqVO {
     @Schema(description = "领料人ID", example = "15546")
     private Long workerId;
     @Schema(description = "制浆线")
-    private String feedingPipeline;
+    private Long feedingPipeline;
 
     @Schema(description = "生产线")
     private Long pipeline;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java

@@ -104,6 +104,8 @@ public class PlanServiceImpl implements PlanService {
             itemRequisitionDetails.add(detailDO);
         }
         ItemRequisitionSaveReqVO saveReqVO = new ItemRequisitionSaveReqVO();
+        saveReqVO.setFeedingPipeline(createReqVO.getFeedingPipeline());
+        saveReqVO.setWorkerId(createReqVO.getWorkerId());
         saveReqVO.setItemRequisitionDetails(itemRequisitionDetails);
         saveReqVO.setStatus(ItemRequisitionStatusEnum.下达.getValue());
         if (saveReqVO.getRequisitionDate() == null)
@@ -118,6 +120,9 @@ public class PlanServiceImpl implements PlanService {
         plan.setStartTime(LocalDateTime.now());
         plan.setRequisitionId(id);
         planMapper.insert(plan);
+        saveReqVO.setPlanId(plan.getId());
+        saveReqVO.setId(id);
+        itemRequisitionService.updateItemRequisition(saveReqVO);
         return plan.getId();
     }