diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysDayPackageMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysDayPackageMapper.java index 6a9a3cc..6fb665d 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysDayPackageMapper.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysDayPackageMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-08-06 + * 日期： 2024-08-19 */ public interface YysDayPackageMapper extends BaseMapper { diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java index ea3048f..4c2998c 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayPackageService.java @@ -15,12 +15,12 @@ import jnpf.model.yysdaywork.ConfirmResponse; * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-08-06 + * 日期： 2024-08-19 */ public interface YysDayPackageService extends IService { List getList(YysDayPackagePagination yysDayPackagePagination); - List getTypeList(YysDayPackagePagination yysDayPackagePagination, String dataType); + List getTypeList(YysDayPackagePagination yysDayPackagePagination,String dataType); YysDayPackageEntity getInfo(String id); @@ -32,9 +32,9 @@ public interface YysDayPackageService extends IService { //子表方法 //副表数据方法 - String checkForm(YysDayPackageForm form, int i); + String checkForm(YysDayPackageForm form,int i); - void saveOrUpdate(YysDayPackageForm yysDayPackageForm, String id, boolean isSave) throws Exception; + void saveOrUpdate(YysDayPackageForm yysDayPackageForm,String id, boolean isSave) throws Exception; /** * 报工确认列表-app diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java index 21846f6..255584d 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayPackageServiceImpl.java @@ -39,25 +39,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - import java.text.SimpleDateFormat; - import jnpf.util.*; - import java.util.*; - import jnpf.base.UserInfo; import jnpf.permission.entity.UserEntity; - /** + * * yysDayPackage * 版本： V3.5 * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 作者： JNPF开发平台组 - * 日期： 2024-08-06 + * 日期： 2024-08-19 */ @Service -public class YysDayPackageServiceImpl extends ServiceImpl implements YysDayPackageService { +public class YysDayPackageServiceImpl extends ServiceImpl implements YysDayPackageService{ @Autowired private GeneraterSwapUtil generaterSwapUtil; @@ -71,172 +67,169 @@ public class YysDayPackageServiceImpl extends ServiceImpl getList(YysDayPackagePagination yysDayPackagePagination) { - return getTypeList(yysDayPackagePagination, yysDayPackagePagination.getDataType()); + public List getList(YysDayPackagePagination yysDayPackagePagination){ + return getTypeList(yysDayPackagePagination,yysDayPackagePagination.getDataType()); } - - /** - * 列表查询 - */ + /** 列表查询 */ @Override - public List getTypeList(YysDayPackagePagination yysDayPackagePagination, String dataType) { - String userId = userProvider.get().getUserId(); - List AllIdList = new ArrayList(); - List> intersectionList = new ArrayList<>(); + public List getTypeList(YysDayPackagePagination yysDayPackagePagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + List> intersectionList =new ArrayList<>(); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); String columnData = !isPc ? YysDayPackageConstant.getAppColumnData() : YysDayPackageConstant.getColumnData(); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); - int total = 0; - int yysDayPackageNum = 0; - QueryWrapper yysDayPackageQueryWrapper = new QueryWrapper<>(); + int total=0; + int yysDayPackageNum =0; + QueryWrapper yysDayPackageQueryWrapper=new QueryWrapper<>(); List allSuperIDlist = new ArrayList<>(); - String superOp = ""; - if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getSuperQueryJson())) { + String superOp =""; + if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getSuperQueryJson())){ List allSuperList = new ArrayList<>(); - List> intersectionSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); String queryJson = yysDayPackagePagination.getSuperQueryJson(); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); int superNum = 0; QueryWrapper yysDayPackageSuperWrapper = new QueryWrapper<>(); - yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper, YysDayPackageEntity.class, queryJson, "0")); + yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper,YysDayPackageEntity.class,queryJson,"0")); int yysDayPackageNum1 = yysDayPackageSuperWrapper.getExpression().getNormal().size(); - if (yysDayPackageNum1 > 0) { - List yysDayPackageList = this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); + if (yysDayPackageNum1>0){ + List yysDayPackageList =this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); allSuperList.addAll(yysDayPackageList); intersectionSuperList.add(yysDayPackageList); superNum++; } superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; //and or - if (superOp.equalsIgnoreCase("and")) { + if(superOp.equalsIgnoreCase("and")){ allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); - } else { + }else{ allSuperIDlist = allSuperList; } } List allRuleIDlist = new ArrayList<>(); - String ruleOp = ""; - if (ObjectUtil.isNotEmpty(ruleJson)) { + String ruleOp =""; + if (ObjectUtil.isNotEmpty(ruleJson)){ List allRuleList = new ArrayList<>(); - List> intersectionRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); int ruleNum = 0; QueryWrapper yysDayPackageSuperWrapper = new QueryWrapper<>(); - yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper, YysDayPackageEntity.class, ruleJson, "0")); + yysDayPackageSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayPackageSuperWrapper,YysDayPackageEntity.class,ruleJson,"0")); int yysDayPackageNum1 = yysDayPackageSuperWrapper.getExpression().getNormal().size(); - if (yysDayPackageNum1 > 0) { - List yysDayPackageList = this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); + if (yysDayPackageNum1>0){ + List yysDayPackageList =this.list(yysDayPackageSuperWrapper).stream().map(YysDayPackageEntity::getId).collect(Collectors.toList()); allRuleList.addAll(yysDayPackageList); intersectionRuleList.add(yysDayPackageList); ruleNum++; } ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; //and or - if (ruleOp.equalsIgnoreCase("and")) { + if(ruleOp.equalsIgnoreCase("and")){ allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); - } else { + }else{ allRuleIDlist = allRuleList; } } - boolean pcPermission = false; - boolean appPermission = false; - if (isPc && pcPermission) { - if (!userProvider.get().getIsAdministrator()) { - Object yysDayPackageObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper, YysDayPackageEntity.class, yysDayPackagePagination.getMenuId(), "0")); - if (ObjectUtil.isEmpty(yysDayPackageObj)) { - return new ArrayList<>(); - } else { - yysDayPackageQueryWrapper = (QueryWrapper) yysDayPackageObj; - if (yysDayPackageQueryWrapper.getExpression().getNormal().size() > 0) { - yysDayPackageNum++; - } - } - } + boolean pcPermission = false; + boolean appPermission = false; + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object yysDayPackageObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper,YysDayPackageEntity.class,yysDayPackagePagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(yysDayPackageObj)){ + return new ArrayList<>(); + } else { + yysDayPackageQueryWrapper = (QueryWrapper)yysDayPackageObj; + if( yysDayPackageQueryWrapper.getExpression().getNormal().size()>0){ + yysDayPackageNum++; + } + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object yysDayPackageObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper,YysDayPackageEntity.class,yysDayPackagePagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(yysDayPackageObj)){ + return new ArrayList<>(); + } else { + yysDayPackageQueryWrapper = (QueryWrapper)yysDayPackageObj; + if( yysDayPackageQueryWrapper.getExpression().getNormal().size()>0){ + yysDayPackageNum++; + } } - if (!isPc && appPermission) { - if (!userProvider.get().getIsAdministrator()) { - Object yysDayPackageObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayPackageQueryWrapper, YysDayPackageEntity.class, yysDayPackagePagination.getMenuId(), "0")); - if (ObjectUtil.isEmpty(yysDayPackageObj)) { - return new ArrayList<>(); - } else { - yysDayPackageQueryWrapper = (QueryWrapper) yysDayPackageObj; - if (yysDayPackageQueryWrapper.getExpression().getNormal().size() > 0) { - yysDayPackageNum++; - } - } - } - } - if (isPc) { - if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getManufactureTime())) { - yysDayPackageNum++; + } + } + if(isPc){ + if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getManufactureTime())){ + yysDayPackageNum++; - List ManufactureTimeList = JsonUtil.getJsonToList(yysDayPackagePagination.getManufactureTime(), String.class); - Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0))); - Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); + List ManufactureTimeList = JsonUtil.getJsonToList(yysDayPackagePagination.getManufactureTime(),String.class); + Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0))); + Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); - yysDayPackageQueryWrapper.lambda().ge(YysDayPackageEntity::getManufactureTime, new Date(fir)) - .le(YysDayPackageEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + yysDayPackageQueryWrapper.lambda().ge(YysDayPackageEntity::getManufactureTime, new Date(fir)) + .le(YysDayPackageEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } - if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductCode())) { - yysDayPackageNum++; + if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductCode())){ + yysDayPackageNum++; String value = yysDayPackagePagination.getProductCode() instanceof List ? - JsonUtil.getObjectToString(yysDayPackagePagination.getProductCode()) : - String.valueOf(yysDayPackagePagination.getProductCode()); - yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductCode, value); + JsonUtil.getObjectToString(yysDayPackagePagination.getProductCode()) : + String.valueOf(yysDayPackagePagination.getProductCode()); + yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductCode,value); } - if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductName())) { - yysDayPackageNum++; + if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getProductName())){ + yysDayPackageNum++; String value = yysDayPackagePagination.getProductName() instanceof List ? - JsonUtil.getObjectToString(yysDayPackagePagination.getProductName()) : - String.valueOf(yysDayPackagePagination.getProductName()); - yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductName, value); + JsonUtil.getObjectToString(yysDayPackagePagination.getProductName()) : + String.valueOf(yysDayPackagePagination.getProductName()); + yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getProductName,value); } - if (ObjectUtil.isNotEmpty(yysDayPackagePagination.getDeviceName())) { - yysDayPackageNum++; + if(ObjectUtil.isNotEmpty(yysDayPackagePagination.getDeviceName())){ + yysDayPackageNum++; String value = yysDayPackagePagination.getDeviceName() instanceof List ? - JsonUtil.getObjectToString(yysDayPackagePagination.getDeviceName()) : - String.valueOf(yysDayPackagePagination.getDeviceName()); - yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getDeviceName, value); + JsonUtil.getObjectToString(yysDayPackagePagination.getDeviceName()) : + String.valueOf(yysDayPackagePagination.getDeviceName()); + yysDayPackageQueryWrapper.lambda().like(YysDayPackageEntity::getDeviceName,value); } } List intersection = generaterSwapUtil.getIntersection(intersectionList); - if (total > 0) { - if (intersection.size() == 0) { + if (total>0){ + if (intersection.size()==0){ intersection.add("jnpfNullList"); } yysDayPackageQueryWrapper.lambda().in(YysDayPackageEntity::getId, intersection); } - //是否有高级查询 - if (StringUtil.isNotEmpty(superOp)) { - if (allSuperIDlist.size() == 0) { + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)){ + if (allSuperIDlist.size()==0){ allSuperIDlist.add("jnpfNullList"); } List finalAllSuperIDlist = allSuperIDlist; - yysDayPackageQueryWrapper.lambda().and(t -> t.in(YysDayPackageEntity::getId, finalAllSuperIDlist)); + yysDayPackageQueryWrapper.lambda().and(t->t.in(YysDayPackageEntity::getId, finalAllSuperIDlist)); } - //是否有数据过滤查询 - if (StringUtil.isNotEmpty(ruleOp)) { - if (allRuleIDlist.size() == 0) { + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)){ + if (allRuleIDlist.size()==0){ allRuleIDlist.add("jnpfNullList"); } List finalAllRuleIDlist = allRuleIDlist; - yysDayPackageQueryWrapper.lambda().and(t -> t.in(YysDayPackageEntity::getId, finalAllRuleIDlist)); + yysDayPackageQueryWrapper.lambda().and(t->t.in(YysDayPackageEntity::getId, finalAllRuleIDlist)); } //假删除标志 yysDayPackageQueryWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark); @@ -259,102 +252,93 @@ public class YysDayPackageServiceImpl extends ServiceImpl 0 && AllIdList.size() > 0) || total == 0) { - Page page = new Page<>(yysDayPackagePagination.getCurrentPage(), yysDayPackagePagination.getPageSize()); - IPage userIPage = this.page(page, yysDayPackageQueryWrapper); - return yysDayPackagePagination.setData(userIPage.getRecords(), userIPage.getTotal()); - } else { + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(yysDayPackagePagination.getCurrentPage(), yysDayPackagePagination.getPageSize()); + IPage userIPage=this.page(page, yysDayPackageQueryWrapper); + return yysDayPackagePagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ List list = new ArrayList(); return yysDayPackagePagination.setData(list, list.size()); } - } else { + }else{ return this.list(yysDayPackageQueryWrapper); } } - @Override - public YysDayPackageEntity getInfo(String id) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(YysDayPackageEntity::getId, id); + public YysDayPackageEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(YysDayPackageEntity::getId,id); return this.getOne(queryWrapper); } - @Override - public void create(YysDayPackageEntity entity) { + public void create(YysDayPackageEntity entity){ this.save(entity); } - @Override - public boolean update(String id, YysDayPackageEntity entity) { + public boolean update(String id, YysDayPackageEntity entity){ return this.updateById(entity); } - @Override - public void delete(YysDayPackageEntity entity) { - if (entity != null) { + public void delete(YysDayPackageEntity entity){ + if(entity!=null){ this.removeById(entity.getId()); } } - - /** - * 验证表单唯一字段，正则，非空 i-0新增-1修改 - */ + /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ @Override - public String checkForm(YysDayPackageForm form, int i) { - boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); - String id = ""; + public String checkForm(YysDayPackageForm form,int i) { + boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id=""; String countRecover = ""; - if (isUp) { + if (isUp){ id = form.getId(); } //主表字段验证 - if (StringUtil.isEmpty(form.getProductCode())) { - return "产品编码不能为空"; - } - if (StringUtil.isNotEmpty(form.getProductName())) { - form.setProductName(form.getProductName().trim()); - QueryWrapper productNameWrapper = new QueryWrapper<>(); - productNameWrapper.lambda().eq(YysDayPackageEntity::getProductName, form.getProductName()); - //假删除标志 - productNameWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark); - if (isUp) { - productNameWrapper.lambda().ne(YysDayPackageEntity::getId, id); - } - if ((int) this.count(productNameWrapper) > 0) { - countRecover = "产品名称不能重复"; - } - } - if (StringUtil.isEmpty(form.getModels())) { - return "规格型号不能为空"; - } - if (StringUtil.isEmpty(form.getMeasurementUnit())) { - return "计量单位不能为空"; - } + if(StringUtil.isEmpty(form.getDeviceName())){ + return "设备名称不能为空"; + } + if(StringUtil.isNotEmpty(form.getProductName())){ + form.setProductName(form.getProductName().trim()); + QueryWrapper productNameWrapper=new QueryWrapper<>(); + productNameWrapper.lambda().eq(YysDayPackageEntity::getProductName,form.getProductName()); + //假删除标志 + productNameWrapper.lambda().isNull(YysDayPackageEntity::getDeleteMark); + if (isUp){ + productNameWrapper.lambda().ne(YysDayPackageEntity::getId, id); + } + if((int) this.count(productNameWrapper)>0){ + countRecover = "产品名称不能重复"; + } + } + if(StringUtil.isEmpty(form.getModels())){ + return "规格型号不能为空"; + } + if(StringUtil.isEmpty(form.getMeasurementUnit())){ + return "计量单位不能为空"; + } return countRecover; } - /** - * 新增修改数据(事务回滚) - * - * @param id - * @param yysDayPackageForm - * @return - */ + * 新增修改数据(事务回滚) + * @param id + * @param yysDayPackageForm + * @return + */ @Override @Transactional - public void saveOrUpdate(YysDayPackageForm yysDayPackageForm, String id, boolean isSave) throws Exception { - UserInfo userInfo = userProvider.get(); + public void saveOrUpdate(YysDayPackageForm yysDayPackageForm,String id, boolean isSave) throws Exception{ + UserInfo userInfo=userProvider.get(); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); yysDayPackageForm = JsonUtil.getJsonToBean( - generaterSwapUtil.swapDatetime(YysDayPackageConstant.getFormData(), yysDayPackageForm), YysDayPackageForm.class); + generaterSwapUtil.swapDatetime(YysDayPackageConstant.getFormData(),yysDayPackageForm),YysDayPackageForm.class); YysDayPackageEntity entity = JsonUtil.getJsonToBean(yysDayPackageForm, YysDayPackageEntity.class); - if (isSave) { - String mainId = RandomUtil.uuId(); + if(isSave){ + String mainId = RandomUtil.uuId() ; entity.setId(mainId); entity.setVersion(0); - } else { + }else{ } this.saveOrUpdate(entity); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayPackageController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayPackageController.java index 67a9d7b..58a976f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayPackageController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayPackageController.java @@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ @Slf4j @RestController diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayPackageEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayPackageEntity.java index 6677236..b6dfff3 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayPackageEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayPackageEntity.java @@ -9,7 +9,7 @@ import java.util.Date; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ @Data @TableName("yys_day_package") @@ -42,7 +42,7 @@ public class YysDayPackageEntity { private String measurementUnit; @TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED) private String planNumber; - @TableField(value = "IS_CONFIRM" , updateStrategy = FieldStrategy.IGNORED) + @TableField("IS_CONFIRM") private String isConfirm; @TableField("F_CREATOR_TIME") private Date creatorTime; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageConstant.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageConstant.java index 55deaed..4eef255 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageConstant.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageConstant.java @@ -9,7 +9,7 @@ import java.util.Map; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ public class YysDayPackageConstant{ /** 数据库链接 */ @@ -21,7 +21,7 @@ public class YysDayPackageConstant{ /** 整个表单配置json */ public static final String getFormData(){ StringBuilder sb = new StringBuilder(); -sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":116,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722921768594,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_code\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722921879802,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_day_package\",\"renderKey\":1722922365913,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":true,\"placeholder\":\"选择设备后自动带入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_day_package\",\"renderKey\":1722922427003,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"顺序号\",\"controlsPosition\":\"right\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":107,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922468367,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":8},\"options\":[{\"fullName\":\"旺季白班\",\"id\":\"1\"},{\"fullName\":\"旺季晚班\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班次\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922515552,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922546956,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":111,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922594238,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品编码\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_day_package\",\"renderKey\":1722922606105,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":true,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922619554,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922638116,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"measurementUnit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入计量单位\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":false,\"thousands\":false,\"isAmountChinese\":false,\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922652960,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"__vModel__\":\"planNumber\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入计量数量\",\"controlsPosition\":\"\"}],\"span\":24}"); return sb.toString(); +sb.append("{\"popupType\":\"fullScreen\",\"idGlobal\":118,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722921768594,\"tagIcon\":\"icon-ym icon-ym-generator-date\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfDatePicker\",\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"datePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"生产日期\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"yyyy-MM-dd\",\"__vModel__\":\"manufactureTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择生产日期\",\"type\":\"date\"},{\"popupType\":\"dialog\",\"hasPage\":false,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"设备编码\",\"value\":\"device_code\"},{\"label\":\"设备名称\",\"value\":\"device_name\"},{\"label\":\"设备类型\",\"value\":\"device_desc\"}],\"templateJson\":[],\"relationField\":\"device_name\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722921879802,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"deviceCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择设备编码\",\"interfaceId\":\"590497496266971845\",\"interfaceName\":\"查询所有已启用设备\",\"popupWidth\":\"800px\",\"propsValue\":\"device_code\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"设备名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922365913,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"deviceName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入设备名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":106,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"defaultValue\":1,\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"顺序号\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_day_package\",\"renderKey\":1722922427003,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"min\":1,\"__vModel__\":\"sort\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"顺序号\",\"controlsPosition\":\"right\",\"addonBefore\":\"\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"班次名称\",\"value\":\"classes_name\"},{\"label\":\"开始时间\",\"value\":\"start_time\"},{\"label\":\"结束时间\",\"value\":\"end_time\"},{\"label\":\"班次时长\",\"value\":\"classes_duration\"}],\"templateJson\":[],\"relationField\":\"classes_name\",\"__config__\":{\"formId\":117,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"班次\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1724054084702,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"post\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择班次\",\"interfaceId\":\"595237502952944325\",\"interfaceName\":\"查询班次信息\",\"popupWidth\":\"800px\",\"propsValue\":\"id\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922515552,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":109,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"开始时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"startTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择开始时间\"},{\"clearable\":true,\"__config__\":{\"endRelationField\":\"\",\"defaultValue\":\"15:55\",\"dragDisabled\":false,\"className\":[],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922546956,\"tagIcon\":\"icon-ym icon-ym-generator-time\",\"startRelationField\":\"\",\"defaultCurrent\":false,\"tag\":\"JnpfTimePicker\",\"formId\":110,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"timePicker\",\"noShow\":false,\"endTimeTarget\":1,\"tipLabel\":\"\",\"startTimeType\":1,\"endTimeRule\":false,\"label\":\"结束时间\",\"startTimeRule\":false,\"startTimeValue\":\"\",\"trigger\":\"change\",\"endTimeValue\":\"\",\"endTimeType\":1,\"layout\":\"colFormItem\",\"startTimeTarget\":1,\"regList\":[],\"span\":8},\"readonly\":false,\"format\":\"HH:mm\",\"__vModel__\":\"endTime\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请选择结束时间\"},{\"popupType\":\"dialog\",\"hasPage\":true,\"clearable\":true,\"pageSize\":20,\"columnOptions\":[{\"label\":\"产品编码\",\"value\":\"material_id\"},{\"label\":\"产品名称\",\"value\":\"material_name\"},{\"label\":\"规格型号\",\"value\":\"model\"},{\"label\":\"计量单位\",\"value\":\"unit_measurement\"},{\"label\":\"安全库存\",\"value\":\"safety_stock\"}],\"templateJson\":[],\"relationField\":\"material_name\",\"__config__\":{\"formId\":118,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"popupSelect\",\"defaultValue\":\"\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品编码\",\"trigger\":\"change\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1724054161204,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-popup\",\"tag\":\"JnpfPopupSelect\",\"regList\":[],\"span\":8},\"popupTitle\":\"选择数据\",\"__vModel__\":\"productCode\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择产品编码\",\"interfaceId\":\"593079067666820933\",\"interfaceName\":\"查询物料信息\",\"popupWidth\":\"800px\",\"propsValue\":\"material_id\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":112,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"产品名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_day_package\",\"renderKey\":1722922606105,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":true,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"productName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入产品名称\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":113,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"规格型号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922619554,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"models\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入规格型号\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":114,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量单位\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922638116,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":8},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"measurementUnit\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入计量单位\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"step-strictly\":false,\"controls\":true,\"thousands\":false,\"isAmountChinese\":false,\"addonAfter\":\"\",\"__config__\":{\"formId\":115,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"inputNumber\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"计量数量\",\"trigger\":[\"blur\",\"change\"],\"showLabel\":true,\"required\":true,\"tableName\":\"yys_day_package\",\"renderKey\":1722922652960,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-number\",\"tag\":\"JnpfInputNumber\",\"regList\":[],\"span\":8},\"__vModel__\":\"planNumber\",\"style\":{},\"step\":1,\"disabled\":false,\"placeholder\":\"请输入计量数量\",\"controlsPosition\":\"\",\"addonBefore\":\"\"}],\"span\":24}"); return sb.toString(); } /** 列表字段配置json */ public static final String getColumnData(){ @@ -36,6 +36,6 @@ sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"b /** 表列表 */ public static final String getTableList(){ StringBuilder sb = new StringBuilder(); -sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"yys_day_package\",\"tableName\":\"\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"主键\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"manufacture_time\",\"field\":\"manufactureTime\",\"fieldName\":\"生产日期\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"device_code\",\"field\":\"deviceCode\",\"fieldName\":\"设备编码\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"device_name\",\"field\":\"deviceName\",\"fieldName\":\"设备名称\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"sort\",\"field\":\"sort\",\"fieldName\":\"顺序号\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"post\",\"field\":\"post\",\"fieldName\":\"班次（1：旺季白班 2：旺季夜班）\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"start_time\",\"field\":\"startTime\",\"fieldName\":\"开始时间\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"end_time\",\"field\":\"endTime\",\"fieldName\":\"结束时间\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"product_code\",\"field\":\"productCode\",\"fieldName\":\"产品编码\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"product_name\",\"field\":\"productName\",\"fieldName\":\"产品名称\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"models\",\"field\":\"models\",\"fieldName\":\"规格型号\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"measurement_unit\",\"field\":\"measurementUnit\",\"fieldName\":\"计量单位\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"plan_number\",\"field\":\"planNumber\",\"fieldName\":\"计量数量\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_version\",\"field\":\"version\",\"fieldName\":\"乐观锁\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); +sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"yys_day_package\",\"tableName\":\"\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"主键\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"month_id\",\"field\":\"monthId\",\"fieldName\":\"月生产计划id\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"manufacture_time\",\"field\":\"manufactureTime\",\"fieldName\":\"生产日期\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"device_code\",\"field\":\"deviceCode\",\"fieldName\":\"设备编码\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"device_name\",\"field\":\"deviceName\",\"fieldName\":\"设备名称\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"sort\",\"field\":\"sort\",\"fieldName\":\"顺序号\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"post\",\"field\":\"post\",\"fieldName\":\"班次（1：旺季白班 2：旺季夜班）\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"start_time\",\"field\":\"startTime\",\"fieldName\":\"开始时间\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"end_time\",\"field\":\"endTime\",\"fieldName\":\"结束时间\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"product_code\",\"field\":\"productCode\",\"fieldName\":\"产品编码\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"product_name\",\"field\":\"productName\",\"fieldName\":\"产品名称\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"models\",\"field\":\"models\",\"fieldName\":\"规格型号\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"measurement_unit\",\"field\":\"measurementUnit\",\"fieldName\":\"计量单位\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"plan_number\",\"field\":\"planNumber\",\"fieldName\":\"计划数量\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"is_confirm\",\"field\":\"isConfirm\",\"fieldName\":\"计划数量\",\"dataType\":\"varchar\",\"dataLength\":\"255\",\"primaryKey\":0,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_version\",\"field\":\"version\",\"fieldName\":\"乐观锁\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelErrorVO.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelErrorVO.java index a24f302..4541497 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelErrorVO.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelErrorVO.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ @Data public class YysDayPackageExcelErrorVO extends YysDayPackageExcelVO{ diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelVO.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelVO.java index feee386..f72f84b 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelVO.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageExcelVO.java @@ -17,7 +17,7 @@ import java.util.List; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ @Data public class YysDayPackageExcelVO{ diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageForm.java index b6fa654..3db5b6e 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageForm.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ @Data public class YysDayPackageForm { @@ -34,7 +34,7 @@ public class YysDayPackageForm { private BigDecimal sort; /** 班次 **/ @JsonProperty("post") - private Object post; + private String post; /** 开始时间 **/ @JsonProperty("startTime") private String startTime; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackagePagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackagePagination.java index 11a0aed..01a3dba 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackagePagination.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackagePagination.java @@ -11,7 +11,7 @@ import java.util.List; * @版本： V3.5 * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @作者： JNPF开发平台组 - * @日期： 2024-08-06 + * @日期： 2024-08-19 */ @Data public class YysDayPackagePagination extends Pagination { diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue index 117f172..207a8ef 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue @@ -26,15 +26,9 @@

{{ dataForm.deviceName }}

- - - - - - -

{{ dataForm.post }}

+

{{ dataForm.post }}

 @@ -73,6 +67,12 @@ + + + + + + @@ -101,17 +101,15 @@ export default { deviceCode: "", deviceName: '', sort: 1, - post: "1", + post: "", startTime: '', - endTime: '', - productCode: '', + endTime: "15:55", + productCode: "", productName: '', models: '', measurementUnit: '', planNumber: '', }, - postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }], - postProps: { "label": "fullName", "value": "id" }, } }, diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue index 73826c5..8344280 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue @@ -4,24 +4,6 @@
