From 42aa3ca06e9e5f68f2cb557e9065204531d01be9 Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Thu, 8 Aug 2024 15:40:56 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../YysMaterialProcurementItemService.java    |  8 +++
 .../YysMaterialProcurementPlanService.java    |  7 +++
 .../YysMaterialRequirementItemService.java    |  8 +++
 .../YysMaterialRequirementPlanService.java    | 17 ++++--
 .../impl/YysDeviceUpkeepServiceImpl.java      |  4 ++
 ...YysMaterialProcurementItemServiceImpl.java | 53 +++++++++++++++----
 ...YysMaterialProcurementPlanServiceImpl.java | 24 +++++++++
 ...YysMaterialRequirementItemServiceImpl.java | 47 ++++++++++++----
 ...YysMaterialRequirementPlanServiceImpl.java | 20 +++++++
 .../YysMaterialRequirementPlanController.java | 10 ++++
 .../YysPackageReportConstant.java             |  2 +-
 .../yysprodreport/YysProdReportConstant.java  |  2 +-
 .../src/views/yys/yysdeviceupkeep/Detail.vue  |  2 +-
 .../src/views/yys/yysdeviceupkeep/form.vue    | 15 +++---
 .../yys/yysmaterialprocurementplan/Detail.vue |  2 +-
 .../yys/yysmaterialprocurementplan/form.vue   |  8 +--
 .../yys/yysmaterialrequirementplan/Detail.vue |  2 +-
 .../yys/yysmaterialrequirementplan/index.vue  | 22 +++++++-
 .../src/views/yys/yyspackagereport/form.vue   |  4 +-
 .../src/views/yys/yysprodreport/form.vue      |  4 +-
 20 files changed, 217 insertions(+), 44 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementItemService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementItemService.java
index 83a0efe..48ce496 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementItemService.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementItemService.java
@@ -15,4 +15,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  */
 public interface YysMaterialProcurementItemService extends IService<YysMaterialProcurementItemEntity> {
     QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination,QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper);
+
+    /**
+     * 生成采购计划
+     * @param id
+     * @param list
+     * @return
+     */
+    String initPlan(String id, List<YysMaterialRequirementItemEntity> list);
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementPlanService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementPlanService.java
index 4a4c101..2efabc3 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementPlanService.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialProcurementPlanService.java
@@ -36,4 +36,11 @@ public interface YysMaterialProcurementPlanService extends IService<YysMaterialP
 
     void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception;
 
+    /**
+     * 生成采购计划
+     * @param plan
+     * @param list
+     * @return
+     */
+    String initPlan(YysMaterialRequirementPlanEntity plan, List<YysMaterialRequirementItemEntity> list);
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementItemService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementItemService.java
index 0851996..7bb9867 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementItemService.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementItemService.java
@@ -15,4 +15,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  */
 public interface YysMaterialRequirementItemService extends IService<YysMaterialRequirementItemEntity> {
     QueryWrapper<YysMaterialRequirementItemEntity> getChild(YysMaterialRequirementPlanPagination pagination,QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper);
+
+    /**
+     * 生成采购计划
+     *
+     * @param plan 物料需求计划主键id
+     * @return result
+     */
+    String initPlan(YysMaterialRequirementPlanEntity plan);
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementPlanService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementPlanService.java
index b885fb7..169df23 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementPlanService.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMaterialRequirementPlanService.java
@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.yysmaterialrequirementplan.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 public interface YysMaterialRequirementPlanService extends IService<YysMaterialRequirementPlanEntity> {
     List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination);
 
-    List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination,String dataType);
+    List<YysMaterialRequirementPlanEntity> getTypeList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination, String dataType);
 
     YysMaterialRequirementPlanEntity getInfo(String id);
 
@@ -27,13 +29,20 @@ public interface YysMaterialRequirementPlanService extends IService<YysMaterialR
     boolean update(String id, YysMaterialRequirementPlanEntity entity);
 
     //子表方法
