feat():app后端代码提交

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java

@@ -2,9 +2,13 @@ package jnpf.service;
 
 import jnpf.model.yysdaypackage.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jnpf.model.yysdaywork.ConfirmRequest;
+import jnpf.model.yysdaywork.ConfirmResponse;
 
 /**
  * yysDayPackage
@@ -32,4 +36,13 @@ public interface YysDayPackageService extends IService<YysDayPackageEntity> {
 
     void saveOrUpdate(YysDayPackageForm yysDayPackageForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 报工确认列表-app
+     *
+     * @param groupName
+     * @param request
+     * @param requisitonMap
+     * @return
+     */
+    List<ConfirmResponse> queryList(String groupName, ConfirmRequest request, Map<String, List<YysRequisitionReportEntity>> requisitonMap);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayWorkService.java

@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.yysdaywork.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -32,4 +34,19 @@ public interface YysDayWorkService extends IService<YysDayWorkEntity> {
 
     void saveOrUpdate(YysDayWorkForm yysDayWorkForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 报工确认列表-app
+     *
+     * @param request
+     * @return
+     */
+    List<ConfirmResponse> queryList(ConfirmRequest request);
+
+    /**
+     * 报工确认
+     *
+     * @param request
+     * @return
+     */
+    String sure(ConfirmResponse request);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysGroupService.java

@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.yysgroup.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -32,4 +34,11 @@ public interface YysGroupService extends IService<YysGroupEntity> {
 
     void saveOrUpdate(YysGroupForm yysGroupForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 查询属于生产还是包装线
+     *
+     * @param userId
+     * @return
+     */
+    YysGroupEntity queryType(String userId);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java

@@ -1,23 +1,37 @@
 package jnpf.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.collect.Lists;
 import jnpf.entity.*;
 import jnpf.mapper.YysDayPackageMapper;
+import jnpf.model.yysdaywork.ConfirmRequest;
+import jnpf.model.yysdaywork.ConfirmResponse;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.yysdaypackage.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -25,13 +39,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * yysDayPackage
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -46,11 +64,20 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
     @Autowired
     private UserProvider userProvider;
 
+    @Autowired
+    private YysDeviceDataService yysDeviceDataService;
+
+    @Autowired
+    private YysPackageReportService yysPackageReportService;
+
     @Override
     public List<YysDayPackageEntity> getList(YysDayPackagePagination yysDayPackagePagination) {
         return getTypeList(yysDayPackagePagination, yysDayPackagePagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
     public List<YysDayPackageEntity> getTypeList(YysDayPackagePagination yysDayPackagePagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -245,27 +272,34 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
             return this.list(yysDayPackageQueryWrapper);
         }
     }
+
     @Override
     public YysDayPackageEntity getInfo(String id) {
         QueryWrapper<YysDayPackageEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(YysDayPackageEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(YysDayPackageEntity entity) {
         this.save(entity);
     }
+
     @Override
     public boolean update(String id, YysDayPackageEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
     public void delete(YysDayPackageEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(YysDayPackageForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -299,8 +333,10 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
         }
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param yysDayPackageForm
      * @return
@@ -323,4 +359,69 @@ public class YysDayPackageServiceImpl extends ServiceImpl<YysDayPackageMapper, Y
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public List<ConfirmResponse> queryList(String groupName, ConfirmRequest request, Map<String, List<YysRequisitionReportEntity>> requisitonMap) {
+        //查询所有待确认的数据
+        LambdaQueryWrapper<YysDayPackageEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysDayPackageEntity::getIsConfirm, request.getFlag());
+        List<YysDayPackageEntity> root = this.list(wrapper);
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(root)) {
+            return Collections.emptyList();
+        }
+        //构建查询条件
+        Set<String> deviceCodes = root.stream().map(YysDayPackageEntity::getDeviceCode).collect(Collectors.toSet());
+        Set<Date> dates = root.stream().map(YysDayPackageEntity::getManufactureTime).collect(Collectors.toSet());
+        //数采表符合条件的数据
+        LambdaQueryWrapper<YysDeviceDataEntity> queryWrapper = new LambdaQueryWrapper<>(YysDeviceDataEntity.class);
+        queryWrapper.in(YysDeviceDataEntity::getProductionTime, dates);
+        queryWrapper.in(YysDeviceDataEntity::getProductionLine, deviceCodes);
+        List<YysDeviceDataEntity> data = yysDeviceDataService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(data)) {
+            return Collections.emptyList();
+        }
+        //数采数据根据生产时间和产线分组 相加当日生产数量
+        Map<String, Integer> resultMap = data.stream()
+                .collect(Collectors.groupingBy(
+                        item -> item.getProductionTime() + "-" + item.getProductionLine(),
+                        Collectors.mapping(
+                                item -> Integer.parseInt(item.getDayNum()),
+                                Collectors.summingInt(i -> i)
+                        )
+                ));
+        //再将工单分组
+        Map<String, List<YysDayPackageEntity>> rootMap = root.stream()
+                .collect(Collectors.groupingBy(obj -> String.join("-", obj.getManufactureTime().toString(), obj.getDeviceCode())));
+        //查询报工确认数据
+        List<YysPackageReportEntity> reportEntityList = yysPackageReportService.list();
+        Map<String, List<YysPackageReportEntity>> packMap = reportEntityList.stream().collect(Collectors.groupingBy(YysPackageReportEntity::getWorkId));
+        //进行平均分配
+        List<ConfirmResponse> result = Lists.newArrayList();
+        for (Map.Entry<String, List<YysDayPackageEntity>> entry : rootMap.entrySet()) {
+            if (resultMap.containsKey(entry.getKey())) {
+                Integer total = resultMap.get(entry.getKey());
+                List<YysDayPackageEntity> collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayPackageEntity::getSort)).collect(Collectors.toList());
+                for (YysDayPackageEntity packageEntity : collected) {
+                    ConfirmResponse confirmResponse = BeanUtil.copyProperties(packageEntity, ConfirmResponse.class);
+                    confirmResponse.setGroupName(groupName);
+                    if (packMap.containsKey(packageEntity.getId())) {
+                        confirmResponse.setPackageReportList(packMap.get(packageEntity.getId()));
+                    }
+                    if (requisitonMap.containsKey(packageEntity.getId())) {
+                        confirmResponse.setRequisitionReportList(requisitonMap.get(packageEntity.getId()));
+                    }
+                    if (Integer.parseInt(packageEntity.getPlanNumber()) <= total) {
+                        confirmResponse.setIsConfirmNums(packageEntity.getPlanNumber());
+                        total -= Integer.parseInt(packageEntity.getPlanNumber());
+                        result.add(confirmResponse);
+                    } else {
+                        confirmResponse.setIsConfirmNums(total.toString());
+                        result.add(confirmResponse);
+                        break;
+                    }
+                }
+            }
+        }
+        return result;
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java

@@ -1,5 +1,9 @@
 package jnpf.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.collect.Lists;
+import jnpf.base.ActionResult;
 import jnpf.entity.*;
 import jnpf.mapper.YysDayWorkMapper;
 import jnpf.service.*;
@@ -30,6 +34,7 @@ import jnpf.model.QueryModel;
 import java.util.stream.Collectors;
 
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -62,6 +67,24 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
     @Autowired
     private UserProvider userProvider;
 
+    @Autowired
+    private YysGroupService yysGroupService;
+
+    @Autowired
+    private YysProdReportService yysProdReportService;
+
+    @Autowired
+    private YysPackageReportService yysPackageReportService;
+
+    @Autowired
+    private YysDayPackageService yysDayPackageService;
+
+    @Autowired
+    private YysDeviceDataService yysDeviceDataService;
+
+    @Autowired
+    private YysRequisitionReportService yysRequisitionReportService;
+
     @Override
     public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
         return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
@@ -409,4 +432,114 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public List<ConfirmResponse> queryList(ConfirmRequest request) {
+        //根据登陆人判断属于生产还是包装线
+        YysGroupEntity yysGroupEntity = yysGroupService.queryType(userProvider.get().getUserId());
+        if (ObjectUtil.isNull(yysGroupEntity)) {
+            return Collections.emptyList();
+        }
+        //领料上报
+        List<YysRequisitionReportEntity> list = yysRequisitionReportService.list();
+        Map<String, List<YysRequisitionReportEntity>> requisitonMap = list.stream().collect(Collectors.groupingBy(YysRequisitionReportEntity::getWorkId));
+        if ("2".equals(yysGroupEntity.getGroupType())) {
+            return yysDayPackageService.queryList(yysGroupEntity.getGroupName(), request, requisitonMap);
+        }
+        //查询所有待确认的数据
+        LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysDayWorkEntity::getIsConfirm, request.getFlag());
+        List<YysDayWorkEntity> root = this.list(wrapper);
+        if (CollectionUtils.isEmpty(root)) {
+            return Collections.emptyList();
+        }
+        //构建查询条件
+        Set<String> deviceCodes = root.stream().map(YysDayWorkEntity::getDeviceCode).collect(Collectors.toSet());
+        Set<Date> dates = root.stream().map(YysDayWorkEntity::getManufactureTime).collect(Collectors.toSet());
+        //数采表符合条件的数据
+        LambdaQueryWrapper<YysDeviceDataEntity> queryWrapper = new LambdaQueryWrapper<>(YysDeviceDataEntity.class);
+        queryWrapper.in(YysDeviceDataEntity::getProductionTime, dates);
+        queryWrapper.in(YysDeviceDataEntity::getProductionLine, deviceCodes);
+        List<YysDeviceDataEntity> data = yysDeviceDataService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(data)) {
+            return Collections.emptyList();
+        }
+        //数采数据根据生产时间和产线分组 相加当日生产数量
+        Map<String, Integer> resultMap = data.stream()
+                .collect(Collectors.groupingBy(
+                        item -> item.getProductionTime() + "-" + item.getProductionLine(),
+                        Collectors.mapping(
+                                item -> Integer.parseInt(item.getDayNum()),
+                                Collectors.summingInt(i -> i)
+                        )
+                ));
+        //再将工单分组
+        Map<String, List<YysDayWorkEntity>> rootMap = root.stream()
+                .collect(Collectors.groupingBy(obj -> String.join("-", obj.getManufactureTime().toString(), obj.getDeviceCode())));
+        //查询报工确认数据
+        List<YysProdReportEntity> reportEntityList = yysProdReportService.list();
+        Map<String, List<YysProdReportEntity>> prodMap = reportEntityList.stream().collect(Collectors.groupingBy(YysProdReportEntity::getWorkId));
+        //进行平均分配
+        List<ConfirmResponse> result = Lists.newArrayList();
+        for (Map.Entry<String, List<YysDayWorkEntity>> entry : rootMap.entrySet()) {
+            if (resultMap.containsKey(entry.getKey())) {
+                Integer total = resultMap.get(entry.getKey());
+                List<YysDayWorkEntity> collected = entry.getValue().stream().sorted(Comparator.comparing(YysDayWorkEntity::getSort)).collect(Collectors.toList());
+                for (YysDayWorkEntity dayWork : collected) {
+                    ConfirmResponse confirmResponse = BeanUtil.copyProperties(dayWork, ConfirmResponse.class);
+                    confirmResponse.setGroupName(yysGroupEntity.getGroupName());
+                    if (prodMap.containsKey(dayWork.getId())) {
+                        confirmResponse.setProdReportList(prodMap.get(dayWork.getId()));
+                    }
+                    if (requisitonMap.containsKey(dayWork.getId())) {
+                        confirmResponse.setRequisitionReportList(requisitonMap.get(dayWork.getId()));
+                    }
+                    if (Integer.parseInt(dayWork.getPlanNumber()) <= total) {
+                        confirmResponse.setIsConfirmNums(dayWork.getPlanNumber());
+                        total -= Integer.parseInt(dayWork.getPlanNumber());
+                        result.add(confirmResponse);
+                    } else {
+                        confirmResponse.setIsConfirmNums(total.toString());
+                        result.add(confirmResponse);
+                        break;
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public String sure(ConfirmResponse request) {
+        boolean prodResult = false;
+        boolean packResult = false;
+        boolean requisitionResult = false;
+        if (CollectionUtils.isNotEmpty(request.getProdReportList())) {
+            for (YysProdReportEntity entity : request.getProdReportList()) {
+                BeanUtil.copyProperties(request, entity);
+                entity.setWorkId(request.getId());
+                entity.setStatus("1");
+            }
+            prodResult = yysProdReportService.saveBatch(request.getProdReportList());
+        }
+        if (CollectionUtils.isNotEmpty(request.getPackageReportList())) {
+            for (YysPackageReportEntity entity : request.getPackageReportList()) {
+                BeanUtil.copyProperties(request, entity);
+                entity.setWorkId(request.getId());
+                entity.setStatus("1");
+            }
+            packResult = yysPackageReportService.saveBatch(request.getPackageReportList());
+        }
+        if (CollectionUtils.isNotEmpty(request.getRequisitionReportList())) {
+            for (YysRequisitionReportEntity entity : request.getRequisitionReportList()) {
+                BeanUtil.copyProperties(request, entity);
+                entity.setWorkId(request.getId());
+            }
+            requisitionResult = yysRequisitionReportService.saveBatch(request.getRequisitionReportList());
+        }
+        if ((prodResult && requisitionResult) || (packResult && requisitionResult)) {
+            return "确认成功";
+        }
+        return "确认失败";
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysGroupServiceImpl.java

@@ -1,23 +1,33 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jnpf.entity.*;
 import jnpf.mapper.YysGroupMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.yysgroup.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -25,13 +35,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * yysGroup
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -50,7 +64,10 @@ public class YysGroupServiceImpl extends ServiceImpl<YysGroupMapper, YysGroupEnt
     public List<YysGroupEntity> getList(YysGroupPagination yysGroupPagination) {
         return getTypeList(yysGroupPagination, yysGroupPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
     public List<YysGroupEntity> getTypeList(YysGroupPagination yysGroupPagination, String dataType) {
         String userId = userProvider.get().getUserId();
@@ -240,28 +257,35 @@ public class YysGroupServiceImpl extends ServiceImpl<YysGroupMapper, YysGroupEnt
             return this.list(yysGroupQueryWrapper);
         }
     }
+
     @Override
     public YysGroupEntity getInfo(String id) {
         QueryWrapper<YysGroupEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(YysGroupEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
     public void create(YysGroupEntity entity) {
         this.save(entity);
     }
+
     @Override
     public boolean update(String id, YysGroupEntity entity) {
         entity.setDeleteTime(DateUtil.getNowDate());
         return this.updateById(entity);
     }
+
     @Override
     public void delete(YysGroupEntity entity) {
         if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
     public String checkForm(YysGroupForm form, int i) {
         boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -276,8 +300,10 @@ public class YysGroupServiceImpl extends ServiceImpl<YysGroupMapper, YysGroupEnt
         }
         return countRecover;
     }
+
     /**
      * 新增修改数据(事务回滚)
+     *
      * @param id
      * @param yysGroupForm
      * @return
@@ -304,4 +330,15 @@ public class YysGroupServiceImpl extends ServiceImpl<YysGroupMapper, YysGroupEnt
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public YysGroupEntity queryType(String userId) {
+        LambdaQueryWrapper<YysGroupEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysGroupEntity::getLeader, userId);
+        List<YysGroupEntity> list = this.list(wrapper);
+        if (CollectionUtils.isEmpty(list) || list.size() > 1) {
+            return new YysGroupEntity();
+        }
+        return list.get(0);
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayWorkController.java

@@ -1,59 +1,49 @@
 package jnpf.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.xuyanwu.spring.file.storage.FileInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jnpf.base.ActionResult;
 import jnpf.base.UserInfo;
-import jnpf.exception.DataException;
-import jnpf.permission.entity.UserEntity;
-import jnpf.service.*;
-import jnpf.entity.*;
-import jnpf.util.*;
-import jnpf.model.yysdaywork.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.*;
-
-import jnpf.annotation.JnpfField;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.base.util.VisualUtils;
+import jnpf.base.vo.DownloadVO;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
-import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
-import jnpf.base.entity.ProvinceEntity;
-
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-import jnpf.engine.entity.FlowTaskEntity;
-import jnpf.exception.WorkFlowException;
-import org.springframework.web.multipart.MultipartFile;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-
-import java.io.File;
-
+import jnpf.entity.YysDayWorkEntity;
+import jnpf.entity.YysGroupEntity;
+import jnpf.model.visualJson.config.HeaderModel;
+import jnpf.model.yysdaywork.*;
 import jnpf.onlinedev.model.ExcelImFieldModel;
+import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
 import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
 import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
-import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
 import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
-import cn.xuyanwu.spring.file.storage.FileInfo;
+import jnpf.service.YysDayPackageService;
+import jnpf.service.YysDayWorkService;
+import jnpf.service.YysGroupService;
+import jnpf.util.*;
 import lombok.Cleanup;
-import jnpf.model.visualJson.config.HeaderModel;
-import jnpf.base.model.ColumnDataModel;
-import jnpf.base.util.VisualUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * yysDayWork
@@ -78,7 +68,6 @@ public class YysDayWorkController {
     @Autowired
     private YysDayWorkService yysDayWorkService;
 
-
     @Autowired
     private ConfigValueUtil configValueUtil;
 
@@ -550,4 +539,20 @@ public class YysDayWorkController {
         return ActionResult.success(yysDayWorkMap);
     }
 
+    @Operation(summary = "报工确认列表-app")
+    @PostMapping("confirm")
+    public ActionResult confirm(@RequestBody ConfirmRequest request) {
+        return ActionResult.success(yysDayWorkService.queryList(request));
+    }
+
+    @Operation(summary = "报工确认-app")
+    @PostMapping("sure")
+    public ActionResult sure(@RequestBody ConfirmResponse request) {
+        String result = yysDayWorkService.sure(request);
+        if (result.contains("成功")) {
+            return ActionResult.success(result);
+        }
+        return ActionResult.fail(result);
+    }
+
 }

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayPackageEntity.java

@@ -40,6 +40,8 @@ public class YysDayPackageEntity  {
     private String measurementUnit;
     @TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private String planNumber;
+    @TableField(value = "IS_CONFIRM" , updateStrategy = FieldStrategy.IGNORED)
+    private String isConfirm;
     @TableField("F_CREATOR_TIME")
     private Date creatorTime;
     @TableField("F_CREATOR_USER_ID")

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayWorkEntity.java

@@ -46,6 +46,8 @@ public class YysDayWorkEntity  {
     private String productionStatus;
     @TableField("DELIVERY_TIME")
     private Date deliveryTime;
+    @TableField(value = "IS_CONFIRM" , updateStrategy = FieldStrategy.IGNORED)
+    private String isConfirm;
     @TableField("F_CREATOR_TIME")
     private Date creatorTime;
     @TableField("F_CREATOR_USER_ID")

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysPackageReportEntity.java

@@ -17,6 +17,8 @@ import java.math.BigDecimal;
 public class YysPackageReportEntity  {
     @TableId(value ="ID"  )
     private String id;
+    @TableField(value = "WORK_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String workId;
     @TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
     private Date manufactureTime;
     @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysProdReportEntity.java

@@ -17,6 +17,8 @@ import java.math.BigDecimal;
 public class YysProdReportEntity  {
     @TableId(value ="ID"  )
     private String id;
+    @TableField(value = "WORK_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String workId;
     @TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
     private Date manufactureTime;
     @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysRequisitionReportEntity.java

@@ -16,6 +16,8 @@ import java.util.Date;
 public class YysRequisitionReportEntity  {
     @TableId(value ="ID"  )
     private String id;
+    @TableField(value = "WORK_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String workId;
     @TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
     private Date manufactureTime;
     @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmRequest.java

@@ -0,0 +1,22 @@
+package jnpf.model.yysdaywork;
+
+import lombok.Data;
+
+@Data
+public class ConfirmRequest {
+    /**
+     * 工单id
+     */
+    private String workId;
+
+    /**
+     * 产线名称
+     */
+    private String line;
+
+    /**
+     * 查询待确认/已确认标志
+     */
+    private String flag;
+
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/ConfirmResponse.java

@@ -0,0 +1,64 @@
+package jnpf.model.yysdaywork;
+
+import jnpf.entity.YysPackageReportEntity;
+import jnpf.entity.YysProdReportEntity;
+import jnpf.entity.YysRequisitionReportEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ConfirmResponse {
+    private String id;
+    private String monthId;
+    private Date manufactureTime;
+    private String deviceCode;
+    private String deviceName;
+    private Integer sort;
+    private String post;
+    private String startTime;
+    private String endTime;
+    private String productCode;
+    private String productName;
+    private String models;
+    private String measurementUnit;
+    private String planNumber;
+    private String productionStatus;
+    private Date deliveryTime;
+    /**
+     * 机采数量
+     */
+    private String acquisitionNum;
+    /**
+     * 合格数量
+     */
+    private String defectiveNum;
+    /**
+     * 次品数量
+     */
+    private String qualifiedNum;
+    /**
+     * 待确认数量
+     */
+    private String isConfirmNums;
+
+    /**
+     * 报工班组
+     */
+    private String groupName;
+
+    /**
+     * 生产报工确认列表
+     */
+    List<YysProdReportEntity> prodReportList;
+    /**
+     * 包装报工确认列表
+     */
+    List<YysPackageReportEntity> packageReportList;
+    /**
+     * 领料上报记录
+     */
+    List<YysRequisitionReportEntity> requisitionReportList;
+
+}