【app包装报工】提交保存

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskreport/TaskReportDO.java

@@ -80,6 +80,8 @@ public class TaskReportDO extends BaseDO {
      * 状态,1表示正常，2表示禁用
      */
     private Integer status;
+
+    private Long materialId;
     /**
      * 报工工时
      */

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskreport/TaskReportServiceImpl.java

@@ -192,13 +192,30 @@ public class TaskReportServiceImpl implements TaskReportService {
             throw exception(TASK_REPORT_ASSEMBLE_GENERATE_REPEAT, JSON.toJSONString(existsReportList.stream().map(TaskReportDO::getAssembleCode).collect(Collectors.joining(","))));
         }
 
+
+
         LocalDateTime now = LocalDateTime.now();
         for (TaskReportAssembleVO vo : taskReportAssembleVOList) {
-            // 入库
+
+            List<SaleOrderPackingClauseDetailDO> saleOrderPackingClauseDOS =
+                    saleOrderPackingClauseDetailMapper.selectListByClauseId(Long.valueOf(vo.getAssembleCode().split("-")[1]));
+
+            if(CollUtil.isNotEmpty(saleOrderPackingClauseDOS)){
+
+                saleOrderPackingClauseDOS.forEach(co->{
                     TaskReportDO reportDO = BeanUtils.toBean(vo, TaskReportDO.class);
-            reportDO.setReportTime(now)
-                    .setHasReport(YesOrNoEnum.Y.getCode());
+                    reportDO.setReportTime(now).setHasReport(YesOrNoEnum.Y.getCode());
+                    reportDO.setMaterialId(co.getMaterialId()).setAmount(co.getAmount());
+
                     taskReportMapper.insert(reportDO);
+                });
+
+            }
+//            // 入库
+//            TaskReportDO reportDO = BeanUtils.toBean(vo, TaskReportDO.class);
+//            reportDO.setReportTime(now)
+//                    .setHasReport(YesOrNoEnum.Y.getCode());
+//            taskReportMapper.insert(reportDO);
 
 //            TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(reportDO.getDispatchId());
 //            ProjectOrderDO ProjectOrderDO = projectOrderMapper.selectById(taskDispatchDO.getProjectId());

sql/v1.0.0/2.business/1.structure.sql

@@ -494,3 +494,5 @@ CREATE TABLE `tplus_storage_out` (
                                      `is_send` int(2) DEFAULT NULL COMMENT '是否推送',
                                      PRIMARY KEY (`id`)
 ) ENGINE=InnoDB COMMENT='用友生产领料表';
+
+alter table pro_task_report add column `material_id` bigint(20) DEFAULT NULL COMMENT '产品id';