-    List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id,YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination);
+    List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id, YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination);
 
     List<YysMaterialRequirementItemEntity> getYysMaterialRequirementItemList(String id);
 
     //副表数据方法
-	String checkForm(YysMaterialRequirementPlanForm form,int i);
+    String checkForm(YysMaterialRequirementPlanForm form, int i);
 
-    void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm,String id, boolean isSave) throws Exception;
+    void saveOrUpdate(YysMaterialRequirementPlanForm yysMaterialRequirementPlanForm, String id, boolean isSave) throws Exception;
 
+    /**
+     * 生成采购计划
+     *
+     * @param id 物料需求计划主键id
+     * @return result
+     */
+    String initPlan(String id);
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceUpkeepServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceUpkeepServiceImpl.java
index 39f96f6..b3af15a 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceUpkeepServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceUpkeepServiceImpl.java
@@ -426,9 +426,13 @@ public class YysDeviceUpkeepServiceImpl extends ServiceImpl<YysDeviceUpkeepMappe
 
         if (isSave) {
             String mainId = RandomUtil.uuId();
+            entity.setCreatorUserId(userInfo.getUserId());
+            entity.setCreatorTime(DateUtil.getNowDate());
             entity.setId(mainId);
             entity.setVersion(0);
         } else {
+            entity.setLastModifyTime(DateUtil.getNowDate());
+            entity.setLastModifyUserId(userInfo.getUserId());
         }
         this.saveOrUpdate(entity);
 
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java
index 8f0f76b..46ca0cd 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementItemServiceImpl.java
@@ -1,11 +1,15 @@
 package jnpf.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.google.common.collect.Lists;
 import jnpf.entity.*;
 import jnpf.mapper.YysMaterialProcurementItemMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.yysmaterialprocurementplan.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
@@ -13,8 +17,11 @@ import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
 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;
@@ -22,13 +29,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;
+
 /**
- *
  * YysMaterialProcurementPlan
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -36,7 +47,7 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-08-08
  */
 @Service
-public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMaterialProcurementItemMapper, YysMaterialProcurementItemEntity> implements YysMaterialProcurementItemService{
+public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMaterialProcurementItemMapper, YysMaterialProcurementItemEntity> implements YysMaterialProcurementItemService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
@@ -45,15 +56,37 @@ public class YysMaterialProcurementItemServiceImpl extends ServiceImpl<YysMateri
 
     //子表过滤方法
     @Override
-    public QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination, QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper){
-    boolean pcPermission = true;
-    boolean appPermission = false;
-    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
-    String ruleQueryJson = isPc?YysMaterialProcurementPlanConstant.getColumnData():YysMaterialProcurementPlanConstant.getAppColumnData();
-    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
-    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
-        if(isPc){
+    public QueryWrapper<YysMaterialProcurementItemEntity> getChild(YysMaterialProcurementPlanPagination pagination, QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper) {
+        boolean pcPermission = true;
+        boolean appPermission = false;
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String ruleQueryJson = isPc ? YysMaterialProcurementPlanConstant.getColumnData() : YysMaterialProcurementPlanConstant.getAppColumnData();
+        ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson, ColumnDataModel.class);
+        String ruleJson = isPc ? JsonUtil.getObjectToString(dataModel.getRuleList()) : JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if (isPc) {
         }
         return yysMaterialProcurementItemQueryWrapper;
     }
+
+    @Override
+    public String initPlan(String id, List<YysMaterialRequirementItemEntity> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return "生成失败，物流明细为空";
+        }
+        List<YysMaterialProcurementItemEntity> lists = Lists.newLinkedList();
+        for (YysMaterialRequirementItemEntity yysMaterialRequirementItemEntity : list) {
+            String mainId = RandomUtil.uuId();
+            YysMaterialProcurementItemEntity procurementItem = BeanUtil.copyProperties(yysMaterialRequirementItemEntity, YysMaterialProcurementItemEntity.class);
+            procurementItem.setId(mainId);
+            procurementItem.setMaterialProcurementPlanId(id);
+            procurementItem.setCreatorTime(DateUtil.getNowDate());
+            procurementItem.setCreatorUserId(userProvider.get().getUserId());
+            lists.add(procurementItem);
+        }
+        boolean result = this.saveBatch(lists);
+        if (result){
+            return "生成成功";
+        }
+        return "生成失败";
+    }
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java
index d71c2d2..8920bc1 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java
@@ -1,5 +1,6 @@
 package jnpf.service.impl;
 
