diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/CheckItemMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/CheckItemMapper.java new file mode 100644 index 0000000..dcfa20c --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/CheckItemMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.checkItem.CheckItemEntity; + +/** + * qaCheckItemBase + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2025-09-25 + */ +public interface CheckItemMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ExampleOrderMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ExampleOrderMapper.java index 8abdd9f..ce1e465 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ExampleOrderMapper.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ExampleOrderMapper.java @@ -1,7 +1,7 @@ package jnpf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import jnpf.entity.ExampleOrderEntity; +import jnpf.model.order.ExampleOrderEntity; /** * 业务订单 Mapper diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/InspPlanItemMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/InspPlanItemMapper.java new file mode 100644 index 0000000..7087d0b --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/InspPlanItemMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.inspplanitem.InspPlanItemEntity; + +/** + * qa_scheme_base + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-10-19 + */ +public interface InspPlanItemMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java index 6755961..55bd127 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/OrderDetailMapper.java @@ -2,7 +2,7 @@ package jnpf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import jnpf.entity.OrderDetailEntity; +import jnpf.model.orderdetail.OrderDetailEntity; import jnpf.model.order.OrderItemWithOrderPagination; import jnpf.model.order.OrderItemWithOrderVO; import org.apache.ibatis.annotations.Param; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftConfigMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftConfigMapper.java index 97967d8..ca90ed9 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftConfigMapper.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftConfigMapper.java @@ -1,7 +1,7 @@ package jnpf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import jnpf.entity.ShiftConfigEntity; +import jnpf.model.shift.ShiftConfigEntity; /** * 班次配置 Mapper diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftResultMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftResultMapper.java index c0e99c1..7a1cec4 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftResultMapper.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ShiftResultMapper.java @@ -1,7 +1,7 @@ package jnpf.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import jnpf.entity.ShiftResultEntity; +import jnpf.model.shiftresult.ShiftResultEntity; /** * 排班结果 Mapper diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/CheckItemService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/CheckItemService.java new file mode 100644 index 0000000..40655e3 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/CheckItemService.java @@ -0,0 +1,39 @@ +package jnpf.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.checkItem.CheckItemEntity; +import jnpf.model.checkItem.CheckItemForm; +import jnpf.model.checkItem.CheckItemPagination; + + +import java.util.List; + +/** + * qaCheckItemBase + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2025-09-25 + */ +public interface CheckItemService extends IService { + List getList(CheckItemPagination qaCheckItemBasePagination); + + List getTypeList(CheckItemPagination qaCheckItemBasePagination,String dataType); + + CheckItemEntity getInfo(String id); + + void delete(CheckItemEntity entity); + + void create(CheckItemEntity entity); + + boolean update(String id, CheckItemEntity entity); + + //子表方法 + //副表数据方法 + String checkForm(CheckItemForm form, int i); + + void saveOrUpdate(CheckItemForm checkItemForm,String id, boolean isSave) throws Exception; + + List queryList(CheckItemPagination checkItemPagination); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ExampleOrderService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ExampleOrderService.java index 4c92ef0..a03beb6 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ExampleOrderService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ExampleOrderService.java @@ -2,7 +2,7 @@ package jnpf.service; import com.baomidou.mybatisplus.extension.service.IService; import jnpf.base.entity.DictionaryDataEntity; -import jnpf.entity.ExampleOrderEntity; +import jnpf.model.order.ExampleOrderEntity; import jnpf.model.order.ExampleOrderForm; import jnpf.model.order.ExampleOrderPagination; import jnpf.permission.entity.UserEntity; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/InspPlanItemService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/InspPlanItemService.java new file mode 100644 index 0000000..89899b0 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/InspPlanItemService.java @@ -0,0 +1,21 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.inspplanitem.InspPlanItemEntity; + +import java.util.List; + +/** + * qa_scheme_base + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-10-19 + */ +public interface InspPlanItemService extends IService { + + //统计itemID + Long getCountByItemID(Integer itemID); + + List getInspPlanItemList(String id); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java index 553d141..afb4004 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/OrderDetailService.java @@ -1,7 +1,7 @@ package jnpf.service; import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.entity.OrderDetailEntity; +import jnpf.model.orderdetail.OrderDetailEntity; import jnpf.model.order.OrderItemWithOrderPagination; import jnpf.model.order.OrderItemWithOrderVO; import jnpf.model.orderdetail.OrderDetailForm; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftConfigService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftConfigService.java index 0b2e75f..e79663a 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftConfigService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftConfigService.java @@ -1,7 +1,7 @@ package jnpf.service; import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.entity.ShiftConfigEntity; +import jnpf.model.shift.ShiftConfigEntity; import jnpf.model.shift.ShiftConfigForm; import jnpf.model.shift.ShiftConfigPagination; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftResultService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftResultService.java index 1baedb5..03f9ce8 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftResultService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ShiftResultService.java @@ -1,7 +1,7 @@ package jnpf.service; import com.baomidou.mybatisplus.extension.service.IService; -import jnpf.entity.ShiftResultEntity; +import jnpf.model.shiftresult.ShiftResultEntity; import jnpf.model.shiftresult.ShiftResultForm; import jnpf.model.shiftresult.ShiftResultPagination; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/CheckItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/CheckItemServiceImpl.java new file mode 100644 index 0000000..f1c8ce1 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/CheckItemServiceImpl.java @@ -0,0 +1,158 @@ +package jnpf.service.impl; + + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.exception.DataException; +import jnpf.mapper.CheckItemMapper; +import jnpf.model.checkItem.CheckItemEntity; + +import jnpf.model.checkItem.CheckItemForm; +import jnpf.model.checkItem.CheckItemPagination; +import jnpf.model.inspplanitem.InspPlanItemEntity; +import jnpf.service.CheckItemService; + +import jnpf.service.InspPlanItemService; +import jnpf.util.GeneraterSwapUtil; +import jnpf.util.JsonUtil; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * qaCheckItemBase + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2025-09-25 + */ +@Service +public class CheckItemServiceImpl extends ServiceImpl implements CheckItemService { + + @Autowired + private InspPlanItemService inspPlanItemService; + + + @Override + public List getList(CheckItemPagination CheckItemPagination){ + return getTypeList(CheckItemPagination,CheckItemPagination.getDataType()); + } + /** 列表查询 */ + @Override + public List getTypeList(CheckItemPagination CheckItemPagination,String dataType){ + QueryWrapper qaRawMaterialCheckQueryWrapper=new QueryWrapper<>(); + + if (ObjectUtil.isNotEmpty(CheckItemPagination.getKeyword())){ + qaRawMaterialCheckQueryWrapper.lambda().like(CheckItemEntity::getItemName, CheckItemPagination.getKeyword()); + } + if (ObjectUtil.isNotEmpty(CheckItemPagination.getSchemeType())){ + qaRawMaterialCheckQueryWrapper.lambda().like(CheckItemEntity::getItemType, CheckItemPagination.getSchemeType()); + }else{ + return new ArrayList<>(); + } + Page page=new Page<>(CheckItemPagination.getCurrentPage(), CheckItemPagination.getPageSize()); + IPage userIPage=this.page(page, qaRawMaterialCheckQueryWrapper); + return CheckItemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + } + @Override + public CheckItemEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(CheckItemEntity::getId,id); + return this.getOne(queryWrapper); + } + @Override + public void create(CheckItemEntity entity){ + this.save(entity); + } + @Override + public boolean update(String id, CheckItemEntity entity){ + return this.updateById(entity); + } + @Override + public void delete(CheckItemEntity entity) { + if (entity != null) { + // 建议是否被使用 + Long countByItemID = inspPlanItemService.getCountByItemID(entity.getId()); + if (countByItemID > 0) { + throw new DataException("该检验标准已做质检方案，不允许删除，请确认。"); + } + this.removeById(entity.getId()); + } + } + /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + @Override + public String checkForm(CheckItemForm form, int i) { + boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id=""; + String countRecover = ""; + if (isUp){ + id = form.getId(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CheckItemEntity::getItemType, form.getItemType()); + wrapper.eq(CheckItemEntity::getItemName, form.getItemName()); + wrapper.isNull(CheckItemEntity::getDeleteMark); + if (isUp){ + wrapper.ne(CheckItemEntity::getId, id); + } + String itemType =""; + if ("1".equals(form.getItemType())){ + itemType="原材料"; + }else if ("2".equals(form.getItemType())){ + itemType="半成品"; + }else{ + itemType="成品"; + } + countRecover = this.count(wrapper) > 0 ? "适用类型"+itemType+"内已存在检验名称为"+form.getItemName() + "的检验项,请确认！" : ""; + //主表字段验证 + return countRecover; + } + /** + * 新增修改数据(事务回滚) + * @param id + * @param CheckItemForm + * @return + */ + @Override + @DSTransactional + public void saveOrUpdate(CheckItemForm CheckItemForm,String id, boolean isSave) throws Exception{ + CheckItemEntity entity = JsonUtil.getJsonToBean(CheckItemForm, CheckItemEntity.class); + + if(isSave){ + + }else{ + } + this.saveOrUpdate(entity); + + } + + @Override + public List queryList(CheckItemPagination CheckItemPagination) { + QueryWrapper qaRawMaterialCheckQueryWrapper=new QueryWrapper<>(); + + if (ObjectUtil.isNotEmpty(CheckItemPagination.getItemType())){ + qaRawMaterialCheckQueryWrapper.lambda().eq(CheckItemEntity::getItemType, CheckItemPagination.getItemType()); + } + if (ObjectUtil.isNotEmpty(CheckItemPagination.getItemNo())){ + qaRawMaterialCheckQueryWrapper.lambda().like(CheckItemEntity::getItemNo, CheckItemPagination.getItemNo()); + } + if (ObjectUtil.isNotEmpty(CheckItemPagination.getItemName())){ + qaRawMaterialCheckQueryWrapper.lambda().like(CheckItemEntity::getItemName, CheckItemPagination.getItemName()); + } + qaRawMaterialCheckQueryWrapper.lambda().orderByDesc(CheckItemEntity::getId); + Page page=new Page<>(CheckItemPagination.getCurrentPage(), CheckItemPagination.getPageSize()); + IPage userIPage=this.page(page, qaRawMaterialCheckQueryWrapper); + return CheckItemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); } + + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java index 9ea2c9f..9f79aa4 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ExampleOrderServiceImpl.java @@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.base.entity.DictionaryDataEntity; -import jnpf.entity.OrderDetailEntity; -import jnpf.entity.ExampleOrderEntity; +import jnpf.model.orderdetail.OrderDetailEntity; +import jnpf.model.order.ExampleOrderEntity; import jnpf.mapper.ExampleOrderMapper; import jnpf.model.order.ExampleOrderForm; import jnpf.model.order.ExampleOrderPagination; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanItemServiceImpl.java new file mode 100644 index 0000000..d20f368 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanItemServiceImpl.java @@ -0,0 +1,45 @@ +package jnpf.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import jnpf.mapper.InspPlanItemMapper; + +import jnpf.model.inspplanitem.InspPlanItemEntity; + +import jnpf.service.InspPlanItemService; +import jnpf.util.GeneraterSwapUtil; + +import jnpf.util.UserProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * + * qa_scheme_base + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-10-19 + */ +@Service +public class InspPlanItemServiceImpl extends ServiceImpl implements InspPlanItemService { + + + + @Override + public Long getCountByItemID(Integer itemID) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(InspPlanItemEntity::getItemId, itemID); + return this.count(queryWrapper); + } + + @Override + public List getInspPlanItemList(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(InspPlanItemEntity::getSchemeId, id); + return this.list(queryWrapper); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanServiceImpl.java index 8765bd4..2960488 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/InspPlanServiceImpl.java @@ -6,19 +6,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.base.UserInfo; import jnpf.mapper.InspPlanMapper; import jnpf.model.inspplan.InspPlanEntity; import jnpf.model.inspplan.InspPlanForm; import jnpf.model.inspplan.InspPlanPagination; +import jnpf.model.inspplanitem.InspPlanItemEntity; +import jnpf.permission.entity.UserEntity; +import jnpf.service.InspPlanItemService; import jnpf.service.InspPlanService; -import jnpf.util.StringUtil; -import jnpf.util.UserProvider; +import jnpf.util.*; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 质检方案表 ServiceImpl @@ -28,6 +34,8 @@ public class InspPlanServiceImpl extends ServiceImpl getList(InspPlanPagination inspPlanPagination) { @@ -57,7 +65,6 @@ public class InspPlanServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(InspPlanEntity::getSchemeNo, form.getSchemeNo()); - if (isUpdate) { - wrapper.ne(InspPlanEntity::getId, id); + if (ObjectUtil.isNotEmpty(form.getSchemeName())){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(InspPlanEntity::getSchemeName, form.getSchemeName()); + + if (isUpdate){ + queryWrapper.ne(InspPlanEntity::getId, id); } - long count = this.count(wrapper); - if (count > 0) { - countRecover += "质检方案编号已存在，请重新输入！"; + if (this.count(queryWrapper) > 0){ + return "质检方案'"+form.getSchemeName()+"'已存在，请确认!"; } } + if (ObjectUtil.isNotEmpty(form.getSchemeNo())){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(InspPlanEntity::getSchemeNo, form.getSchemeNo()); + if (isUpdate){ + queryWrapper.ne(InspPlanEntity::getId, id); + } + queryWrapper.isNull(InspPlanEntity::getDeleteMark); + if (this.count(queryWrapper) > 0){ + return "质检方案编号'"+form.getSchemeNo()+"'已存在，请确认!"; + } + } + // 子表字段验证 + if ( ObjectUtil.isNotEmpty(form.getInspPlanItemList()) ) { + List list = form.getInspPlanItemList(); + Set seqNoSet = new HashSet<>(); + for (int j = 0; j < list.size(); j ++) { + InspPlanItemEntity item = list.get(j); + Integer seqNo = item.getSeqNo(); + + // 校验空值 + if (seqNo == null ) { + return "展示顺序不能为空"; + } + + // 校验重复 + if (!seqNoSet.add(seqNo)) { + return "展示顺序不能重复"; + } + } + } return countRecover; } @Override @Transactional public void saveOrUpdate(InspPlanForm inspPlanForm, String id, boolean isSave) throws Exception { - InspPlanEntity entity = getInfo(id); - if (entity == null) { - entity = new InspPlanEntity(); + UserInfo userInfo = userProvider.get(); + + InspPlanEntity entity = JsonUtil.getJsonToBean(inspPlanForm, InspPlanEntity.class); + + if (isSave) { + String mainId = RandomUtil.uuId(); + entity.setCreatorUserId(userInfo.getUserId()); + entity.setCreatorTime(DateUtil.getNowDate()); + entity.setId(mainId); + } else { + entity.setCreatorUserId(userInfo.getUserId()); + entity.setCreatorTime(DateUtil.getNowDate()); } - BeanUtils.copyProperties(inspPlanForm, entity); this.saveOrUpdate(entity); + if ( ObjectUtil.isNotEmpty(inspPlanForm.getInspPlanItemList())) { + List twModelList = inspPlanForm.getInspPlanItemList(); + List collect = twModelList.stream() + .filter(model -> StringUtil.isEmpty(model.getId())) + .collect(Collectors.toList()); + + boolean updated = false; + if (ObjectUtil.isNotEmpty(collect)) { + for (InspPlanItemEntity model : collect) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(InspPlanItemEntity::getSchemeId, entity.getId()); + wrapper.eq(InspPlanItemEntity::getItemId, model.getItemId()); + wrapper.last("limit 1"); + InspPlanItemEntity one = inspPlanItemService.getOne(wrapper); + if (ObjectUtil.isNotEmpty(one)) { + model.setId(one.getId()); + updated = true; + } + } + } + if (updated) { + inspPlanForm.setInspPlanItemList(twModelList); + } + } + + LambdaQueryWrapper qaSchemeBaseTwEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + qaSchemeBaseTwEntityLambdaQueryWrapper.eq(InspPlanItemEntity::getSchemeId, entity.getId()); + inspPlanItemService.remove(qaSchemeBaseTwEntityLambdaQueryWrapper); + + if (ObjectUtil.isNotEmpty(inspPlanForm.getInspPlanItemList())) { + List tableField114 = JsonUtil.getJsonToList(inspPlanForm.getInspPlanItemList(), InspPlanItemEntity.class); + for (InspPlanItemEntity entitys : tableField114) { + String entitysId = entitys.getId(); + if (StringUtil.isEmpty(entitysId)) { + entitys.setId(RandomUtil.uuId()); + } + entitys.setSchemeId(entity.getId()); + inspPlanItemService.saveOrUpdate(entitys); + } + + } } @Override @@ -138,7 +224,6 @@ public class InspPlanServiceImpl extends ServiceImpl list= qaCheckItemBaseService.getList(CheckItemPagination); + List> realList=new ArrayList<>(); + for (CheckItemEntity entity : list) { + Map qaCheckItemBaseMap=JsonUtil.entityToMap(entity); + qaCheckItemBaseMap.put("id", qaCheckItemBaseMap.get("id")); + //副表数据 + if (ObjectUtil.isNotEmpty(entity.getNature())){ + qaCheckItemBaseMap.put("nature", "1".equals(entity.getNature())?"定性":"定量"); + } + //子表数据 + realList.add(qaCheckItemBaseMap); + } + //数据转换 +// realList = generaterSwapUtil.swapDataList(realList, QaCheckItemBaseConstant.getFormData(), QaCheckItemBaseConstant.getColumnData(), CheckItemPagination.getModuleId(),false); + + //返回对象 + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(CheckItemPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + /** + * 列表 + * + * @param CheckItemPagination + * @return + */ + @Operation(summary = "获取列表") + @PostMapping("/queryList") + public ActionResult queryList(@RequestBody CheckItemPagination CheckItemPagination){ + List list= qaCheckItemBaseService.queryList(CheckItemPagination); + List> realList=new ArrayList<>(); + List dictionaryDataEntities1= dictionaryDataService.getList("816930383386918149", false); + + List dictionaryDataEntities3= dictionaryDataService.getList("816930292873837829", false); + for (CheckItemEntity entity : list) { + Map qaCheckItemBaseMap=JsonUtil.entityToMap(entity); + qaCheckItemBaseMap.put("id", qaCheckItemBaseMap.get("id")); + //副表数据 + if (ObjectUtil.isNotEmpty(entity.getNature())){ + qaCheckItemBaseMap.put("nature", "1".equals(entity.getNature())?"定性":"定量"); + } + if ("1".equals(entity.getItemType())){ + DictionaryDataEntity dictionaryDataEntity = dictionaryDataEntities1.stream().filter(t -> t.getEnCode().equals(entity.getItemClass())).findFirst().orElse(null); + if (ObjectUtil.isNotEmpty(dictionaryDataEntity)) { + qaCheckItemBaseMap.put("tiemClass",dictionaryDataEntity.getFullName()); + } + }else if ("3".equals(entity.getItemType())){ + DictionaryDataEntity dictionaryDataEntity = dictionaryDataEntities3.stream().filter(t -> t.getEnCode().equals(entity.getItemClass())).findFirst().orElse(null); + if (ObjectUtil.isNotEmpty(dictionaryDataEntity)) { + qaCheckItemBaseMap.put("tiemClass",dictionaryDataEntity.getFullName()); + } + }else{ + qaCheckItemBaseMap.put("tiemClass",""); + } + //子表数据 + realList.add(qaCheckItemBaseMap); + } + //数据转换 +// realList = generaterSwapUtil.swapDataList(realList, QaCheckItemBaseConstant.getFormData(), QaCheckItemBaseConstant.getColumnData(), CheckItemPagination.getModuleId(),false); + + //返回对象 + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(CheckItemPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + /** + * 创建 + * + * @param CheckItemForm + * @return + */ + @PostMapping() + @Operation(summary = "创建") + public ActionResult create(@RequestBody @Valid CheckItemForm CheckItemForm) { + String b = qaCheckItemBaseService.checkForm(CheckItemForm,0); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + try{ + qaCheckItemBaseService.saveOrUpdate(CheckItemForm, null ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** + * 编辑 + * @param id + * @param CheckItemForm + * @return + */ + @PutMapping("/{id}") + @Operation(summary = "更新") + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CheckItemForm CheckItemForm, + @RequestParam(value = "isImport", required = false) boolean isImport){ + CheckItemForm.setId(id); + if (!isImport) { + String b = qaCheckItemBaseService.checkForm(CheckItemForm,1); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + } + CheckItemEntity entity= qaCheckItemBaseService.getInfo(id); + if(entity!=null){ + try{ + qaCheckItemBaseService.saveOrUpdate(CheckItemForm,id,false); + }catch(Exception e){ + return ActionResult.fail("修改数据失败"); + } + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } + } + /** + * 删除 + * @param id + * @return + */ + @Operation(summary = "删除") + @DeleteMapping("/{id}") + @DSTransactional + public ActionResult delete(@PathVariable("id") String id){ + CheckItemEntity entity= qaCheckItemBaseService.getInfo(id); + if(entity!=null){ + //主表数据删除 + qaCheckItemBaseService.delete(entity); + } + return ActionResult.success("删除成功"); + } + /** + * 表单信息(详情页) + * 详情页面使用-转换数据 + * @param id + * @return + */ + @Operation(summary = "表单信息(详情页)") + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + CheckItemEntity entity= qaCheckItemBaseService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + Map qaCheckItemBaseMap=JsonUtil.entityToMap(entity); + qaCheckItemBaseMap.put("id", qaCheckItemBaseMap.get("id")); + //副表数据 + //子表数据 + + return ActionResult.success(qaCheckItemBaseMap); + } + /** + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * @param id + * @return + */ + @Operation(summary = "信息") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id){ + CheckItemEntity entity= qaCheckItemBaseService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + Map qaCheckItemBaseMap=JsonUtil.entityToMap(entity); + qaCheckItemBaseMap.put("id", qaCheckItemBaseMap.get("id")); + //副表数据 + //子表数据 + return ActionResult.success(qaCheckItemBaseMap); + } + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java index 0e5f845..8f225d0 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ExampleOrderController.java @@ -6,9 +6,6 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.ObjectUtil; import cn.xuyanwu.spring.file.storage.FileInfo; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -16,20 +13,17 @@ import jnpf.base.ActionResult; import jnpf.base.UserInfo; import jnpf.base.entity.DictionaryDataEntity; -import jnpf.base.model.ColumnDataModel; import jnpf.base.service.DictionaryDataService; -import jnpf.base.util.VisualUtils; import jnpf.base.vo.DownloadVO; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.config.ConfigValueUtil; -import jnpf.entity.ExampleOrderEntity; -import jnpf.entity.OrderDetailEntity; +import jnpf.model.order.ExampleOrderEntity; +import jnpf.model.orderdetail.OrderDetailEntity; import jnpf.model.order.ExampleOrderForm; import jnpf.model.order.ExampleOrderPagination; -import jnpf.model.visualJson.config.HeaderModel; import jnpf.permission.entity.UserEntity; import jnpf.permission.service.UserService; import jnpf.service.ExampleOrderService; @@ -39,7 +33,6 @@ import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/InspPlanController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/InspPlanController.java index 6e4ba8d..02fb798 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/InspPlanController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/InspPlanController.java @@ -1,13 +1,22 @@ package jnpf.controller; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; +import jnpf.base.entity.DictionaryDataEntity; +import jnpf.base.service.DictionaryDataService; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.model.inspplan.InspPlanEntity; import jnpf.model.inspplan.InspPlanForm; import jnpf.model.inspplan.InspPlanPagination; +import jnpf.model.inspplanitem.InspPlanItemEntity; +import jnpf.permission.entity.UserEntity; +import jnpf.permission.service.UserService; +import jnpf.service.InspPlanItemService; import jnpf.service.InspPlanService; import jnpf.util.JsonUtil; import jnpf.util.StringUtil; @@ -29,6 +38,13 @@ public class InspPlanController { @Autowired private InspPlanService inspPlanService; + @Autowired + private DictionaryDataService dictionaryDataService; + @Autowired + private InspPlanItemService inspPlanItemService; + @Autowired + private UserService userService; + @Operation(summary = "获取质检方案列表") @PostMapping("/getList") @@ -56,16 +72,77 @@ public class InspPlanController { } - @Operation(summary = "获取质检方案详情") + /** + * 表单信息(详情页) + * 详情页面使用-转换数据 + * + * @param id + * @return + */ + @Operation(summary = "表单信息(详情页)") + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id) { + InspPlanEntity entity = inspPlanService.getInfo(id); + if (entity == null) { + return ActionResult.fail("表单数据不存在！"); + } + Map InspPlanMap = JsonUtil.entityToMap(entity); + InspPlanMap.put("id", InspPlanMap.get("id")); + //副表数据 + List dictionaryDataEntities = dictionaryDataService.getList("816941613849787909", false); + DictionaryDataEntity dictionaryDataEntity = dictionaryDataEntities.stream().filter(t -> t.getEnCode().equals(entity.getTiemClass())).findFirst().orElse(null); + if (ObjectUtil.isNotEmpty(dictionaryDataEntity)) { + InspPlanMap.put("tiemClass", dictionaryDataEntity.getFullName()); + } + if (ObjectUtil.isNotEmpty(entity.getCreatorUserId())){ + UserEntity userEntity = userService.getById(entity.getCreatorUserId()); + if (ObjectUtil.isNotEmpty(userEntity)){ + InspPlanMap.put("creatorUserId", userEntity.getRealName()); + } + } + if (ObjectUtil.isNotEmpty(entity.getCreatorTime())){ + InspPlanMap.put("creatorTime", DateUtil.format(entity.getCreatorTime(), "yyyy-MM-dd HH:mm:ss")); + } + //子表数据 + List inspPlanItemList = inspPlanItemService.getInspPlanItemList(entity.getId()); + InspPlanMap.put("InspPlanItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(inspPlanItemList))); + return ActionResult.success(InspPlanMap); + } + + /** + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * + * @param id + * @return + */ + @Operation(summary = "信息") @GetMapping("/{id}") public ActionResult info(@PathVariable("id") String id) { InspPlanEntity entity = inspPlanService.getInfo(id); - if (entity != null) { - return ActionResult.success(JsonUtil.entityToMap(entity)); + if (entity == null) { + return ActionResult.fail("表单数据不存在！"); } - return ActionResult.fail("数据不存在"); + Map InspPlanMap = JsonUtil.entityToMap(entity); + InspPlanMap.put("id", InspPlanMap.get("id")); + if (ObjectUtil.isNotEmpty(entity.getSchemeType())) { + InspPlanMap.put("schemeType", entity.getSchemeType().toString()); + } + if (ObjectUtil.isNotEmpty(entity.getCreatorUserId())){ + UserEntity userEntity = userService.getById(entity.getCreatorUserId()); + if (ObjectUtil.isNotEmpty(userEntity)){ + InspPlanMap.put("creatorUserId", userEntity.getRealName()); + } + } + if (ObjectUtil.isNotEmpty(entity.getCreatorTime())){ + InspPlanMap.put("creatorTime", DateUtil.format(entity.getCreatorTime(), "yyyy-MM-dd HH:mm:ss")); + } + //副表数据 + //子表数据 + List inspPlanItemList = inspPlanItemService.getInspPlanItemList(entity.getId()); + InspPlanMap.put("InspPlanItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(inspPlanItemList))); + return ActionResult.success(InspPlanMap); } - @Operation(summary = "新建质检方案") @PostMapping public ActionResult create(@RequestBody @Valid InspPlanForm inspPlanForm) { @@ -116,5 +193,25 @@ public class InspPlanController { } return ActionResult.fail("删除失败，数据不存在"); } - + /** + * 创建 + * + * @param inspPlanForm + * @return + */ + @PostMapping("/verifyNumber") + @Operation(summary = "校验") + public ActionResult verifyNumber(@RequestBody InspPlanForm inspPlanForm) { + if (ObjectUtil.isNotEmpty(inspPlanForm.getSchemeNo())) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(InspPlanEntity::getSchemeNo, inspPlanForm.getSchemeNo()); + if (ObjectUtil.isNotEmpty(inspPlanForm.getId())) { + queryWrapper.ne(InspPlanEntity::getId, inspPlanForm.getId()); + } + if (inspPlanService.count(queryWrapper) > 0) { + return ActionResult.fail("质检方案编号" + inspPlanForm.getSchemeNo() + "已存在，请确认!"); + } + } + return ActionResult.success(true); + } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java index ad9c6e4..3628961 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/OrderDetailController.java @@ -11,7 +11,7 @@ import jnpf.base.vo.ListVO; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.constant.MsgCode; -import jnpf.entity.OrderDetailEntity; +import jnpf.model.orderdetail.OrderDetailEntity; import jnpf.model.order.OrderItemWithOrderPagination; import jnpf.model.order.OrderItemWithOrderVO; import jnpf.model.orderdetail.OrderDetailForm; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftConfigController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftConfigController.java index 6c64670..d03b473 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftConfigController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftConfigController.java @@ -6,8 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; -import jnpf.entity.ShiftConfigEntity; -import jnpf.model.machine.MachineForm; +import jnpf.model.shift.ShiftConfigEntity; import jnpf.model.shift.ShiftConfigForm; import jnpf.model.shift.ShiftConfigPagination; import jnpf.service.ShiftConfigService; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftResultController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftResultController.java index ff715ae..5829027 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftResultController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ShiftResultController.java @@ -5,8 +5,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; -import jnpf.entity.ShiftResultEntity; -import jnpf.model.shift.ShiftConfigForm; +import jnpf.model.shiftresult.ShiftResultEntity; import jnpf.model.shiftresult.ShiftResultForm; import jnpf.model.shiftresult.ShiftResultPagination; import jnpf.service.ShiftResultService; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemEntity.java new file mode 100644 index 0000000..4d8c387 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemEntity.java @@ -0,0 +1,65 @@ +package jnpf.model.checkItem; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; + +/** + * 检验项目表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2025-09-25 + */ +@Data +@TableName("tba_check_item") +public class CheckItemEntity { + @TableId(value ="ID" ,type = IdType.AUTO ) + private Integer id; + @TableField(value = "ITEM_NO" , updateStrategy = FieldStrategy.IGNORED) + private String itemNo; + @TableField(value = "ITEM_NAME" , updateStrategy = FieldStrategy.ALWAYS) + private String itemName; + @TableField(value = "NATURE" , updateStrategy = FieldStrategy.ALWAYS) + private String nature; + @TableField(value = "UNIT_NAME", updateStrategy = FieldStrategy.ALWAYS) + private String unitName; + @TableField(value = "CHECK_METHOD", updateStrategy = FieldStrategy.ALWAYS) + private String checkMethod; + @TableField(value = "REMARK", updateStrategy = FieldStrategy.ALWAYS) + private String remark; + @TableField(value = "ITEM_TYPE", updateStrategy = FieldStrategy.ALWAYS) + private String itemType; + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) + private Date deleteTime; + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) + private String deleteUserId; + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + @TableField("F_FLOW_ID") + private String flowId; + @TableField("F_FLOW_TASK_ID") + private String flowTaskId; + @TableField(value = "ITEM_CLASS", updateStrategy = FieldStrategy.ALWAYS) + private String itemClass; + @TableField(value = "ITEM_VALUE_TYPE", updateStrategy = FieldStrategy.ALWAYS) + private String itemValueType; + @TableField(value = "ITEM_CONTENT", updateStrategy = FieldStrategy.ALWAYS) + private String itemContent; + @TableField(value = "TEST_NUM", updateStrategy = FieldStrategy.ALWAYS) + private Integer testNum; + @TableField(value = "FLOAT_NUM", updateStrategy = FieldStrategy.ALWAYS) + private Integer floatNum; + @TableField(value = "print_avg_values", updateStrategy = FieldStrategy.ALWAYS) + private String printAvgValues; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemForm.java new file mode 100644 index 0000000..384e207 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemForm.java @@ -0,0 +1,58 @@ +package jnpf.model.checkItem; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +/** + * qaCheckItemBase + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2025-10-05 + */ +@Data +public class CheckItemForm { + /** 主键 */ + private String id; + + /** 编号 **/ + @JsonProperty("itemNo") + private String itemNo; + /** 名称 **/ + @JsonProperty("itemName") + private String itemName; + /** 性质 **/ + @JsonProperty("nature") + private String nature; + /** 单位 **/ + @JsonProperty("unitName") + private String unitName; + /** 检验值类型 **/ + @JsonProperty("itemValueType") + private Object itemValueType; + /** 适用类型 **/ + @JsonProperty("itemType") + private Object itemType; + /** 检验值数量 **/ + @JsonProperty("testNum") + private String testNum; + /** 绑定值 **/ + @JsonProperty("itemContent") + private String itemContent; + /** 是否取平均值 **/ + @JsonProperty("printAvgValues") + private String printAvgValues; + /** 小数位数 **/ + @JsonProperty("floatNum") + private String floatNum; + /** 检验大类 **/ + @JsonProperty("itemClass") + private Object itemClass; + /** 检验方法 **/ + @JsonProperty("checkMethod") + private String checkMethod; + /** 备注 **/ + @JsonProperty("remark") + private String remark; + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemPagination.java new file mode 100644 index 0000000..3fdb69e --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/checkItem/CheckItemPagination.java @@ -0,0 +1,40 @@ +package jnpf.model.checkItem; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jnpf.base.Pagination; +import lombok.Data; + +/** + * + * qaCheckItemBase + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2025-10-05 + */ +@Data +public class CheckItemPagination extends Pagination { + /** 查询key */ + private String[] selectKey; + /** json */ + private String json; + /** 数据类型 0-当前页，1-全部数据 */ + private String dataType; + /** 高级查询 */ + private String superQueryJson; + /** 功能id */ + private String moduleId; + /** 菜单id */ + private String menuId; + /** 适用类型 */ + @JsonProperty("itemType") + private Object itemType; + /** 编号 */ + @JsonProperty("itemNo") + private Object itemNo; + /** 检验名称 */ + @JsonProperty("itemName") + private Object itemName; + @JsonProperty("schemeType") + private Object schemeType; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplan/InspPlanForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplan/InspPlanForm.java index 0a0c5f4..2862843 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplan/InspPlanForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplan/InspPlanForm.java @@ -1,10 +1,13 @@ package jnpf.model.inspplan; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jnpf.model.inspplanitem.InspPlanItemEntity; import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Date; +import java.util.List; /** * 质检方案表 Form @@ -72,4 +75,8 @@ public class InspPlanForm { @Schema(description = "打印模板名称") private String printName; + /** 子表数据 **/ + @JsonProperty("InspPlanItemList") + private List InspPlanItemList; + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplanitem/InspPlanItemEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplanitem/InspPlanItemEntity.java new file mode 100644 index 0000000..bfbf59b --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/inspplanitem/InspPlanItemEntity.java @@ -0,0 +1,65 @@ +package jnpf.model.inspplanitem; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 质检方案表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-10-19 + */ +@Data +@TableName("tba_insp_plan_item") +public class InspPlanItemEntity { + @TableId(value ="ID" ) + private String id; + @TableField("SCHEME_ID") + private String schemeId; + @TableField(value = "ITEM_ID" , updateStrategy = FieldStrategy.IGNORED) + private String itemId; + @TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED) + private String unit; + @TableField(value = "STANDARD_VALUE" , updateStrategy = FieldStrategy.IGNORED) + private String standardValue; + @TableField(value = "UPPER_LIMIT" , updateStrategy = FieldStrategy.IGNORED) + private BigDecimal upperLimit; + @TableField(value = "LOWER_LIMIT" , updateStrategy = FieldStrategy.IGNORED) + private BigDecimal lowerLimit; + @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) + private String remark; + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) + private String creatorUserId; + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + @TableField("F_DELETE_USER_ID") + private String deleteUserId; + @TableField("F_DELETE_TIME") + private Date deleteTime; + @TableField("F_DELETE_MARK") + private Integer deleteMark; + @TableField("F_FLOW_ID") + private String flowId; + @TableField("F_FLOW_TASK_ID") + private String flowTaskId; + @TableField("item_name") + private String itemName; + @TableField("seq_no") + private Integer seqNo; + @TableField("print_merge_yn") + private String printMergeYn; + @TableField("print_item") + private String printItem; + @TableField("print_num") + private String printNum; + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ExampleOrderEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderEntity.java similarity index 99% rename from jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ExampleOrderEntity.java rename to jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderEntity.java index 4032d8d..cee934f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ExampleOrderEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderEntity.java @@ -1,4 +1,4 @@ -package jnpf.entity; +package jnpf.model.order; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderForm.java index a84fbd2..6ec3e09 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/order/ExampleOrderForm.java @@ -2,7 +2,7 @@ package jnpf.model.order; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; -import jnpf.entity.OrderDetailEntity; +import jnpf.model.orderdetail.OrderDetailEntity; import jnpf.model.orderdetail.OrderDetailForm; import lombok.Data; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/OrderDetailEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/orderdetail/OrderDetailEntity.java similarity index 98% rename from jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/OrderDetailEntity.java rename to jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/orderdetail/OrderDetailEntity.java index 01e54f3..86f966f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/OrderDetailEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/orderdetail/OrderDetailEntity.java @@ -1,4 +1,4 @@ -package jnpf.entity; +package jnpf.model.orderdetail; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ShiftConfigEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigEntity.java similarity index 98% rename from jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ShiftConfigEntity.java rename to jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigEntity.java index b52fe02..635a87f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ShiftConfigEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigEntity.java @@ -1,4 +1,4 @@ -package jnpf.entity; +package jnpf.model.shift; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigForm.java index 0295de5..13995cc 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shift/ShiftConfigForm.java @@ -1,10 +1,8 @@ package jnpf.model.shift; import io.swagger.v3.oas.annotations.media.Schema; -import jnpf.entity.ShiftConfigEntity; import lombok.Data; -import java.io.Serializable; import java.util.Date; import java.util.List; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ShiftResultEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shiftresult/ShiftResultEntity.java similarity index 98% rename from jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ShiftResultEntity.java rename to jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shiftresult/ShiftResultEntity.java index e6842ad..a72558e 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/ShiftResultEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/shiftresult/ShiftResultEntity.java @@ -1,4 +1,4 @@ -package jnpf.entity; +package jnpf.model.shiftresult; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/jnpf-java-boot/jnpf-web/src/views/example/checkitem/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/Detail.vue new file mode 100644 index 0000000..5ef414f --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/Detail.vue @@ -0,0 +1,184 @@ + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/checkitem/columnList.js b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/columnList.js new file mode 100644 index 0000000..5167e88 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/columnList.js @@ -0,0 +1,2 @@ +const columnList = [{"border":false,"jnpfKey":"radio","fullName":"����","label":"����","sortable":false,"align":"center","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"����","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759653950641,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":12},"size":"small","prop":"nature","width":0,"options":[{"fullName":"����","id":"1"},{"fullName":"����","id":"2"}],"__vModel__":"nature","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"nature","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"����","label":"����","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"����","trigger":"blur","showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759653941565,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"itemName","showWordLimit":false,"width":0,"__vModel__":"itemName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"itemName","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"��λ","label":"��λ","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"��λ","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759653969005,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"unitName","showWordLimit":false,"width":0,"__vModel__":"unitName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"unitName","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"���鷽��","label":"���鷽��","sortable":false,"align":"center","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"���鷽��","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654163539,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"checkMethod","showWordLimit":true,"width":0,"__vModel__":"checkMethod","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"checkMethod","placeholder":"������","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"��������","label":"��������","sortable":false,"align":"center","props":{"label":"fullName","value":"id"},"__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"��������","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759654009823,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"prop":"itemType","width":0,"options":[{"fullName":"ԭ����","id":"1"},{"fullName":"���Ʒ","id":"2"},{"fullName":"��Ʒ","id":"3"}],"__vModel__":"itemType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"itemType","placeholder":"��ѡ��","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"����ֵ����","label":"����ֵ����","sortable":false,"align":"center","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"����ֵ����","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759653978912,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"prop":"itemValueType","width":0,"options":[{"fullName":"����","id":"I"},{"fullName":"�ı�","id":"T"}],"__vModel__":"itemValueType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"itemValueType","placeholder":"��ѡ��","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"����ֵ����","label":"����ֵ����","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"����ֵ����","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654045773,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"testNum","showWordLimit":false,"width":0,"__vModel__":"testNum","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"testNum","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"��ֵ","label":"��ֵ","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"��ֵ","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654055641,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^[\\w\\u4e00-\\u9fa5]+(,[\\w\\u4e00-\\u9fa5]+)*$/","message":"��ʽ����"}],"span":12},"readonly":false,"prop":"itemContent","showWordLimit":false,"width":0,"__vModel__":"itemContent","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"itemContent","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"С��λ��","label":"С��λ��","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":111,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"С��λ��","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654129969,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"floatNum","showWordLimit":false,"width":0,"__vModel__":"floatNum","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"floatNum","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"��ע","label":"��ע","sortable":false,"align":"center","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"��ע","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654163706,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"remark","showWordLimit":true,"width":0,"__vModel__":"remark","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"������","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"���","label":"���","sortable":false,"align":"center","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"���","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759653934177,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"itemNo","showWordLimit":false,"width":0,"__vModel__":"itemNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"itemNo","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}}] +export default columnList diff --git a/jnpf-java-boot/jnpf-web/src/views/example/checkitem/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/form.vue new file mode 100644 index 0000000..0ac168d --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/form.vue @@ -0,0 +1,685 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/checkitem/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/index.vue new file mode 100644 index 0000000..90efaf6 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/index.vue @@ -0,0 +1,525 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/checkitem/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/superQueryJson.js new file mode 100644 index 0000000..3f2745a --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/checkitem/superQueryJson.js @@ -0,0 +1,2 @@ +const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"���","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"���","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759653934177,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"itemNo","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"itemNo","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"����","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"����","trigger":"blur","showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759653941565,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"itemName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"itemName","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"border":false,"fullName":"����","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"����","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759653950641,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":12},"size":"small","options":[{"fullName":"����","id":"1"},{"fullName":"����","id":"2"}],"__vModel__":"nature","style":{},"disabled":false,"interfaceHasPage":false,"id":"nature","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"��λ","addonAfter":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"��λ","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759653969005,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"unitName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"unitName","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"����ֵ����","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"����ֵ����","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759653978912,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"options":[{"fullName":"����","id":"I"},{"fullName":"�ı�","id":"T"}],"__vModel__":"itemValueType","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"itemValueType","placeholder":"��ѡ��","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"��������","props":{"label":"fullName","value":"id"},"__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"��������","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759654009823,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"options":[{"fullName":"ԭ����","id":"1"},{"fullName":"���Ʒ","id":"2"},{"fullName":"��Ʒ","id":"3"}],"__vModel__":"itemType","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"itemType","placeholder":"��ѡ��","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"����ֵ����","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"����ֵ����","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654045773,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"testNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"testNum","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"��ֵ","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"��ֵ","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654055641,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[{"pattern":"/^[\\w\\u4e00-\\u9fa5]+(,[\\w\\u4e00-\\u9fa5]+)*$/","message":"��ʽ����"}],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"itemContent","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"itemContent","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"border":false,"fullName":"�Ƿ�ȡƽ��ֵ","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":109,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"labelWidth":120,"className":[],"label":"�Ƿ�ȡƽ��ֵ","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654090406,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":12},"size":"small","options":[{"fullName":"��","id":"Y"},{"fullName":"��","id":"N"}],"__vModel__":"printAvgValues","style":{},"disabled":false,"interfaceHasPage":false,"id":"printAvgValues","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"},"direction":"horizontal"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"С��λ��","addonAfter":"","__config__":{"formId":111,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"С��λ��","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654129969,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"floatNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"floatNum","placeholder":"������","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"�������","props":{"label":"fullName","value":"enCode"},"__config__":{"formId":110,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"735522143873283205","tipLabel":"","dragDisabled":false,"className":[],"label":"�������","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"qa_check_item_base","renderKey":1759654122448,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"options":[],"__vModel__":"itemClass","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"itemClass","placeholder":"��ѡ��","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"maxlength":null,"fullName":"���鷽��","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"���鷽��","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654163539,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"checkMethod","style":{"width":"100%"},"disabled":false,"id":"checkMethod","placeholder":"������","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}},{"maxlength":null,"fullName":"��ע","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"��ע","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_check_item_base","renderKey":1759654163706,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"remark","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"������","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // �ڴ˱�д����\n \n}"}}] +export default superQueryJson diff --git a/jnpf-java-boot/jnpf-web/src/views/example/inspplan/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/Detail.vue new file mode 100644 index 0000000..59d8826 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/Detail.vue @@ -0,0 +1,230 @@ + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/inspplan/columnList.js b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/columnList.js new file mode 100644 index 0000000..06b6873 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/columnList.js @@ -0,0 +1,2 @@ +const columnList = [{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"编号","label":"编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"编号","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336723164,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"schemeNo","showWordLimit":false,"width":0,"__vModel__":"schemeNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"schemeNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"名称","label":"名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"名称","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336727682,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"schemeName","showWordLimit":false,"width":0,"__vModel__":"schemeName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"schemeName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"适用类型","label":"适用类型","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"适用类型","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336727822,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"schemeType","showWordLimit":false,"width":0,"__vModel__":"schemeType","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"schemeType","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"描述","label":"描述","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"描述","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336727988,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"remark","showWordLimit":false,"width":0,"__vModel__":"remark","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"jnpfKey":"createUser","fullName":"创建人","label":"创建人","sortable":false,"align":"left","type":"currUser","__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建人","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336792766,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":12},"readonly":true,"prop":"creatorUserId","width":0,"__vModel__":"creatorUserId","fixed":"none","style":{"width":"100%"},"id":"creatorUserId","placeholder":""},{"jnpfKey":"createTime","fullName":"创建时间","label":"创建时间","sortable":false,"align":"left","type":"currTime","__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"createTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建时间","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336808000,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-createtime","tag":"JnpfOpenData","span":12},"readonly":true,"prop":"creatorTime","width":0,"__vModel__":"creatorTime","fixed":"none","style":{"width":"100%"},"id":"creatorTime","placeholder":""},{"popupType":"dialog","hasPage":false,"modelId":"608540150753923141","pageSize":20,"columnOptions":[{"label":"编号","value":"item_no"},{"label":"名称","value":"item_name"},{"label":"性质","value":"nature"},{"label":"单位","value":"unit_name"}],"align":"left","__config__":{"formId":119,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"relationForm","defaultValue":"","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"检验项目","trigger":"change","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336914677,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-menu","isSubTable":true,"tag":"JnpfRelationForm","regList":[],"span":24},"prop":"tableField114-itemId","__vModel__":"itemId","disabled":false,"id":"tableField114-itemId","placeholder":"请选择","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"filterable":false,"clearable":true,"jnpfKey":"relationForm","fullName":"设计子表-检验项目","label":"设计子表-检验项目","sortable":false,"relationField":"item_name","popupTitle":"选择数据","width":200,"fixed":"none","style":{"width":"100%"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"设计子表-单位","label":"设计子表-单位","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":116,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"单位","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336896718,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField114-unit","showWordLimit":false,"width":0,"__vModel__":"unit","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField114-unit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"设计子表-标准值","label":"设计子表-标准值","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":117,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"标准值","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336897114,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField114-standardValue","showWordLimit":false,"width":0,"__vModel__":"standardValue","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField114-standardValue","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"设计子表-上限值","label":"设计子表-上限值","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":118,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"上限值","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336897422,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField114-upperLimit","showWordLimit":false,"width":0,"__vModel__":"upperLimit","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField114-upperLimit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"设计子表-下限值","label":"设计子表-下限值","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":120,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"下限值","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336974546,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField114-lowerLimit","showWordLimit":false,"width":0,"__vModel__":"lowerLimit","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField114-lowerLimit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"设计子表-备注","label":"设计子表-备注","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":121,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336987556,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField114-remark","showWordLimit":false,"width":0,"__vModel__":"remark","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField114-remark","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default columnList diff --git a/jnpf-java-boot/jnpf-web/src/views/example/inspplan/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/form.vue new file mode 100644 index 0000000..b90889f --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/form.vue @@ -0,0 +1,1017 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/inspplan/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/index.vue new file mode 100644 index 0000000..9dbd9c3 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/index.vue @@ -0,0 +1,505 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/inspplan/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/superQueryJson.js new file mode 100644 index 0000000..0464a56 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/inspplan/superQueryJson.js @@ -0,0 +1,2 @@ +const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"编号","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"编号","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336723164,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"schemeNo","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"schemeNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"名称","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"名称","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336727682,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"schemeName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"schemeName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"适用类型","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"适用类型","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336727822,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"schemeType","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"schemeType","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"描述","addonAfter":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"描述","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336727988,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"remark","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"remark","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"__config__":{"formId":112,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建人","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336792766,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":12},"readonly":true,"__vModel__":"creatorUserId","fullName":"创建人","style":{"width":"100%"},"id":"creatorUserId","placeholder":"","type":"currUser"},{"__config__":{"formId":113,"visibility":["pc","app"],"jnpfKey":"createTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建时间","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336808000,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-createtime","tag":"JnpfOpenData","span":12},"readonly":true,"__vModel__":"creatorTime","fullName":"创建时间","style":{"width":"100%"},"id":"creatorTime","placeholder":"","type":"currTime"},{"popupType":"dialog","hasPage":false,"filterable":false,"clearable":true,"modelId":"608540150753923141","fullName":"设计子表-检验项目","pageSize":20,"columnOptions":[{"label":"编号","value":"item_no"},{"label":"名称","value":"item_name"},{"label":"性质","value":"nature"},{"label":"单位","value":"unit_name"}],"relationField":"item_name","__config__":{"formId":119,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"relationForm","defaultValue":"","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"检验项目","trigger":"change","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336914677,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-menu","isSubTable":true,"tag":"JnpfRelationForm","regList":[],"span":24},"popupTitle":"选择数据","__vModel__":"itemId","style":{"width":"100%"},"disabled":false,"id":"tableField114-itemId","placeholder":"请选择","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设计子表-单位","addonAfter":"","__config__":{"formId":116,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"单位","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336896718,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"unit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField114-unit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设计子表-标准值","addonAfter":"","__config__":{"formId":117,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"标准值","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336897114,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"standardValue","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField114-standardValue","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设计子表-上限值","addonAfter":"","__config__":{"formId":118,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"上限值","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336897422,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"upperLimit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField114-upperLimit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设计子表-下限值","addonAfter":"","__config__":{"formId":120,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"下限值","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336974546,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"lowerLimit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField114-lowerLimit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"设计子表-备注","addonAfter":"","__config__":{"formId":121,"relationTable":"qa_scheme_base_tw","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField114","tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"qa_scheme_base","renderKey":1729336987556,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"remark","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField114-remark","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default superQueryJson diff --git a/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue index 8fa1a90..b452876 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/order/form.vue @@ -113,7 +113,7 @@ label="合同编号" prop="contractNo" > @@ -198,11 +198,11 @@ -