feat():重构生产报工确认

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysProdReportMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-08-07
+ * 日期： 2024-08-19
  */
 public interface YysProdReportMapper extends BaseMapper<YysProdReportEntity> {
 

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

@@ -2,9 +2,7 @@ package jnpf.service;
 
 import jnpf.model.yysprodreport.*;
 import jnpf.entity.*;
-
 import java.util.*;
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -13,7 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-08-07
+ * 日期： 2024-08-19
  */
 public interface YysProdReportService extends IService<YysProdReportEntity> {
     List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination);

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

@@ -1,58 +1,42 @@
 package jnpf.service.impl;
 
-import jnpf.entity.*;
-import jnpf.mapper.YysProdReportMapper;
-import jnpf.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.model.yysprodreport.*;
-
-import java.math.BigDecimal;
-
 import cn.hutool.core.util.ObjectUtil;
-import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.concurrent.CompletableFuture;
-import java.util.regex.Pattern;
-
-import jnpf.model.QueryModel;
-
-import java.util.stream.Collectors;
-
-import jnpf.base.model.ColumnDataModel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.database.model.superQuery.SuperJsonModel;
-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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.text.SimpleDateFormat;
-
-import jnpf.util.*;
-
-import java.util.*;
-
 import jnpf.base.UserInfo;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import jnpf.entity.YysProdReportEntity;
+import jnpf.mapper.YysProdReportMapper;
+import jnpf.model.QueryModel;
+import jnpf.model.yysprodreport.YysProdReportConstant;
+import jnpf.model.yysprodreport.YysProdReportForm;
+import jnpf.model.yysprodreport.YysProdReportPagination;
 import jnpf.permission.entity.UserEntity;
+import jnpf.service.YysDayLogsService;
+import jnpf.service.YysProdReportService;
+import jnpf.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 /**
  * yysProdReport
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * 作者： JNPF开发平台组
- * 日期： 2024-08-07
+ * 日期： 2024-08-19
  */
 @Service
 @Slf4j
@@ -70,10 +54,7 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
     public List<YysProdReportEntity> getList(YysProdReportPagination yysProdReportPagination){
         return getTypeList(yysProdReportPagination,yysProdReportPagination.getDataType());
     }
-
+    /** 列表查询 */
-    /**
-     * 列表查询
-     */
     @Override
     public List<YysProdReportEntity> getTypeList(YysProdReportPagination yysProdReportPagination,String dataType){
         String userId=userProvider.get().getUserId();
@@ -297,34 +278,27 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
             return this.list(yysProdReportQueryWrapper);
         }
     }
-
     @Override
     public YysProdReportEntity getInfo(String id){
         QueryWrapper<YysProdReportEntity> queryWrapper=new QueryWrapper<>();
         queryWrapper.lambda().eq(YysProdReportEntity::getId,id);
         return this.getOne(queryWrapper);
     }
-
     @Override
     public void create(YysProdReportEntity entity){
         this.save(entity);
     }
-
     @Override
     public boolean update(String id, YysProdReportEntity entity){
         return this.updateById(entity);
     }
-
     @Override
     public void delete(YysProdReportEntity entity){
         if(entity!=null){
             this.removeById(entity.getId());
         }
     }
-
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
-    /**
-     * 验证表单唯一字段，正则，非空 i-0新增-1修改
-     */
     @Override
     public String checkForm(YysProdReportForm form,int i) {
         boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
@@ -337,9 +311,6 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
                 if(StringUtil.isEmpty(form.getDeviceName())){
                     return "设备名称不能为空";
                 }
-        if (StringUtil.isEmpty(form.getProductCode())) {
-            return "产品编码不能为空";
-        }
                 if(StringUtil.isEmpty(form.getProductName())){
                     return "产品名称不能为空";
                 }
@@ -351,10 +322,8 @@ public class YysProdReportServiceImpl extends ServiceImpl<YysProdReportMapper, Y
                 }
         return countRecover;
     }