+import com.google.common.collect.Lists;
 import jnpf.entity.*;
 import jnpf.mapper.YysMaterialProcurementPlanMapper;
 import jnpf.service.*;
@@ -26,6 +27,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;
@@ -419,4 +421,26 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
             this.saveOrUpdate(entity);
         }
     }
+
+    @Override
+    public String initPlan(YysMaterialRequirementPlanEntity plan, List<YysMaterialRequirementItemEntity> list) {
+        if (CollectionUtils.isEmpty(list)) {
+            return "生成失败,物料需求计划-物料明细为空";
+        }
+        String mainId = RandomUtil.uuId();
+        YysMaterialProcurementPlanEntity procurementPlan = new YysMaterialProcurementPlanEntity();
+        procurementPlan.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
+        procurementPlan.setId(mainId);
+        procurementPlan.setPlanNumber(plan.getPlanNumber());
+        procurementPlan.setProcurementYearMonth(plan.getPlanYearMonth());
+        procurementPlan.setProcurementDate(plan.getOrderDate());
+        procurementPlan.setProcurementStatus("1");
+        procurementPlan.setCreatorTime(DateUtil.getNowDate());
+        procurementPlan.setCreatorUserId(userProvider.get().getUserId());
+        boolean result = this.save(procurementPlan);
+        if (result) {
+            return yysMaterialProcurementItemService.initPlan(procurementPlan.getId(), list);
+        }
+        return "生成成功";
+    }
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementItemServiceImpl.java
index 5d1c6d2..08dc9f4 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementItemServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementItemServiceImpl.java
@@ -1,11 +1,14 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jnpf.entity.*;
 import jnpf.mapper.YysMaterialRequirementItemMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.yysmaterialrequirementplan.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
@@ -13,8 +16,11 @@ import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
 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;
@@ -22,13 +28,19 @@ 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;
+
+import javax.annotation.Resource;
+
 /**
- *
  * YysMaterialRequirementPlan
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -36,24 +48,39 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-08-07
  */
 @Service
