diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ContractRelationMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ContractRelationMapper.xml new file mode 100644 index 00000000..2df00064 --- /dev/null +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ContractRelationMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml index 3eb209db..6c85d560 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml @@ -41,6 +41,9 @@ + + + @@ -137,14 +140,18 @@ a.*, b.NAME AS businessfactory , c.NAME AS businessName, - d.f_real_name AS realName + d.f_real_name AS realName, + f.proportion_num AS proportionNum, + f.unit_id AS unitId, + e.name AS productName, + e.code AS productCode FROM jg_work_order a LEFT JOIN jg_business_line b ON a.businessfactory_id = b.id LEFT JOIN jg_business_line c ON a.business_id = c.id LEFT JOIN base_user d ON a.f_creator_user_id = d.f_id LEFT JOIN jg_product e ON a.product_id = e.id - + LEFT JOIN jg_work_order_product f ON a.id = f.work_id ${ew.customSqlSegment} GROUP BY a.id diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ContractRelationMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ContractRelationMapper.java new file mode 100644 index 00000000..3f992d02 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ContractRelationMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + + +import jnpf.entity.ContractRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * contractRelation + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-07-15 + */ +public interface ContractRelationMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ContractRelationService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ContractRelationService.java new file mode 100644 index 00000000..24c3e255 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ContractRelationService.java @@ -0,0 +1,35 @@ +package jnpf.service; + +import jnpf.model.contractrelation.*; +import jnpf.entity.*; +import java.util.*; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +/** + * contractRelation + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-07-15 + */ +public interface ContractRelationService extends IService { + List getList(ContractRelationPagination contractRelationPagination); + + List getTypeList(ContractRelationPagination contractRelationPagination,String dataType); + + ContractRelationEntity getInfo(String id); + + void delete(ContractRelationEntity entity); + + void create(ContractRelationEntity entity); + + boolean update(String id, ContractRelationEntity entity); + + //子表方法 + //副表数据方法 + String checkForm(ContractRelationForm form,int i); + + void saveOrUpdate(ContractRelationForm contractRelationForm,String id, boolean isSave) throws Exception; + +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractRelationServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractRelationServiceImpl.java new file mode 100644 index 00000000..02189457 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractRelationServiceImpl.java @@ -0,0 +1,258 @@ +package jnpf.service.impl; + +import jnpf.entity.*; +import jnpf.mapper.ContractRelationMapper; +import jnpf.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.model.contractrelation.*; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; +import jnpf.permission.model.authorize.AuthorizeConditionModel; +import jnpf.util.GeneraterSwapUtil; +import jnpf.database.model.superQuery.SuperQueryJsonModel; +import jnpf.database.model.superQuery.ConditionJsonModel; +import jnpf.database.model.superQuery.SuperQueryConditionModel; +import java.lang.reflect.Field; +import com.baomidou.mybatisplus.annotation.TableField; +import java.util.regex.Pattern; +import jnpf.model.QueryModel; +import java.util.stream.Collectors; +import jnpf.base.model.ColumnDataModel; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jnpf.database.model.superQuery.SuperJsonModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; +import jnpf.base.UserInfo; +import jnpf.permission.entity.UserEntity; +/** + * + * contractRelation + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-07-15 + */ +@Service +public class ContractRelationServiceImpl extends ServiceImpl implements ContractRelationService{ + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Override + public List getList(ContractRelationPagination contractRelationPagination){ + return getTypeList(contractRelationPagination,contractRelationPagination.getDataType()); + } + /** 列表查询 */ + @Override + public List getTypeList(ContractRelationPagination contractRelationPagination,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 ? ContractRelationConstant.getAppColumnData() : ContractRelationConstant.getColumnData(); + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); + String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); + + int total=0; + int contractRelationNum =0; + QueryWrapper contractRelationQueryWrapper=new QueryWrapper<>(); + List allSuperIDlist = new ArrayList<>(); + String superOp =""; + if (ObjectUtil.isNotEmpty(contractRelationPagination.getSuperQueryJson())){ + List allSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); + String queryJson = contractRelationPagination.getSuperQueryJson(); + SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); + int superNum = 0; + QueryWrapper contractRelationSuperWrapper = new QueryWrapper<>(); + contractRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(contractRelationSuperWrapper,ContractRelationEntity.class,queryJson,"0")); + int contractRelationNum1 = contractRelationSuperWrapper.getExpression().getNormal().size(); + if (contractRelationNum1>0){ + List contractRelationList =this.list(contractRelationSuperWrapper).stream().map(ContractRelationEntity::getId).collect(Collectors.toList()); + allSuperList.addAll(contractRelationList); + intersectionSuperList.add(contractRelationList); + superNum++; + } + superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; + //and or + if(superOp.equalsIgnoreCase("and")){ + allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); + }else{ + allSuperIDlist = allSuperList; + } + } + List allRuleIDlist = new ArrayList<>(); + String ruleOp =""; + if (ObjectUtil.isNotEmpty(ruleJson)){ + List allRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); + SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); + int ruleNum = 0; + QueryWrapper contractRelationSuperWrapper = new QueryWrapper<>(); + contractRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(contractRelationSuperWrapper,ContractRelationEntity.class,ruleJson,"0")); + int contractRelationNum1 = contractRelationSuperWrapper.getExpression().getNormal().size(); + if (contractRelationNum1>0){ + List contractRelationList =this.list(contractRelationSuperWrapper).stream().map(ContractRelationEntity::getId).collect(Collectors.toList()); + allRuleList.addAll(contractRelationList); + intersectionRuleList.add(contractRelationList); + ruleNum++; + } + ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; + //and or + if(ruleOp.equalsIgnoreCase("and")){ + allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); + }else{ + allRuleIDlist = allRuleList; + } + } + boolean pcPermission = false; + boolean appPermission = false; + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object contractRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(contractRelationQueryWrapper,ContractRelationEntity.class,contractRelationPagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(contractRelationObj)){ + return new ArrayList<>(); + } else { + contractRelationQueryWrapper = (QueryWrapper)contractRelationObj; + if( contractRelationQueryWrapper.getExpression().getNormal().size()>0){ + contractRelationNum++; + } + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object contractRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(contractRelationQueryWrapper,ContractRelationEntity.class,contractRelationPagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(contractRelationObj)){ + return new ArrayList<>(); + } else { + contractRelationQueryWrapper = (QueryWrapper)contractRelationObj; + if( contractRelationQueryWrapper.getExpression().getNormal().size()>0){ + contractRelationNum++; + } + } + + + } + } + List intersection = generaterSwapUtil.getIntersection(intersectionList); + if (total>0){ + if (intersection.size()==0){ + intersection.add("jnpfNullList"); + } + contractRelationQueryWrapper.lambda().in(ContractRelationEntity::getId, intersection); + } + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)){ + if (allSuperIDlist.size()==0){ + allSuperIDlist.add("jnpfNullList"); + } + List finalAllSuperIDlist = allSuperIDlist; + contractRelationQueryWrapper.lambda().and(t->t.in(ContractRelationEntity::getId, finalAllSuperIDlist)); + } + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)){ + if (allRuleIDlist.size()==0){ + allRuleIDlist.add("jnpfNullList"); + } + List finalAllRuleIDlist = allRuleIDlist; + contractRelationQueryWrapper.lambda().and(t->t.in(ContractRelationEntity::getId, finalAllRuleIDlist)); + } + //假删除标志 + contractRelationQueryWrapper.lambda().isNull(ContractRelationEntity::getDeleteMark); + + //排序 + if(StringUtil.isEmpty(contractRelationPagination.getSidx())){ + contractRelationQueryWrapper.lambda().orderByDesc(ContractRelationEntity::getId); + }else{ + try { + String sidx = contractRelationPagination.getSidx(); + String[] strs= sidx.split("_name"); + ContractRelationEntity contractRelationEntity = new ContractRelationEntity(); + Field declaredField = contractRelationEntity.getClass().getDeclaredField(strs[0]); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + contractRelationQueryWrapper="asc".equals(contractRelationPagination.getSort().toLowerCase())?contractRelationQueryWrapper.orderByAsc(value):contractRelationQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(contractRelationPagination.getCurrentPage(), contractRelationPagination.getPageSize()); + IPage userIPage=this.page(page, contractRelationQueryWrapper); + return contractRelationPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return contractRelationPagination.setData(list, list.size()); + } + }else{ + return this.list(contractRelationQueryWrapper); + } + } + @Override + public ContractRelationEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(ContractRelationEntity::getId,id); + return this.getOne(queryWrapper); + } + @Override + public void create(ContractRelationEntity entity){ + this.save(entity); + } + @Override + public boolean update(String id, ContractRelationEntity entity){ + return this.updateById(entity); + } + @Override + public void delete(ContractRelationEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + @Override + public String checkForm(ContractRelationForm form,int i) { + boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id=""; + String countRecover = ""; + if (isUp){ + id = form.getId(); + } + //主表字段验证 + return countRecover; + } + /** + * 新增修改数据(事务回滚) + * @param id + * @param contractRelationForm + * @return + */ + @Override + @Transactional + public void saveOrUpdate(ContractRelationForm contractRelationForm,String id, boolean isSave) throws Exception{ + UserInfo userInfo=userProvider.get(); + UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); + contractRelationForm = JsonUtil.getJsonToBean( + generaterSwapUtil.swapDatetime(ContractRelationConstant.getFormData(),contractRelationForm),ContractRelationForm.class); + ContractRelationEntity entity = JsonUtil.getJsonToBean(contractRelationForm, ContractRelationEntity.class); + + if(isSave){ + String mainId = RandomUtil.uuId() ; + entity.setId(mainId); + entity.setVersion(0); + }else{ + } + this.saveOrUpdate(entity); + + } +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ContractRelationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ContractRelationController.java new file mode 100644 index 00000000..484d392f --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ContractRelationController.java @@ -0,0 +1,191 @@ +package jnpf.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jnpf.base.ActionResult; +import jnpf.base.UserInfo; +import jnpf.exception.DataException; +import jnpf.permission.entity.UserEntity; +import jnpf.service.*; +import jnpf.entity.*; +import jnpf.util.*; +import jnpf.model.contractrelation.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; +import java.util.*; +import jnpf.annotation.JnpfField; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.base.vo.DownloadVO; +import jnpf.config.ConfigValueUtil; +import jnpf.base.entity.ProvinceEntity; +import java.io.IOException; +import java.util.stream.Collectors; +import jnpf.engine.entity.FlowTaskEntity; +import jnpf.exception.WorkFlowException; +import org.springframework.transaction.annotation.Transactional; + +/** + * contractRelation + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-07-15 + */ +@Slf4j +@RestController +@Tag(name = "contractRelation" , description = "scm") +@RequestMapping("/api/scm/ContractRelation") +public class ContractRelationController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private ContractRelationService contractRelationService; + + + + /** + * 列表 + * + * @param contractRelationPagination + * @return + */ + @Operation(summary = "获取列表") + @PostMapping("/getList") + public ActionResult list(@RequestBody ContractRelationPagination contractRelationPagination)throws IOException{ + List list= contractRelationService.getList(contractRelationPagination); + List> realList=new ArrayList<>(); + for (ContractRelationEntity entity : list) { + Map contractRelationMap=JsonUtil.entityToMap(entity); + contractRelationMap.put("id", contractRelationMap.get("id")); + //副表数据 + //子表数据 + realList.add(contractRelationMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, ContractRelationConstant.getFormData(), ContractRelationConstant.getColumnData(), contractRelationPagination.getModuleId(),false); + + //返回对象 + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(contractRelationPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + /** + * 创建 + * + * @param contractRelationForm + * @return + */ + @PostMapping() + @Operation(summary = "创建") + public ActionResult create(@RequestBody @Valid ContractRelationForm contractRelationForm) { + String b = contractRelationService.checkForm(contractRelationForm,0); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + try{ + contractRelationService.saveOrUpdate(contractRelationForm, null ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** + * 编辑 + * @param id + * @param contractRelationForm + * @return + */ + @PutMapping("/{id}") + @Operation(summary = "更新") + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ContractRelationForm contractRelationForm, + @RequestParam(value = "isImport", required = false) boolean isImport){ + contractRelationForm.setId(id); + if (!isImport) { + String b = contractRelationService.checkForm(contractRelationForm,1); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + } + ContractRelationEntity entity= contractRelationService.getInfo(id); + if(entity!=null){ + try{ + contractRelationService.saveOrUpdate(contractRelationForm,id,false); + }catch(Exception e){ + return ActionResult.fail("修改数据失败"); + } + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } + } + /** + * 删除 + * @param id + * @return + */ + @Operation(summary = "删除") + @DeleteMapping("/{id}") + @Transactional + public ActionResult delete(@PathVariable("id") String id){ + ContractRelationEntity entity= contractRelationService.getInfo(id); + if(entity!=null){ + //假删除 + entity.setDeleteMark(1); + contractRelationService.update(id,entity); + } + return ActionResult.success("删除成功"); + } + /** + * 表单信息(详情页) + * 详情页面使用-转换数据 + * @param id + * @return + */ + @Operation(summary = "表单信息(详情页)") + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + ContractRelationEntity entity= contractRelationService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + Map contractRelationMap=JsonUtil.entityToMap(entity); + contractRelationMap.put("id", contractRelationMap.get("id")); + //副表数据 + //子表数据 + contractRelationMap = generaterSwapUtil.swapDataDetail(contractRelationMap,ContractRelationConstant.getFormData(),"582532950638231493",false); + return ActionResult.success(contractRelationMap); + } + /** + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * @param id + * @return + */ + @Operation(summary = "信息") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id){ + ContractRelationEntity entity= contractRelationService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + Map contractRelationMap=JsonUtil.entityToMap(entity); + contractRelationMap.put("id", contractRelationMap.get("id")); + //副表数据 + //子表数据 + contractRelationMap = generaterSwapUtil.swapDataForm(contractRelationMap,ContractRelationConstant.getFormData(),ContractRelationConstant.TABLEFIELDKEY,ContractRelationConstant.TABLERENAMES); + return ActionResult.success(contractRelationMap); + } + +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java new file mode 100644 index 00000000..73afd3d8 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java @@ -0,0 +1,63 @@ +package jnpf.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; +/** + * 合同对应关系表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-07-15 + */ +@Data +@TableName("jg_contract_relation") +public class ContractRelationEntity { + @TableId(value ="ID" ) + private String id; + @TableField(value = "BUSINESS_ID" , updateStrategy = FieldStrategy.IGNORED) + private String businessId; + @TableField("PURCHASE_CONTRACT_CODE") + private String purchaseContractCode; + @TableField("PURCHASE_CONTRACT_NAME") + private String purchaseContractName; + @TableField("PURCHASE_CONTRACT_NO") + private String purchaseContractNo; + @TableField("SUPPLIER_NAME") + private String supplierName; + @TableField("SALE_CONTRACT_CODE") + private String saleContractCode; + @TableField("SALE_CONTRACT_NAME") + private String saleContractName; + @TableField("CUSTOMER_NAME") + private String customerName; + @TableField("SALE_CONTRACT_NO") + private String saleContractNo; + @TableField("F_CREATOR_TIME") + private Date creatorTime; + @TableField("F_CREATOR_USER_ID") + private String creatorUserId; + @TableField("F_LAST_MODIFY_TIME") + private Date lastModifyTime; + @TableField("F_LAST_MODIFY_USER_ID") + private String lastModifyUserId; + @TableField("F_DELETE_TIME") + private Date deleteTime; + @TableField("F_DELETE_USER_ID") + private String deleteUserId; + @TableField("F_DELETE_MARK") + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("COMPANY_ID") + private String companyId; + @TableField("DEPARTMENT_ID") + private String departmentId; + @TableField("ORGANIZE_JSON_ID") + private String organizeJsonId; + @TableField("F_FLOW_ID") + private String flowId; + @TableField("F_VERSION") + private Integer version; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java index 211ea237..e25f28df 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java @@ -92,7 +92,13 @@ public class WorkOrderEntity { private String realName; @TableField(exist = false) - private String prodcutName; + private String proportionNum; + @TableField(exist = false) + private String unitId; + @TableField(exist = false) + private String productName; + @TableField(exist = false) + private String productCode; @TableField(exist = false) private List productWarehouseEntityList; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationConstant.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationConstant.java new file mode 100644 index 00000000..c35dc55a --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationConstant.java @@ -0,0 +1,41 @@ +package jnpf.model.contractrelation; + +import jnpf.util.JsonUtil; +import java.util.Map; + +/** + * contractRelation配置json + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-07-15 + */ +public class ContractRelationConstant{ + /** 数据库链接 */ + public static final String DBLINKID = "0"; + /** 表别名 map */ + public static final Map TABLERENAMES = JsonUtil.getJsonToBean("{\"jg_contract_relation\":\"contractRelation\"}",Map.class); + /** 子表model map */ + public static final Map TABLEFIELDKEY = JsonUtil.getJsonToBean("{}",Map.class); + /** 整个表单配置json */ + public static final String getFormData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"popupType\":\"general\",\"idGlobal\":101,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":false,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":true,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":true,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"1000px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"businessId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}"); return sb.toString(); + } + /** 列表字段配置json */ + public static final String getColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"showSummary\":false,\"hasPage\":true,\"searchList\":[],\"treeInterfaceId\":\"\",\"treePropsValue\":\"id\",\"ruleList\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"childTableStyle\":1,\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"业务主表id合同\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"businessId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"businessId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"pageSize\":20,\"treePropsChildren\":\"children\",\"type\":1,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"thousandsField\":[],\"treeTitle\":\"左侧标题\",\"defaultColumnList\":[{\"suffixIcon\":\"\",\"align\":\"left\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"businessId\",\"showWordLimit\":false,\"__vModel__\":\"businessId\",\"checked\":true,\"disabled\":false,\"id\":\"businessId\",\"placeholder\":\"请输入\",\"addonBefore\":\"\",\"clearable\":true,\"jnpfKey\":\"input\",\"fullName\":\"业务主表id合同\",\"label\":\"业务主表id合同\",\"sortable\":false,\"addonAfter\":\"\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"prefixIcon\":\"\"}],\"treeTemplateJson\":[],\"treePropsName\":\"\",\"useColumnPermission\":false,\"treePropsUrl\":\"\",\"treeRelation\":\"\",\"treeSynType\":0,\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"业务主表id合同\",\"label\":\"业务主表id合同\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"businessId\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"businessId\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"businessId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"sort\":\"desc\",\"thousands\":false,\"hasSuperQuery\":true,\"summaryField\":[],\"parentField\":\"\",\"treePropsLabel\":\"fullName\",\"treeDataSource\":\"dictionary\",\"groupField\":\"\",\"printIds\":[],\"uploaderTemplateJson\":{},\"treeDictionary\":\"\",\"hasTreeQuery\":false,\"useFormPermission\":false,\"customBtnsList\":[],\"complexHeaderList\":[],\"useBtnPermission\":false,\"treeInterfaceName\":\"\",\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** app列表字段配置json */ + public static final String getAppColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"ruleListApp\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"业务主表id合同\",\"label\":\"业务主表id合同\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"businessId\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"businessId\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"businessId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"业务主表id合同\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"businessId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"businessId\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"pageSize\":20,\"sort\":\"desc\",\"thousands\":false,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"loading\":false,\"hasSuperQuery\":false,\"thousandsField\":[],\"defaultColumnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"业务主表id合同\",\"label\":\"业务主表id合同\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"业务主表id合同\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_contract_relation\",\"renderKey\":1721023058050,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"businessId\",\"showWordLimit\":false,\"__vModel__\":\"businessId\",\"showPassword\":false,\"checked\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"businessId\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"sortList\":[],\"useFormPermission\":false,\"customBtnsList\":[],\"useBtnPermission\":false,\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** 表列表 */ + public static final String getTableList(){ + StringBuilder sb = new StringBuilder(); +sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"jg_contract_relation\",\"tableName\":\"合同对应关系表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"ID\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"business_id\",\"field\":\"businessId\",\"fieldName\":\"业务主表id合同\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_contract_code\",\"field\":\"purchaseContractCode\",\"fieldName\":\"采购合同编码\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_contract_name\",\"field\":\"purchaseContractName\",\"fieldName\":\"采购合同名称\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_contract_no\",\"field\":\"purchaseContractNo\",\"fieldName\":\"采购合同对方合同号\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"supplier_name\",\"field\":\"supplierName\",\"fieldName\":\"供应商名称\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"sale_contract_code\",\"field\":\"saleContractCode\",\"fieldName\":\"销售合同编码\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"sale_contract_name\",\"field\":\"saleContractName\",\"fieldName\":\"销售合同名称\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"customer_name\",\"field\":\"customerName\",\"fieldName\":\"客户名称\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"sale_contract_no\",\"field\":\"saleContractNo\",\"fieldName\":\"销售合同对方合同号\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"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\":\"组织id\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"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-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationForm.java new file mode 100644 index 00000000..f332189e --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationForm.java @@ -0,0 +1,26 @@ +package jnpf.model.contractrelation; + +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * contractRelation + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-07-15 + */ +@Data +public class ContractRelationForm { + /** 主键 */ + private String id; + /** 乐观锁 **/ + @JsonProperty("version") + private Integer version; + + /** 业务主表id合同 **/ + @JsonProperty("businessId") + private String businessId; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationPagination.java new file mode 100644 index 00000000..d0d998c0 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractrelation/ContractRelationPagination.java @@ -0,0 +1,30 @@ +package jnpf.model.contractrelation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import jnpf.base.Pagination; +import java.util.List; + +/** + * + * contractRelation + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-07-15 + */ +@Data +public class ContractRelationPagination 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; +} diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue index 4cb050d5..c99debcd 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue @@ -231,6 +231,9 @@ export default { }, { "fullName": "二级", "id": "2" + }, { + "fullName": "三级", + "id": "3" }], calssifyProps: { "label": "fullName", diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue index 55a2a64e..68b5485b 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue @@ -91,8 +91,21 @@ - + + + + + + + + + + @@ -187,6 +203,8 @@ + + { + this.$refs.ContractList.initContractData(selectData) + }) + + }, + fnDataSet() { const query = {}; // 合同-查询签约主体 @@ -557,6 +599,7 @@ export default { async initSearchData() { }, initData() { this.listLoading = true; + this.contractListVisible = false; let _query = { ...this.listQuery, ...this.query, @@ -607,6 +650,7 @@ export default { }); }, handleSelectionChange(val) { + this.multipleSelectionItem = val const res = val.map(item => item.id); this.multipleSelection = res; }, diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue new file mode 100644 index 00000000..76a920d7 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue @@ -0,0 +1,990 @@ + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue index 30856a47..c4a9b487 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue @@ -693,6 +693,7 @@ export default { } }, createSaleDeliveryVoucher() { + debugger if (!this.multipleSelectionItem.length) { this.$message({ type: 'error', diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js index cd171f05..2cc11ca9 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js @@ -258,7 +258,7 @@ const columnList = [{ "renderKey": 1707042861597, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-documents", - "ruleName": "物料编码", + "ruleName": "客户", "tag": "JnpfInput", "span": 8 }, diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue index 1abe7f6e..33d392cc 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue @@ -69,12 +69,21 @@ custom-column border @selection-change="handleSelectionChange" :span-method="arraySpanMethod"> - - + + + + + + + + +