-
     /**
     * 新增修改数据(事务回滚)
-     *
     * @param id
     * @param yysProdReportForm
     * @return

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

@@ -280,7 +280,7 @@ public class YysRequisitionReportServiceImpl extends ServiceImpl<YysRequisitionR
                     QueryWrapper<YysRequisitionReportEntity> productNameWrapper=new QueryWrapper<>();
                     productNameWrapper.lambda().eq(YysRequisitionReportEntity::getProductName,form.getProductName());
                         //假删除标志
-                        productNameWrapper.lambda().isNull(YysRequisitionReportEntity::getDeletemark);
+                        productNameWrapper.lambda().isNull(YysRequisitionReportEntity::getDeleteMark);
                     if (isUp){
                         productNameWrapper.lambda().ne(YysRequisitionReportEntity::getId, id);
                     }

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

@@ -1,59 +1,39 @@
 package jnpf.controller;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+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.base.model.ColumnDataModel;
-import jnpf.permission.entity.UserEntity;
+import jnpf.base.util.VisualUtils;
-import jnpf.service.*;
+import jnpf.base.vo.DownloadVO;
-import jnpf.entity.*;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.entity.YysProdReportEntity;
+import jnpf.model.visualJson.config.HeaderModel;
+import jnpf.model.yysprodreport.YysProdReportConstant;
+import jnpf.model.yysprodreport.YysProdReportForm;
+import jnpf.model.yysprodreport.YysProdReportPagination;
+import jnpf.service.YysProdReportService;
 import jnpf.util.*;
-import jnpf.model.yysprodreport.*;
+import lombok.Cleanup;
 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.util.*;
-
-import jnpf.annotation.JnpfField;
-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 java.util.*;
-
-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.onlinedev.model.ExcelImFieldModel;
-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 lombok.Cleanup;
-import jnpf.model.visualJson.config.HeaderModel;
-import jnpf.base.model.ColumnDataModel;
-import jnpf.base.util.VisualUtils;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * yysProdReport
@@ -61,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-08-07
+ * @日期： 2024-08-19
  */
 @Slf4j
 @RestController