-public class YysMaterialRequirementItemServiceImpl extends ServiceImpl<YysMaterialRequirementItemMapper, YysMaterialRequirementItemEntity> implements YysMaterialRequirementItemService{
+public class YysMaterialRequirementItemServiceImpl extends ServiceImpl<YysMaterialRequirementItemMapper, YysMaterialRequirementItemEntity> implements YysMaterialRequirementItemService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;
 
+    @Resource
+    private YysMaterialProcurementPlanService yysMaterialProcurementPlanService;
+
     //子表过滤方法
     @Override
-    public QueryWrapper<YysMaterialRequirementItemEntity> getChild(YysMaterialRequirementPlanPagination pagination, QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper){
-    boolean pcPermission = true;
-    boolean appPermission = false;
-    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
-    String ruleQueryJson = isPc?YysMaterialRequirementPlanConstant.getColumnData():YysMaterialRequirementPlanConstant.getAppColumnData();
-    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
-    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
-        if(isPc){
+    public QueryWrapper<YysMaterialRequirementItemEntity> getChild(YysMaterialRequirementPlanPagination pagination, QueryWrapper<YysMaterialRequirementItemEntity> yysMaterialRequirementItemQueryWrapper) {
+        boolean pcPermission = true;
+        boolean appPermission = false;
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String ruleQueryJson = isPc ? YysMaterialRequirementPlanConstant.getColumnData() : YysMaterialRequirementPlanConstant.getAppColumnData();
+        ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson, ColumnDataModel.class);
+        String ruleJson = isPc ? JsonUtil.getObjectToString(dataModel.getRuleList()) : JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if (isPc) {
         }
         return yysMaterialRequirementItemQueryWrapper;
     }
+
+    @Override
+    public String initPlan(YysMaterialRequirementPlanEntity plan) {
+        LambdaQueryWrapper<YysMaterialRequirementItemEntity> wrapper = new LambdaQueryWrapper<>(YysMaterialRequirementItemEntity.class);
+        wrapper.eq(YysMaterialRequirementItemEntity::getMaterialRequirementPlanId, plan.getId());
+        List<YysMaterialRequirementItemEntity> list = this.list(wrapper)
+                .stream().filter(obj -> ObjectUtil.isNotNull(obj.getLackNumber()) && obj.getLackNumber().compareTo(BigDecimal.ZERO) != 0).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(list)) {
+            return yysMaterialProcurementPlanService.initPlan(plan, list);
+        }
+        return "数据为空";
+    }
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java
index 71f1353..e9edbce 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialRequirementPlanServiceImpl.java
@@ -26,6 +26,7 @@ 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;
@@ -43,6 +44,8 @@ import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
 
+import javax.annotation.Resource;
+
 /**
  * YysMaterialRequirementPlan
  * 版本： V3.5
@@ -51,6 +54,7 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-08-07
  */
 @Service
+@Slf4j
 public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMaterialRequirementPlanMapper, YysMaterialRequirementPlanEntity> implements YysMaterialRequirementPlanService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
@@ -61,6 +65,7 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
     @Autowired
     private YysMaterialRequirementItemService yysMaterialRequirementItemService;
 
+
     @Override
     public List<YysMaterialRequirementPlanEntity> getList(YysMaterialRequirementPlanPagination yysMaterialRequirementPlanPagination) {
         return getTypeList(yysMaterialRequirementPlanPagination, yysMaterialRequirementPlanPagination.getDataType());
@@ -464,4 +469,19 @@ public class YysMaterialRequirementPlanServiceImpl extends ServiceImpl<YysMateri
             }
         }
     }
+
+    @Override
+    public String initPlan(String id) {
+        log.info("生成采购计划，计划id：{}", id);
+        YysMaterialRequirementPlanEntity plan = this.getById(id);
+        if (Objects.isNull(plan)) {
+            return "生成失败，计划为空";
+        }
+        String result = yysMaterialRequirementItemService.initPlan(plan);
+        if (result.contains("成功")){
+            plan.setIsCreatePlan("1");
+            this.updateById(plan);
+        }
+        return result;
+    }
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java
index 405002f..1a40b66 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialRequirementPlanController.java
@@ -400,4 +400,14 @@ public class YysMaterialRequirementPlanController {
         return ActionResult.success(yysMaterialRequirementPlanMap);
     }
 