- - - 更 多 - - - - - {{ !dataForm.id ? '确定并新增' : '确定并继续' }} - - 保 存 @@ -37,10 +19,9 @@ + @change="changeData('manufactureTime', -1)" :startTime="dateTime(false, 1, 1, '', '')" + :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择生产日期" clearable + :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd"> @@ -49,7 +30,7 @@ @@ -58,31 +39,27 @@ + placeholder="请输入设备名称" clearable :style='{ "width": "100%" }'> - - - - - - - - + + + :startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')" + placeholder="请选择开始时间" clearable :style='{ "width": "100%" }' format="HH:mm"> @@ -90,17 +67,20 @@ + :startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')" + placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' format="HH:mm"> - - + + @@ -119,9 +99,8 @@ - + @@ -132,6 +111,13 @@ + + + + + + @@ -187,9 +173,9 @@ export default { deviceCode: undefined, deviceName: undefined, sort: 1, - post: "1", + post: undefined, startTime: undefined, - endTime: undefined, + endTime: "15:55", productCode: undefined, productName: undefined, models: undefined, @@ -214,10 +200,17 @@ export default { trigger: 'change' }, ], + deviceName: [ + { + required: true, + message: '请输入设备名称', + trigger: 'blur' + }, + ], post: [ { required: true, - message: '请至少选择一个', + message: '请选择班次', trigger: 'change' }, ], @@ -231,15 +224,15 @@ export default { endTime: [ { required: true, - message: '请选择结束时间', + message: '请至少选择一个', trigger: 'change' }, ], productCode: [ { required: true, - message: '请输入产品编码', - trigger: 'blur' + message: '请选择产品编码', + trigger: 'change' }, ], models: [ @@ -265,8 +258,8 @@ export default { ], }, deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },], - postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }, { "fullName": "淡季白班", "id": "3" }, { "fullName": "淡季晚班", "id": "4" }], - postProps: { "label": "fullName", "value": "id" }, + postcolumnOptions: [{ "label": "班次名称", "value": "classes_name" }, { "label": "开始时间", "value": "start_time" }, { "label": "结束时间", "value": "end_time" }, { "label": "班次时长", "value": "classes_duration" },], + productCodecolumnOptions: [{ "label": "产品编码", "value": "material_id" }, { "label": "产品名称", "value": "material_name" }, { "label": "规格型号", "value": "model" }, { "label": "计量单位", "value": "unit_measurement" }, { "label": "安全库存", "value": "safety_stock" },], childIndex: -1, isEdit: false, interfaceRes: { @@ -335,12 +328,40 @@ export default { this.$emit('refreshDataList', true) }, changeData(model, index) { + if (model == 'post' && this.dataForm.post != undefined) { + request({ + url: '/api/example/YysClasses/getInfoById/' + this.dataForm.post, + method: 'get' + }).then(res => { + let _data = res.data; + let _dataForm = { ...this.dataForm } + _dataForm.startTime = _data.startTime + _dataForm.endTime = _data.endTime + this.dataForm = { ..._dataForm }; + }); + } if (model == 'deviceCode' && this.dataForm.deviceCode != undefined) { request({ url: '/api/example/YysDevice/queryNameByCode/' + this.dataForm.deviceCode, method: 'get' }).then(res => { - this.dataForm.deviceName = res.msg; + let _dataForm = { ...this.dataForm } + _dataForm.deviceName = res.msg + this.dataForm = { ..._dataForm }; + }); + } + if (model == 'productCode' && this.dataForm.productCode != undefined) { + request({ + url: '/api/example/YysMaterialInformation/getInfoByCode/' + this.dataForm.productCode, + method: 'get' + }).then(res => { + let _data = res.data; + let _dataForm = { ...this.dataForm } + _dataForm.productName = _data.materialName + _dataForm.models = _data.model + _dataForm.measurementUnit = _data.unitMeasurement + _dataForm.currentInventory = _data.safetyStock + this.dataForm = { ..._dataForm }; }); } this.isEdit = false diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue index ec947f2..7d45490 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue @@ -196,10 +196,10 @@ export default { flowListVisible: false, flowList: [], exportBoxVisible: false, - postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }], - postProps: { "label": "fullName", "value": "id" }, interfaceRes: { deviceCode: [], + post: [], + productCode: [], }, } }, @@ -383,10 +383,10 @@ export default { const year = now.getFullYear(); const month = String(now.getMonth() + 1).padStart(2, '0'); const startDate = `${year}-${month}-01 00:00:00`; - const startDateTimestamp = new Date(startDate).getTime(); - const endDate = `${year}-${month}-${new Date(year, now.getMonth() + 1, 0).getDate()}`; - const endDateTimestamp = new Date(endDate).getTime(); - this.query.manufactureTime = [startDateTimestamp, endDateTimestamp]; + const startDateTimestamp = new Date(startDate).getTime(); + const endDate = `${year}-${month}-${new Date(year, now.getMonth() + 1, 0).getDate()}`; + const endDateTimestamp = new Date(endDate).getTime(); + this.query.manufactureTime = [startDateTimestamp, endDateTimestamp]; }, initData() { this.listLoading = true; diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue index 9c4434c..0463f72 100644 --- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue @@ -19,7 +19,7 @@