@@ -157,9 +137,6 @@ public class YysProdReportController {
                     case "deviceName":
                         entitys.add(new ExcelExportEntity("设备名称", "deviceName"));
                         break;
-                    case "sort":
-                        entitys.add(new ExcelExportEntity("顺序号", "sort"));
-                        break;
                     case "post":
                         entitys.add(new ExcelExportEntity("班次", "post"));
                         break;
@@ -205,6 +182,9 @@ public class YysProdReportController {
                     case "status":
                         entitys.add(new ExcelExportEntity("确认状态", "status"));
                         break;
+                    case "sort":
+                        entitys.add(new ExcelExportEntity("顺序号", "sort"));
+                        break;
                     default:
                         break;
                 }
@@ -361,7 +341,6 @@ public class YysProdReportController {
         if (entity != null) {
             //假删除
             entity.setDeleteMark(1);
-            entity.setDeleteTime(DateUtil.getNowDate());
             yysProdReportService.update(id, entity);
         }
         return ActionResult.success("删除成功");

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

@@ -10,17 +10,17 @@ import java.math.BigDecimal;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-08-07
+ * @日期： 2024-08-19
  */
 @Data
 @TableName("yys_prod_report")
 public class YysProdReportEntity  {
     @TableId(value ="ID"  )
     private String id;
-    @TableField(value = "WORK_ID" , updateStrategy = FieldStrategy.IGNORED)
+    @TableField("WORK_ID")
     private String workId;
     @TableField(value = "MANUFACTURE_TIME" , updateStrategy = FieldStrategy.IGNORED)
-    private Date manufactureTime;
+    private String manufactureTime;
     @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
     private String deviceCode;
     @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
@@ -29,7 +29,7 @@ public class YysProdReportEntity  {
     private Integer sort;
     @TableField(value = "POST" , updateStrategy = FieldStrategy.IGNORED)
     private String post;
-    @TableField(value = "START_TIME" , updateStrategy = FieldStrategy.IGNORED)
+    @TableField("START_TIME")
     private String startTime;
     @TableField(value = "END_TIME" , updateStrategy = FieldStrategy.IGNORED)
     private String endTime;

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysprodreport/YysProdReportForm.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-08-07
+ * @日期： 2024-08-19
  */
 @Data
 public class YysProdReportForm  {
@@ -29,12 +29,9 @@ public class YysProdReportForm  {
     /** 设备名称 **/
     @JsonProperty("deviceName")
     private String deviceName;
-    /** 顺序号 **/
-    @JsonProperty("sort")
-    private BigDecimal sort;
     /** 班次 **/
     @JsonProperty("post")
-    private Object post;
+    private String post;
     /** 开始时间 **/
     @JsonProperty("startTime")
     private String startTime;
@@ -77,4 +74,7 @@ public class YysProdReportForm  {
     /** 确认状态 **/
     @JsonProperty("status")
     private Object status;
+    /** 顺序号 **/
+    @JsonProperty("sort")
+    private BigDecimal sort;
 }

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysprodreport/YysProdReportPagination.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-08-07
+ * @日期： 2024-08-19
  */
 @Data
 public class YysProdReportPagination extends Pagination {

jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/Detail.vue

@@ -3,8 +3,7 @@
         <div class="JNPF-preview-main">
             <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
             <div class="JNPF-common-page-header">
-        <el-page-header @back="goBack"
+                <el-page-header @back="goBack" content="详情" />
-                        content="详情"/>
                 <div class="options">
                     <el-button @click="goBack">取 消</el-button>
                 </div>
@@ -13,134 +12,104 @@
                 <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
                     <template v-if="!loading">
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="生产日期"  
+                            <jnpf-form-tip-item label="生产日期" prop="manufactureTime">
- prop="manufactureTime"  >
                                 <p>{{ dataForm.manufactureTime }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="设备编码"  
+                            <jnpf-form-tip-item label="设备编码" prop="deviceCode">
- prop="deviceCode"  >
                                 <p>{{ dataForm.deviceCode }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="设备名称"  
+                            <jnpf-form-tip-item label="设备名称" prop="deviceName">
- prop="deviceName"  >
                                 <p>{{ dataForm.deviceName }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="班次"  
+                            <jnpf-form-tip-item label="班次" prop="post">
- prop="post"  >
                                 <p>{{ dataForm.post }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="开始时间"  
+                            <jnpf-form-tip-item label="开始时间" prop="startTime">
- prop="steatTime"  >
+                                <p>{{ dataForm.startTime }}</p>
-                        <p>{{dataForm.steatTime}}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="结束时间"  
+                            <jnpf-form-tip-item label="结束时间" prop="endTime">
- prop="endTime"  >
                                 <p>{{ dataForm.endTime }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="产品编码"  
+                            <jnpf-form-tip-item label="产品编码" prop="productCode">
- prop="productCode"  >
                                 <p>{{ dataForm.productCode }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="产品名称"  
+                            <jnpf-form-tip-item label="产品名称" prop="productName">
- prop="productName"  >
                                 <p>{{ dataForm.productName }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="规格型号"  
+                            <jnpf-form-tip-item label="规格型号" prop="models">
- prop="models"  >
                                 <p>{{ dataForm.models }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="计量单位"  
+                            <jnpf-form-tip-item label="计量单位" prop="measurementUnit">
- prop="measurementUnit"  >
                                 <p>{{ dataForm.measurementUnit }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="计划数量"  
+                            <jnpf-form-tip-item label="计划数量" prop="planNum">
- prop="planNum"  >
+                                <JnpfNumber v-model="dataForm.planNum" placeholder="计划数量" disabled :step="1">
-                    <JnpfNumber    v-model="dataForm.planNum"
- placeholder="计划数量"  disabled
- :step="1"  >
                                 </JnpfNumber>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="数采数量"  
+                            <jnpf-form-tip-item label="数采数量" prop="acquisitionNum">
- prop="acquisitionNum"  >
+                                <JnpfNumber v-model="dataForm.acquisitionNum" placeholder="数采数量" disabled :step="1">
-                    <JnpfNumber    v-model="dataForm.acquisitionNum"
- placeholder="数采数量"  disabled
- :step="1"  >
                                 </JnpfNumber>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="次品数量"  
+                            <jnpf-form-tip-item label="次品数量" prop="defectiveNum">
- prop="defectiveNum"  >
+                                <JnpfNumber v-model="dataForm.defectiveNum" placeholder="次品数量" disabled :step="1">
-                    <JnpfNumber    v-model="dataForm.defectiveNum"
- placeholder="次品数量"  disabled
- :step="1"  >
                                 </JnpfNumber>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="合格数量"  
+                            <jnpf-form-tip-item label="合格数量" prop="qualifiedNum">
- prop="qualifiedNum"  >
+                                <JnpfNumber v-model="dataForm.qualifiedNum" placeholder="合格数量" disabled :step="1">
-                    <JnpfNumber    v-model="dataForm.qualifiedNum"
- placeholder="合格数量"  disabled
- :step="1"  >
                                 </JnpfNumber>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="补偿工时"  
+                            <jnpf-form-tip-item label="补偿工时" prop="compensatoryHour">
- prop="compensatoryHour"  >
+                                <JnpfNumber v-model="dataForm.compensatoryHour" placeholder="数字文本" disabled :step="1"
-                    <JnpfNumber    v-model="dataForm.compensatoryHour"
+                                    :precision="1">
- placeholder="数字文本"  disabled
- :step="1"  :precision="1"  >
                                 </JnpfNumber>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="报工班组"  
+                            <jnpf-form-tip-item label="报工班组" prop="reportGroup">
- prop="reportGroup"  >
                                 <p>{{ dataForm.reportGroup }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="报工成员"  
+                            <jnpf-form-tip-item label="报工成员" prop="reportMember">
- prop="reportMember"  >
                                 <p>{{ dataForm.reportMember }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="确认状态"  
+                            <jnpf-form-tip-item label="确认状态" prop="status">
- prop="status"  >
                                 <p>{{ dataForm.status }} </p>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
-                <jnpf-form-tip-item  label="顺序号"  
+                            <jnpf-form-tip-item label="顺序号" prop="sort">
- prop="sort"  >
+                                <JnpfNumber v-model="dataForm.sort" placeholder="数字文本" disabled :min="1" :step="1">
-                    <JnpfNumber    v-model="dataForm.sort"
- placeholder="数字文本"  disabled
- :min="1"  :step="1"  >
                                 </JnpfNumber>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -172,7 +141,7 @@
                 deviceCode: "",
                 deviceName: '',
                 post: "",
-                            steatTime : '',
+                startTime: '',
                 endTime: '',
                 productCode: "",
                 productName: '',

jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/Detail.vue

@@ -26,12 +26,6 @@
                                 <p>{{ dataForm.deviceName }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
-                            <jnpf-form-tip-item label="顺序号" prop="sort">
-                                <JnpfNumber v-model="dataForm.sort" placeholder="数字文本" disabled :min="1" :step="1">
-                                </JnpfNumber>
-                            </jnpf-form-tip-item>
-                        </el-col>
                         <el-col :span="8">
                             <jnpf-form-tip-item label="班次" prop="post">
                                 <p>{{ dataForm.post }}</p>
@@ -113,6 +107,12 @@
                                 <p>{{ dataForm.status }} </p>
                             </jnpf-form-tip-item>
                         </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="顺序号" prop="sort">
+                                <JnpfNumber v-model="dataForm.sort" placeholder="数字文本" disabled :min="1" :step="1">
+                                </JnpfNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
                     </template>
                 </el-form>
             </el-row>
@@ -140,11 +140,10 @@ export default {
                 manufactureTime: '',
                 deviceCode: "",
                 deviceName: '',
-                sort: 1,
+                post: "",
-                post: "1",
                 startTime: '',
                 endTime: '',
-                productCode: '',
+                productCode: "",
                 productName: '',
                 models: '',
                 measurementUnit: '',
@@ -156,9 +155,8 @@ export default {
                 reportGroup: "",
                 reportMember: [],
                 status: "1",
+                sort: 1,
             },
-            postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
-            postProps: { "label": "fullName", "value": "id" },
             statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
             statusProps: { "label": "fullName", "value": "id" },
 

jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/form.vue

@@ -29,7 +29,7 @@
                                 <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
                                     :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
                                     placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
-                                    popupType="dialog" relationField='device_code' field='deviceCode'
+                                    popupType="dialog" relationField='device_name' field='deviceCode'
                                     interfaceId="590497496266971845" :pageSize="20"
                                     :columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
                                 </JnpfPopupSelect>
@@ -42,18 +42,15 @@
                                 </JnpfInput>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="8">
-                            <jnpf-form-tip-item label="顺序号" prop="sort">
-                                <JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort', -1)"
-                                    placeholder="数字文本" :min="1" :step="1">
-                                </JnpfInputNumber>
-                            </jnpf-form-tip-item>
-                        </el-col>
                         <el-col :span="8">
                             <jnpf-form-tip-item label="班次" prop="post">
-                                <JnpfSelect v-model="dataForm.post" @change="changeData('post', -1)" placeholder="请选择"
+                                <JnpfPopupSelect v-model="dataForm.post" @change="changeData('post', -1)"
-                                    clearable :style='{ "width": "100%" }' :options="postOptions" :props="postProps">
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.post"
-                                </JnpfSelect>
+                                    placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                                    popupType="dialog" relationField='classes_name' field='post'
+                                    interfaceId="595237502952944325" :pageSize="20" :columnOptions="postcolumnOptions"
+                                    clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
                             </jnpf-form-tip-item>
                         </el-col>
 
@@ -70,17 +67,20 @@
                         <el-col :span="8">
                             <jnpf-form-tip-item label="结束时间" prop="endTime">
                                 <JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
-                                    :startTime="time(false, 1, 1, '', 'HH:mm', '')"
+                                    :startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
-                                    :endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择结束时间" clearable
+                                    placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' format="HH:mm">
-                                    :style='{ "width": "100%" }' format="HH:mm">
                                 </JnpfTimePicker>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
                             <jnpf-form-tip-item label="产品编码" prop="productCode">
-                                <JnpfInput v-model="dataForm.productCode" @change="changeData('productCode', -1)"
+                                <JnpfPopupSelect v-model="dataForm.productCode" @change="changeData('productCode', -1)"
-                                    placeholder="请输入产品编码" clearable :style='{ "width": "100%" }'>
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.productCode"
-                                </JnpfInput>
+                                    placeholder="请选择产品编码" hasPage propsValue="material_id" popupWidth="800px"
+                                    popupTitle="选择数据" popupType="dialog" relationField='material_name'
+                                    field='productCode' interfaceId="593079067666820933" :pageSize="20"
+                                    :columnOptions="productCodecolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
                             </jnpf-form-tip-item>
                         </el-col>
                         <el-col :span="8">
@@ -155,7 +155,7 @@
                             <jnpf-form-tip-item label="报工成员" prop="reportMember">
                                 <JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember', -1)"
                                     placeholder="请选择报工成员" selectType="all" :ableIds="ableAll.reportMemberableIds"
-                                    clearable :style='{ "width": "100%" }'>
+                                    clearable :style='{ "width": "100%" }' :multiple="true">
                                 </JnpfUserSelect>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -167,6 +167,13 @@
                                 </JnpfSelect>
                             </jnpf-form-tip-item>
                         </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="顺序号" prop="sort">
+                                <JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort', -1)"
+                                    placeholder="数字文本" :min="1" :step="1">
+                                </JnpfInputNumber>
+                            </jnpf-form-tip-item>
+                        </el-col>
                         <!-- 表单结束 -->
                     </template>
                 </el-form>
@@ -235,8 +242,9 @@ export default {
                 qualifiedNum: 0,
                 compensatoryHour: 0,
                 reportGroup: undefined,
-                reportMember: undefined,
+                reportMember: [],
                 status: "1",
+                sort: 1,
                 version: 0,
             },
             tableRequiredData: {},
@@ -266,7 +274,7 @@ export default {
                 post: [
                     {
                         required: true,
-                        message: '请至少选择一个',
+                        message: '请选择',
                         trigger: 'change'
                     },
                 ],
@@ -287,8 +295,8 @@ export default {
                 productCode: [
                     {
                         required: true,
-                        message: '请输入产品编码',
+                        message: '请选择产品编码',
-                        trigger: 'blur'
+                        trigger: 'change'
                     },
                 ],
                 productName: [
@@ -335,8 +343,8 @@ export default {
                 ],
             },
             deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },],
-            postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
+            postcolumnOptions: [{ "label": "班次名称", "value": "classes_name" }, { "label": "开始时间", "value": "start_time" }, { "label": "结束时间", "value": "end_time" }, { "label": "时长", "value": "classes_duration" },],
-            postProps: { "label": "fullName", "value": "id" },
+            productCodecolumnOptions: [{ "label": "物料编码", "value": "material_id" }, { "label": "物料名称", "value": "material_name" },],
             reportGroupcolumnOptions: [{ "label": "班组名称", "value": "group_name" }, { "label": "班组组长", "value": "f_real_name" }, { "label": "班组类型", "value": "group_desc" },],
             statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
             statusProps: { "label": "fullName", "value": "id" },
@@ -346,7 +354,6 @@ export default {
                 manufactureTime: [],
                 deviceCode: [],
                 deviceName: [],
-                sort: [],
                 post: [],
                 startTime: [],
                 endTime: [],
@@ -362,6 +369,7 @@ export default {
                 reportGroup: [],
                 reportMember: [],
                 status: [],
+                sort: [],
             },
         }
     },

jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/index.vue

@@ -233,12 +233,12 @@ export default {
             flowListVisible: false,
             flowList: [],
             exportBoxVisible: false,
-            postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
-            postProps: { "label": "fullName", "value": "id" },
             statusOptions: [{ "fullName": "待确认", "id": "1" }, { "fullName": "已确认", "id": "2" }],
             statusProps: { "label": "fullName", "value": "id" },
             interfaceRes: {
                 deviceCode: [],
+                post: [],
+                productCode: [],
                 reportGroup: [],
             },
         }