+    @Operation(summary = "生成采购计划")
+    @GetMapping("/initPlan/{id}")
+    public ActionResult initPlan(@PathVariable("id") String id) {
+        String result = yysMaterialRequirementPlanService.initPlan(id);
+        if (result.contains("成功")) {
+            return ActionResult.success("生成成功");
+        }
+        return ActionResult.fail(result);
+    }
+
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportConstant.java
index b06cb40..77c7dcf 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportConstant.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yyspackagereport/YysPackageReportConstant.java
@@ -21,7 +21,7 @@ public class YysPackageReportConstant{
     /** 整个表单配置json */
     public static final String  getFormData(){
         StringBuilder sb = new StringBuilder();
-sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":120,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":false,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010161399,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_name\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010176717,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010253349,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备编码后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010284356,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010313933,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季夜班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010342914,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010367446,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010403221,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010425592,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010437957,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010452107,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"measurementUnit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入计量单位\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计划数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010463408,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"planNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"计划数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"数采数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010512850,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"acquisitionNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数采数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"次品数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010535488,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"defectiveNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"次品数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"合格数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010565667,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"qualifiedNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"合格数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"precision\":1,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"补偿工时\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010631744,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"compensatoryHour\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"班组名称\",\"value\":\"group_name\"},{\"label\":\"班组组长\",\"value\":\"f_real_name\"},{\"label\":\"班组类型\",\"value\":\"group_desc\"}],\"templateJson\":[],\"relationField\":\"group_name\",\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工班组\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010687942,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"reportGroup\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择报工班组\",\"interfaceId\":\"590871154491662213\",\"interfaceName\":\"查询班组信息\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"formId\":119,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"relationField\":\"\",\"tableName\":\"yys_package_report\",\"renderKey\":1723011153374,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":8},\"ableIds\":[],\"multiple\":true,\"__vModel__\":\"reportMember\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择报工成员\",\"relationField\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":120,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"确认状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723011181347,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"待确认\",\"id\":\"1\"},{\"fullName\":\"已确认\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"status\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}");        return sb.toString();
+sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":120,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":false,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010161399,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_name\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010176717,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010253349,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备编码后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010284356,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010313933,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季夜班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010342914,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010367446,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010403221,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010425592,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010437957,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010452107,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"measurementUnit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入计量单位\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计划数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010463408,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"planNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"计划数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"数采数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723010512850,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"acquisitionNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数采数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"次品数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010535488,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"defectiveNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"次品数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"合格数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010565667,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"qualifiedNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"合格数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"precision\":1,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"补偿工时\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010631744,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"compensatoryHour\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"班组名称\",\"value\":\"group_name\"},{\"label\":\"班组组长\",\"value\":\"f_real_name\"},{\"label\":\"班组类型\",\"value\":\"group_desc\"}],\"templateJson\":[],\"relationField\":\"group_name\",\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工班组\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_package_report\",\"renderKey\":1723010687942,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"reportGroup\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择报工班组\",\"interfaceId\":\"590871154491662213\",\"interfaceName\":\"查询班组信息\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"formId\":119,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"relationField\":\"\",\"tableName\":\"yys_package_report\",\"renderKey\":1723011153374,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":8},\"ableIds\":[],\"multiple\":false,\"__vModel__\":\"reportMember\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择报工成员\",\"relationField\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":120,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"确认状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_package_report\",\"renderKey\":1723011181347,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"待确认\",\"id\":\"1\"},{\"fullName\":\"已确认\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"status\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}");        return sb.toString();
     }
     /** 列表字段配置json */
     public static final String  getColumnData(){
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysprodreport/YysProdReportConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysprodreport/YysProdReportConstant.java
index 4a83860..fe087b1 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysprodreport/YysProdReportConstant.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysprodreport/YysProdReportConstant.java
@@ -21,7 +21,7 @@ public class YysProdReportConstant{
     /** 整个表单配置json */
     public static final String  getFormData(){
         StringBuilder sb = new StringBuilder();
-sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":120,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":false,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010161399,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_code\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010176717,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010253349,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备编码后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010284356,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010313933,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季夜班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010342914,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010367446,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010403221,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010425592,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010437957,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010452107,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"measurementUnit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入计量单位\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计划数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010463408,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"planNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"计划数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"数采数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010512850,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"acquisitionNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数采数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"次品数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010535488,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"defectiveNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"次品数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"合格数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010565667,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"qualifiedNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"合格数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"precision\":1,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"补偿工时\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010631744,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"compensatoryHour\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"班组名称\",\"value\":\"group_name\"},{\"label\":\"班组组长\",\"value\":\"f_real_name\"},{\"label\":\"班组类型\",\"value\":\"group_desc\"}],\"templateJson\":[],\"relationField\":\"group_name\",\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工班组\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010687942,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"reportGroup\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择报工班组\",\"interfaceId\":\"590871154491662213\",\"interfaceName\":\"查询班组信息\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"formId\":119,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"relationField\":\"\",\"tableName\":\"yys_prod_report\",\"renderKey\":1723011153374,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":8},\"ableIds\":[],\"multiple\":true,\"__vModel__\":\"reportMember\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择报工成员\",\"relationField\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":120,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"确认状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723011181347,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"待确认\",\"id\":\"1\"},{\"fullName\":\"已确认\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"status\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}");        return sb.toString();
+sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":120,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":false,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010161399,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_code\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010176717,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010253349,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备编码后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010284356,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":105,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010313933,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季夜班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010342914,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010367446,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":108,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010403221,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010425592,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010437957,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010452107,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"measurementUnit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入计量单位\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计划数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010463408,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"planNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"计划数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"数采数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010512850,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"acquisitionNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数采数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"次品数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010535488,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"defectiveNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"次品数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"合格数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010565667,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"qualifiedNum\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"合格数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"precision\":1,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":0,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"补偿工时\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010631744,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":0,\"__vModel__\":\"compensatoryHour\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"数字文本\",\"controlsPosition\":\"\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"班组名称\",\"value\":\"group_name\"},{\"label\":\"班组组长\",\"value\":\"f_real_name\"},{\"label\":\"班组类型\",\"value\":\"group_desc\"}],\"templateJson\":[],\"relationField\":\"group_name\",\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工班组\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_prod_report\",\"renderKey\":1723010687942,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"reportGroup\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择报工班组\",\"interfaceId\":\"590871154491662213\",\"interfaceName\":\"查询班组信息\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"formId\":119,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"userSelect\",\"defaultValue\":[],\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"报工成员\",\"trigger\":\"change\",\"showLabel\":true,\"required\":false,\"relationField\":\"\",\"tableName\":\"yys_prod_report\",\"renderKey\":1723011153374,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-user\",\"defaultCurrent\":false,\"tag\":\"JnpfUserSelect\",\"regList\":[],\"span\":8},\"ableIds\":[],\"multiple\":false,\"__vModel__\":\"reportMember\",\"style\":{\"width\":\"100%\"},\"selectType\":\"all\",\"disabled\":false,\"placeholder\":\"请选择报工成员\",\"relationField\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":120,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"确认状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_prod_report\",\"renderKey\":1723011181347,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"待确认\",\"id\":\"1\"},{\"fullName\":\"已确认\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"status\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}");        return sb.toString();
     }
     /** 列表字段配置json */
     public static final String  getColumnData(){
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue
index e896b64..4f5878b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue
@@ -57,7 +57,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">检修记录</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.tableField108" size='mini'>
+                                <el-table :data="dataForm.tableField108" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column prop="unkeepType" label="维保类型">
                                         <template slot-scope="scope">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/form.vue
index 50a3bf2..e9b7394 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/form.vue
@@ -75,8 +75,14 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">检修记录</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.yysdeviceunkeeplogsList" size='small'>
+                                <el-table :data="dataForm.yysdeviceunkeeplogsList" size='small' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
+                                    <el-table-column label="操作" width="50" fixed="left">
+                                        <template slot-scope="scope">
+                                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                                @click="delyysdeviceunkeeplogsList(scope.$index)">删除</el-button>
+                                        </template>
+                                    </el-table-column>
                                     <el-table-column label="维保类型" prop="unkeepType" fixed="left" width="200" align="center">
                                         <template slot="header" v-if="true">
                                             <span class="required-sign">*</span>维保类型
@@ -251,12 +257,7 @@
                                             </JnpfTextarea>
                                         </template>
                                     </el-table-column>
-                                    <el-table-column label="操作" width="50">
-                                        <template slot-scope="scope">
-                                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                                                @click="delyysdeviceunkeeplogsList(scope.$index)">删除</el-button>
-                                        </template>
-                                    </el-table-column>
+                                    
                                 </el-table>
                                 <div class="table-actions" @click="addyysdeviceunkeeplogsList()">
                                     <el-button type="text" icon="el-icon-plus">新增</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue
index 7814758..1727fe1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue
@@ -50,7 +50,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">物料明细</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.tableField107" size='mini'>
+                                <el-table :data="dataForm.tableField107" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column prop="materialCode" label="物料编码">
                                         <template slot-scope="scope">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
index 60f0c05..485afe5 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
@@ -94,7 +94,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">物料明细</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.yysMaterialProcurementItemList" size='mini'>
+                                <el-table :data="dataForm.yysMaterialProcurementItemList" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column label="物料编码" prop="materialCode">
                                         <template slot="header" v-if="false">
@@ -173,12 +173,14 @@
                                             </JnpfInput>
                                         </template>
                                     </el-table-column>
-                                    <el-table-column label="操作" width="50">
+                                    <el-table-column label="操作" width="200">
                                         <template slot-scope="scope">
                                             <el-button size="mini" type="text" class="JNPF-table-delBtn"
                                                 @click="delyysMaterialProcurementItemList(scope.$index)">删除</el-button>
+                                                <el-button size="mini" type="text"
+                                                @click="delyysMaterialProcurementItemList(scope.$index)">生成采购单</el-button>
                                         </template>
-                                    </el-table-column>
+                                    </el-table-column> 
                                 </el-table>
                                 <div class="table-actions" @click="addyysMaterialProcurementItemList()">
                                     <el-button type="text" icon="el-icon-plus">添加</el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue
index 13e8667..a931f3f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue
@@ -50,7 +50,7 @@
                                         <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">物料明细</span>
                                     </div>
                                 </el-col>
-                                <el-table :data="dataForm.tableField119" size='mini'>
+                                <el-table :data="dataForm.tableField119" size='mini' border>
                                     <el-table-column type="index" width="50" label="序号" align="center" />
                                     <el-table-column prop="materialCode" label="物料编码">
                                         <template slot-scope="scope">
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
index 559458e..5a75bf2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
@@ -86,7 +86,8 @@
                             </el-button>
                             <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
                             </el-button>
-                            <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">生成采购计划
+                            <el-button type="text" v-has="'btn_detail'" v-show="scope.row.isCreatePlan === '否'"
+                                @click="intPlan(scope.row.id)">生成采购计划
                             </el-button>
                         </template>
                     </el-table-column>
@@ -197,6 +198,25 @@ export default {
         this.queryData = JSON.parse(JSON.stringify(this.query))
     },
     methods: {
+        intPlan(id) {
+            this.$confirm('此操作将生成采购计划, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
+                request({
+                    url: `/api/example/YysMaterialRequirementPlan/initPlan/` + id,
+                    method: 'GET'
+                }).then(res => {
+                    this.$message({
+                        type: 'success',
+                        message: res.msg,
+                        onClose: () => {
+                            this.initData()
+                        }
+                    });
+                })
+            }).catch(() => {
+            });
+        },
         formatDeliveryTime(row, column) {
             if (row.creatorTime != null) {
                 const date = new Date(row.creatorTime);
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/form.vue
index 2c1f86c..7ddec17 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/form.vue
@@ -157,7 +157,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%" }' :multiple="true">
+                                    clearable :style='{ "width": "100%" }' >
                                 </JnpfUserSelect>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -237,7 +237,7 @@ export default {
                 qualifiedNum: 0,
                 compensatoryHour: 0,
                 reportGroup: undefined,
-                reportMember: [],
+                reportMember: undefined,
                 status: "1",
                 version: 0,
             },
diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/form.vue
index 16e300c..c0559fb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/form.vue
@@ -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%" }' :multiple="true">
+                                    clearable :style='{ "width": "100%" }'>
                                 </JnpfUserSelect>
                             </jnpf-form-tip-item>
                         </el-col>
@@ -235,7 +235,7 @@ export default {
                 qualifiedNum: 0,
                 compensatoryHour: 0,
                 reportGroup: undefined,
-                reportMember: [],
+                reportMember: undefined,
                 status: "1",
                 version: 0,
             },