对使用分类的主键获取表单的定义、根据模板的主键获取表格的定义、标记流程中业务数据是否通过、使用分类的主键获取业务数据等接口的移植工作，其中对以前查询平台数据的方式使用的QueryWrapper实现数据的查询

 Source/UBCS-WEB/src/const/code/codebutton.js

@@ -271,13 +271,13 @@
    },
    {
      label: "按钮的图标样式",
      prop: "iconcls",
      prop: "iconCls",
      type: "input",
      search: true,
    },
    {
      label: "执行的js路径",
      prop: "executejs",
      prop: "executeJs",
      type: "input",
      search: true,
    },
@@ -289,7 +289,7 @@
    // },
    {
      label: "按钮的位置",
      prop: "usedpositiontypeText",
      prop: "usedPositionTypeText",
      slot: true,
      display: false
    },
@@ -306,7 +306,7 @@
      search: true,
      hide: true,
      display: true,
      prop: "usedpositiontype",
      prop: "usedPositionType",
      rules: [{
        required: true,
        message: "请选择按钮的位置",

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeWupinDTO.java

@@ -16,7 +16,7 @@
 */
package com.vci.ubcs.code.dto;

import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -28,7 +28,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class CodeWupinDTO extends CodeWupinEntity {
public class CodeWupinDTO extends CodeWupin {
    private static final long serialVersionUID = 1L;

}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupin.java

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeWupinEntity.java ÐÞ¸Ä
@@ -24,7 +24,6 @@
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;

/**
 * ç¼–码信息 å®žä½“ç±»
@@ -36,7 +35,7 @@
@TableName("PL_CODE_WUPIN")
@ApiModel(value = "CodeWupin对象", description = "编码信息")
@EqualsAndHashCode(callSuper = true)
public class CodeWupinEntity  extends BaseModel {
public class CodeWupin extends BaseModel {

    /**
     *

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeWupinVO.java

@@ -16,8 +16,7 @@
 */
package com.vci.ubcs.code.vo;

import com.vci.ubcs.code.entity.CodeWupinEntity;
import org.springblade.core.tool.node.INode;
import com.vci.ubcs.code.entity.CodeWupin;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -29,7 +28,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = true)
public class CodeWupinVO extends CodeWupinEntity {
public class CodeWupinVO extends CodeWupin {
    private static final long serialVersionUID = 1L;

}

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java

@@ -18,81 +18,81 @@
    /**
    * æŒ‰é’®çš„图标样式
    */
    private String iconcls;
    private String iconCls;


    /**
    * æ‰§è¡Œçš„js内容
    */
    private String executejs;
    private String executeJs;


    /**
    * æŒ‰é’®çš„位置
    */
    private String usedpositiontype;
    private String usedPositionType;


    /**
    * æŒ‰é’®çš„位置显示文本
    */
    private String usedpositiontypeText;
    private String usedPositionTypeText;

    /**
     * èŽ·å– æŒ‰é’®çš„图标样式
     */
    public String getIconcls (){
        return iconcls;
    public String getIconCls (){
        return iconCls;
    }

    /**
    * è®¾ç½® æŒ‰é’®çš„图标样式
    */
    public void setIconcls (String iconcls){
        this.iconcls = iconcls;
    public void setIconcls (String iconCls){
        this.iconCls = iconCls;
    }
    /**
     * èŽ·å– æ‰§è¡Œçš„js内容
     */
    public String getExecutejs (){
        return executejs;
    public String getExecuteJs (){
        return executeJs;
    }

    /**
    * è®¾ç½® æ‰§è¡Œçš„js内容
    */
    public void setExecutejs (String executejs){
        this.executejs = executejs;
    public void setExecuteJs (String executejs){
        this.executeJs = executejs;
    }
    /**
     * èŽ·å– æŒ‰é’®çš„位置
     */
    public String getUsedpositiontype (){
        return usedpositiontype;
    public String getUsedPositionType (){
        return usedPositionType;
    }

    /**
    * è®¾ç½® æŒ‰é’®çš„位置
    */
    public void setUsedpositiontype (String usedpositiontype){
        this.usedpositiontype = usedpositiontype;
    public void setUsedPositionType (String usedPositionType){
        this.usedPositionType = usedPositionType;
    }

    public String getUsedpositiontypeText() {
        return usedpositiontypeText;
    public String getUsedPositionTypeText() {
        return usedPositionTypeText;
    }

    public void setUsedpositiontypeText(String usedpositiontypeText) {
        this.usedpositiontypeText = usedpositiontypeText;
    public void setUsedpositiontypeText(String usedPositionTypeText) {
        this.usedPositionTypeText = usedPositionTypeText;
    }

    @Override
    public String toString() {
        return "CodeButtonVO{" +
                "iconcls='" + iconcls + '\'' +
                ", executejs='" + executejs + '\'' +
                ", usedpositiontype='" + usedpositiontype + '\'' +
                ", usedpositiontypeText='" + usedpositiontypeText + '\'' +
                "iconcls='" + iconCls + '\'' +
                ", executejs='" + executeJs + '\'' +
                ", usedpositiontype='" + usedPositionType + '\'' +
                ", usedpositiontypeText='" + usedPositionTypeText + '\'' +
                "} " + super.toString();
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeWupinController.java

@@ -23,14 +23,13 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.vci.ubcs.code.wrapper.CodeWupinWrapper;
import com.vci.ubcs.code.service.ICodeWupinService;
@@ -56,8 +55,8 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入codeWupin")
    public R<CodeWupinVO> detail(CodeWupinEntity codeWupin) {
        CodeWupinEntity detail = codeWupinService.getOne(Condition.getQueryWrapper(codeWupin));
    public R<CodeWupinVO> detail(CodeWupin codeWupin) {
        CodeWupin detail = codeWupinService.getOne(Condition.getQueryWrapper(codeWupin));
        return R.data(CodeWupinWrapper.build().entityVO(detail));
    }
    /**
@@ -66,8 +65,8 @@
    @GetMapping("/list")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页", notes = "传入codeWupin")
    public R<IPage<CodeWupinVO>> list(CodeWupinEntity codeWupin, Query query) {
        IPage<CodeWupinEntity> pages = codeWupinService.page(Condition.getPage(query), Condition.getQueryWrapper(codeWupin));
    public R<IPage<CodeWupinVO>> list(CodeWupin codeWupin, Query query) {
        IPage<CodeWupin> pages = codeWupinService.page(Condition.getPage(query), Condition.getQueryWrapper(codeWupin));
        return R.data(CodeWupinWrapper.build().pageVO(pages));
    }

@@ -88,7 +87,7 @@
    @PostMapping("/save")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入codeWupin")
    public R save(@Valid @RequestBody CodeWupinEntity codeWupin) {
    public R save(@Valid @RequestBody CodeWupin codeWupin) {
        return R.status(codeWupinService.save(codeWupin));
    }

@@ -98,7 +97,7 @@
    @PostMapping("/update")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入codeWupin")
    public R update(@Valid @RequestBody CodeWupinEntity codeWupin) {
    public R update(@Valid @RequestBody CodeWupin codeWupin) {
        return R.status(codeWupinService.updateById(codeWupin));
    }

@@ -108,7 +107,7 @@
    @PostMapping("/submit")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入codeWupin")
    public R submit(@Valid @RequestBody CodeWupinEntity codeWupin) {
    public R submit(@Valid @RequestBody CodeWupin codeWupin) {
        return R.status(codeWupinService.saveOrUpdate(codeWupin));
    }


 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java

@@ -64,17 +64,17 @@
    @GetMapping("/downloadImportExcel")
    @VciBusinessLog(operateName = "下载批量申请编码的导入模板")
    public void downloadImportExcel(String codeClassifyOid, HttpServletResponse response) throws IOException{
//        String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
//        try {
//            ControllerUtil.writeFileToResponse(response,excelName);
//        } catch (Throwable e) {
//            //如果出错,把错误信息写到text
//            String msg = LangBaseUtil.getErrorMsg(e);
//            if(StringUtils.isBlank(msg)){
//                msg = "未知错误";
//            }
//            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
//        }
        String excelName = mdmIOService.createImportExcel(codeClassifyOid,false);
        try {
            ControllerUtil.writeFileToResponse(response,excelName);
        } catch (Throwable e) {
            //如果出错,把错误信息写到text
            String msg = LangBaseUtil.getErrorMsg(e);
            if(StringUtils.isBlank(msg)){
                msg = "未知错误";
            }
            ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
        }
    }



 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeWupinClient.java

@@ -23,8 +23,7 @@
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.service.ICodeWupinService;
import com.vci.ubcs.code.entity.CodeWupin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -44,11 +43,11 @@

    @Override
    @GetMapping(TOP)
    public BladePage<CodeWupinEntity> top(Integer current, Integer size) {
    public BladePage<CodeWupin> top(Integer current, Integer size) {
        Query query = new Query();
        query.setCurrent(current);
        query.setSize(size);
        IPage<CodeWupinEntity> page = codeWupinMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());//service.page(Condition.getPage(query));
        IPage<CodeWupin> page = codeWupinMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());//service.page(Condition.getPage(query));
        return BladePage.of(page);
    }


 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/ICodeWupinClient.java

@@ -17,7 +17,7 @@
package com.vci.ubcs.code.feign;

import org.springblade.core.mp.support.BladePage;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -44,6 +44,6 @@
     * @return BladePage
     */
    @GetMapping(TOP)
    BladePage<CodeWupinEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
    BladePage<CodeWupin> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeWupinMapper.java

@@ -16,7 +16,7 @@
 */
package com.vci.ubcs.code.mapper;

import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,7 +28,7 @@
 * @author yuxc
 * @since 2023-05-05
 */
public interface CodeWupinMapper extends BaseMapper<CodeWupinEntity> {
public interface CodeWupinMapper extends BaseMapper<CodeWupin> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeWupinService.java

@@ -17,9 +17,8 @@
package com.vci.ubcs.code.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;

/**
@@ -28,7 +27,7 @@
 * @author yuxc
 * @since 2023-05-05
 */
public interface ICodeWupinService extends IService<CodeWupinEntity> {
public interface ICodeWupinService extends IService<CodeWupin> {

    /**
     * è‡ªå®šä¹‰åˆ†é¡µ

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java

@@ -7,25 +7,21 @@
import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeKeyAttrRepeat;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.starter.web.pagemodel.*;
import org.springblade.core.tool.api.R;
import org.springframework.util.CollectionUtils;

import java.util.*;
import java.util.stream.Collectors;

/**
 * ä¸»æ•°æ®å¼•æ“ŽæœåŠ¡
 * @author weidy
 * @date 2022-2-21
 */
public interface MdmEngineService extends IService<CodeWupinEntity> {
public interface MdmEngineService extends IService<CodeWupin> {
    /**
     * ä½¿ç”¨åˆ†ç±»çš„主键获取可以使用的模板对象
     * @param codeClassifyOid åˆ†ç±»çš„主键
@@ -90,7 +86,7 @@
     * @param btmName ä¸šåŠ¡ç±»åž‹çš„名称，会自动变成小写
     * @return CodeWupinEntity
     */
    CodeWupinEntity createCBOByBtmName(String btmName);
    CodeWupin createCBOByBtmName(String btmName);

    /**
     * ä¿å­˜å¯è¾“可选的信息

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java

@@ -2,7 +2,7 @@

import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;

@@ -19,7 +19,7 @@
     * @param dataCBOList ä¸šåŠ¡æ•°æ®
     */
    List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO,
                                        CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList);
                                        CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupin> dataCBOList);

    /**
        * å›žæ”¶ç å€¼

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeWupinServiceImpl.java

@@ -17,7 +17,7 @@
package com.vci.ubcs.code.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import com.vci.ubcs.code.service.ICodeWupinService;
@@ -31,7 +31,7 @@
 * @since 2023-05-05
 */
@Service
public class CodeWupinServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupinEntity> implements ICodeWupinService {
public class CodeWupinServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupin> implements ICodeWupinService {

    @Override
    public IPage<CodeWupinVO> selectCodeWupinPage(IPage<CodeWupinVO> page, CodeWupinVO codeWupin) {

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
@@ -12,7 +13,6 @@
import com.vci.ubcs.code.dto.datapush.BaseModelDTO;
import com.vci.ubcs.code.entity.*;
import com.vci.ubcs.code.enumpack.*;
import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.mapper.CodeOsbtmtypeMapper;
import com.vci.ubcs.code.mapper.CodeWupinMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
@@ -48,7 +48,6 @@
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -64,7 +63,7 @@
 * @date 2022-2-22
 */
@Service
public class MdmEngineServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupinEntity> implements MdmEngineService {
public class MdmEngineServiceImpl extends ServiceImpl<CodeWupinMapper, CodeWupin> implements MdmEngineService {


    /**
@@ -149,6 +148,9 @@
     */
    @Autowired
    private ICodeClassifyTemplateButtonService templateButtonService;

    @Autowired
    private ICodeClassifyTemplateAttrService codeClassifyTemplateAttrService;
//    /**
//     * ç”¨æˆ·æŸ¥è¯¢çš„服务,需要问一下是否需要重写，使用查询此平台的用户表
//     */
@@ -329,14 +331,14 @@
        switchDateAttrOnOrder(templateVO, orderDTO);
        //9.生成编码的信息
//        ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
        CodeWupinEntity cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
        CodeWupin cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
//        //默认的属性都不用从前端拷贝
//        //设置编码需要的默认属性的内容
        copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
//        //TODO:因为默认的属性都不拷贝，目前集团码叫name，并没有从DTO拷贝到cbo里。增加一个单独处理，以后再看要不要调整
        cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
//        //end -- modify by lihang @20220407
        List<CodeWupinEntity> cboList = new ArrayList<>();
        List<CodeWupin> cboList = new ArrayList<>();

        //备注
        cbo.setDescription(orderDTO.getDescription());
@@ -347,7 +349,7 @@


        List<String> charList = new ArrayList<>();
        for (CodeWupinEntity wupinEntity : cboList) {
        for (CodeWupin wupinEntity : cboList) {
            charList.add(wupinEntity.getId());
        }
        batchSaveSelectChar(templateVO, charList);
@@ -696,7 +698,7 @@
     * @param templateVO       æ¨¡æ¿çš„显示对象
     * @param edit             æ˜¯å¦ä¸ºä¿®æ”¹
     */
    private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, CodeWupinEntity cbo,
    private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, CodeWupin cbo,
                                CodeOrderDTO orderDTO, CodeClassifyTemplateVO templateVO,
                                boolean edit) {
        String fullPath = "";
@@ -768,7 +770,7 @@
     * @throws VciBaseException åˆå§‹åŒ–出错的是会抛出异常
     */
    @Override
    public CodeWupinEntity createCBOByBtmName(String btmName)
    public CodeWupin createCBOByBtmName(String btmName)
        throws VciBaseException {
        if(btmName!=null){
            btmName = btmName.trim().toLowerCase();
@@ -792,7 +794,7 @@
        CodeOsbtmtypeEntity btmTypeVO = codeOsbtmtypeMapper.selectOne(btmWrapper);
//        OsBtmTypeVO btmTypeVO = btmService.getBtmById(boName);
        String userName = AuthUtil.getUser().getUserName();
        CodeWupinEntity wupinEntity = new CodeWupinEntity();
        CodeWupin wupinEntity = new CodeWupin();
        wupinEntity.setOid(null);
//        bo.setRevisionid((new ObjectUtility()).getNewObjectID36());
//        bo.setNameoid((new ObjectUtility()).getNewObjectID36());
@@ -1842,9 +1844,9 @@
        //找业务类型，然后使用主键去获取数据库里的数据
//        List<ClientBusinessObject> cbos = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), WebUtil.getOidQuery(orderDTO.getOid()));

        QueryWrapper<CodeWupinEntity> btmWrapper = new QueryWrapper<>();
        QueryWrapper<CodeWupin> btmWrapper = new QueryWrapper<>();
        btmWrapper.eq("OID",orderDTO.getOid());
        CodeWupinEntity cbo = codeWupinMapper.selectOne(btmWrapper);
        CodeWupin cbo = codeWupinMapper.selectOne(btmWrapper);

//        CodeClstemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
//        CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
@@ -1939,7 +1941,7 @@
            oidCollection.addAll(strings);
        }

        List<CodeWupinEntity> cboList = codeWupinMapper.selectBatchIds(oidCollection);
        List<CodeWupin> cboList = codeWupinMapper.selectBatchIds(oidCollection);
        //        List<ClientBusinessObject> cboList = new ArrayList<>();
//        oidCollection.stream().forEach(oids -> {
//            Map<String, String> conditionMap = new HashMap<>();
@@ -1950,15 +1952,15 @@
        if (CollectionUtils.isEmpty(cboList)) {
            throw new VciBaseException("数据全部在系统中不存在");
        }
        List<CodeWupinEntity> editCBOs = cboList.stream().filter(s -> !CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
        List<CodeWupin> editCBOs = cboList.stream().filter(s -> !CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
        if (!CollectionUtils.isEmpty(editCBOs)) {
            CodeWupinEntity cbo = editCBOs.get(0);
            CodeWupin cbo = editCBOs.get(0);
            throw new VciBaseException("编码为{0}等共{1}条数据的状态不是[{2}]，不允许删除", new String[]{cbo.getId(), String.valueOf(editCBOs.size()), CodeDefaultLC.EDITING.getText()});
        }

        //只能删除自己创建的数据
        String userId = AuthUtil.getUser().getUserName();
        for (CodeWupinEntity clientBusinessObject:cboList){
        for (CodeWupin clientBusinessObject:cboList){
            String creator = clientBusinessObject.getCreator();
            if(!userId.equalsIgnoreCase(creator)){
                throw new VciBaseException("编码为"+clientBusinessObject.getId()+"的数据不是当前用户创建，不能删除！");
@@ -2160,17 +2162,21 @@
    public R markDataPassing(String oid, String btmName, Boolean pass) {
        VciBaseUtil.alertNotNull(oid, "业务数据主键", btmName, "业务类型", pass, "标记类型");
        boolean flag = false;
//        try {
//            ClientBusinessObjectOperation operation = new ClientBusinessObjectOperation();
        try {
//            QueryWrapper<CodeWupinEntity> wrapper = new QueryWrapper<>();
//            wrapper.eq("oid",oid);
            CodeWupin data = baseMapper.selectById(oid);
            //            ClientBusinessObjectOperation operation = new ClientBusinessObjectOperation();
//            ClientBusinessObject data = operation.readBusinessObjectById(oid, btmName);
//            if (data == null || StringUtils.isBlank(data.getOid())) {
//                return BaseResult.fail(DATA_OID_NOT_EXIST);
//            }
//            data.setAttributeValue("passing", String.valueOf(pass));
            if (data == null || StringUtils.isBlank(data.getOid())) {
                return R.fail(DATA_OID_NOT_EXIST);
            }
            data.setPassing(String.valueOf(pass));
            flag = SqlHelper.retBool(baseMapper.updateById(data));
//            flag = operation.updateBuinessObject(data);
//        } catch (VCIError e) {
//            e.printStackTrace();
//        }
        } catch (Exception e) {
            e.printStackTrace();
        }
        if (flag) {
            return R.success("标记成功！");
        } else {
@@ -2464,51 +2470,63 @@
        }
        List<String> oidList = VciBaseUtil.str2List(conditionMap.get("oid"));
        Map<String, String> oidMap = new HashMap<>();
        QueryWrapper<CodeWupin> wrapper = new QueryWrapper();
        if (conditionMap.get("oid").contains(",")) {
            oidMap.put("oid", QueryOptionConstant.IN +"("+ VciBaseUtil.toInSql(oidList.toArray(new String[0])) + ")");
//            oidMap.put("oid", QueryOptionConstant.IN +"("+ VciBaseUtil.toInSql(oidList.toArray(new String[0])) + ")");
            wrapper.in("oid",oidList);
        } else {
            oidMap.put("oid", conditionMap.get("oid"));
//            oidMap.put("oid", conditionMap.get("oid"));
            wrapper.in("oid",conditionMap.get("oid"));
        }
        if (CollectionUtils.isEmpty(oidMap)) {
            throw new VciBaseException("业务数据主键不能为空");
        }
//        List<ClientBusinessObject> cbos = boService.queryCBO(btmType, oidMap);
//        if (CollectionUtils.isEmpty(cbos)) {
//            throw new VciBaseException("未找到业务数据");
//        }
//        ClientBusinessObject cbo = cbos.get(0);
//        String templateOid = cbo.getAttributeValue("CODETEMPLATEOID");
        List<CodeWupin> cbos = baseMapper.selectList(wrapper);
        if (CollectionUtils.isEmpty(cbos)) {
            throw new VciBaseException("未找到业务数据");
        }
        CodeWupin cbo = cbos.get(0);
        String templateOid = cbo.getCodetemplateoid();
//        Map<String, String> templateOidMap = new HashMap<>();
//        templateOidMap.put("oid", templateOid);

        QueryWrapper<CodeClassifyTemplate> codeClassifyTemplateWrapper = new QueryWrapper<>();
        codeClassifyTemplateWrapper.eq("oid", templateOid);
        List<CodeClassifyTemplate> templateDOList = templateService.list(codeClassifyTemplateWrapper);

//        List<CodeClassifyTemplate> templateDOList = boService.queryObject(CodeClassifyTemplate.class, templateOidMap);
        QueryWrapper<CodeClassifyTemplateAttr> codeClassifyTemplateAttrWrapper = new QueryWrapper<>();
        codeClassifyTemplateAttrWrapper.eq("CLASSIFYTEMPLATEOID", templateOid);
//        templateOidMap.clear();
//        templateOidMap.put("CLASSIFYTEMPLATEOID",templateOid);
//        List<CodeClassifyTemplateAttr> attrDOList = boService.queryObject(CodeClassifyTemplateAttr.class, templateOidMap);
//        if (CollectionUtils.isEmpty(templateDOList)) {
//            logger.error("找不到业务数据关联的模板，模板主键：" + templateOid);
//            throw new VciBaseException("找不到业务数据关联的模板");
//        }
//        CodeClassifyTemplateVO templateVO = templateService.codeClassifyTemplateDO2VO(templateDOList.get(0));
//        templateVO.setAttributes(templateAttrService.codeClassifyTemplateAttrDO2VOs(attrDOList));
//        try {
//            if (oidList.size() > 1){
//                DataGrid<Map<String,String>> allDataGrid = new DataGrid<>();
//                List<Map<String,String>> allData = new ArrayList<>();
//                oidList.forEach(oid -> {
//                    Map<String,String> condition = new HashMap<>();
//                    condition.put("oid",oid);
//                    DataGrid<Map<String, String>> dataGrid = queryGrid(btmType, templateVO, condition, pageHelper);
//                    allData.addAll(dataGrid.getData());
//                });
//                allDataGrid.setData(allData);
//                return allDataGrid;
//            }else {
//                return queryGrid(btmType, templateVO, conditionMap, pageHelper);
//            }
//        } catch (Exception e) {
//            System.out.println(e.getMessage());
        List<CodeClassifyTemplateAttr> attrDOList = codeClassifyTemplateAttrService.list(codeClassifyTemplateAttrWrapper);
//            boService.queryObject(CodeClassifyTemplateAttr.class, templateOidMap);
        if (CollectionUtils.isEmpty(templateDOList)) {
            logger.error("找不到业务数据关联的模板，模板主键：" + templateOid);
            throw new VciBaseException("找不到业务数据关联的模板");
        }
        CodeClassifyTemplateVO templateVO = templateService.codeClassifyTemplateDO2VO(templateDOList.get(0));
        templateVO.setAttributes(codeClassifyTemplateAttrService.codeClassifyTemplateAttrDO2VOs(attrDOList));
        try {
            if (oidList.size() > 1){
                DataGrid<Map<String,String>> allDataGrid = new DataGrid<>();
                List<Map<String,String>> allData = new ArrayList<>();
                oidList.forEach(oid -> {
                    Map<String,String> condition = new HashMap<>();
                    condition.put("oid",oid);
                    DataGrid<Map<String, String>> dataGrid = queryGrid(btmType, templateVO, condition, pageHelper);
                    allData.addAll(dataGrid.getData());
                });
                allDataGrid.setData(allData);
                return allDataGrid;
            }else {
                return queryGrid(btmType, templateVO, conditionMap, pageHelper);
            }
        } catch (Exception e) {
            System.out.println(e.getMessage());
            return null;
//        }
        }
    }
    /**
     * ä½¿ç”¨åˆ†ç±»çš„主键获取表格的定义
@@ -2752,7 +2770,7 @@
                    kv.setValue(buttonVO.getClassifyButtonOidName());
                    kv.setAttributes(VciBaseUtil.objectToMap(buttonVO));
                    buttons.add(kv);
                    optionJsMap.put(buttonVO.getId(), buttonVO.getButtonVO().getExecutejs());
                    optionJsMap.put(buttonVO.getId(), buttonVO.getButtonVO().getExecuteJs());
                });
                optionFieldVO.setOptionJsMap(optionJsMap);
                uiInfoVO.getTableDefineVO().getCols().get(0).add(optionFieldVO);

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java

@@ -6,7 +6,7 @@
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.entity.CodeSerialValue;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.enumpack.CodeCutTypeEnum;
import com.vci.ubcs.code.enumpack.CodeGetValueTypeEnum;
import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
@@ -56,7 +56,7 @@
    private ICodeWupinService iCodeWupinService;

    @Override
    public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupinEntity> dataCBOList) {
    public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<CodeWupin> dataCBOList) {
//        BatchCBO batchCBO = new BatchCBO();
//        WebUtil.setPersistence(false);
//        dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList());
@@ -265,7 +265,7 @@
            Map<String/**码段的主键**/, Map<String, CodeSerialValue>> maxSerialValueMap = new HashMap<>();

            for (int i = 0; i < dataCBOList.size(); i++) {
                CodeWupinEntity cbo = dataCBOList.get(i);
                CodeWupin cbo = dataCBOList.get(i);
                List<String> thisSecValueList = new LinkedList<>();
                for (int j = 0; j < secValueList.size(); j++) {
                    thisSecValueList.add(secValueList.get(j));
@@ -328,9 +328,9 @@
     * @param serialUnitList æµæ°´ä¾æ®çš„内容
     *                       è¿˜éœ€è¦åŽç»­çš„一个移植将会涉及到其他的服务
     */
    private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList,CodeWupinEntity cbo,
                                    List<String> thisSecValueList,boolean attrSevIsSerialDepend,
                                    List<String> serialUnitList){
    private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList, CodeWupin cbo,
                                    List<String> thisSecValueList, boolean attrSevIsSerialDepend,
                                    List<String> serialUnitList){
        if (!CollectionUtils.isEmpty(attrSecVOList)) {
            attrSecVOList.stream().forEach(attrSevVO -> {
                String value = "";
@@ -586,9 +586,9 @@
     * @param templateVO æ¨¡æ¿çš„信息
     * @param allCodeDOList æ‰€æœ‰çš„码值的对象列表
     */
    private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO,CodeRuleVO ruleVO,
                                CodeWupinEntity cbo,CodeClassifyTemplateVO templateVO,
                                List<CodeAllCode> allCodeDOList,String serialUnitString,String serialValueString){
    private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO, CodeRuleVO ruleVO,
                                CodeWupin cbo, CodeClassifyTemplateVO templateVO,
                                List<CodeAllCode> allCodeDOList, String serialUnitString, String serialValueString){
        CodeAllCode allCodeDO = new CodeAllCode();
        allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
        allCodeDO.setCodeRuleOid(ruleVO.getOid());

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeWupinWrapper.java

@@ -18,7 +18,7 @@

import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import com.vci.ubcs.code.entity.CodeWupinEntity;
import com.vci.ubcs.code.entity.CodeWupin;
import com.vci.ubcs.code.vo.CodeWupinVO;
import java.util.Objects;

@@ -28,14 +28,14 @@
 * @author yuxc
 * @since 2023-05-05
 */
public class CodeWupinWrapper extends BaseEntityWrapper<CodeWupinEntity, CodeWupinVO>  {
public class CodeWupinWrapper extends BaseEntityWrapper<CodeWupin, CodeWupinVO>  {

    public static CodeWupinWrapper build() {
        return new CodeWupinWrapper();
     }

    @Override
    public CodeWupinVO entityVO(CodeWupinEntity codeWupin) {
    public CodeWupinVO entityVO(CodeWupin codeWupin) {
        CodeWupinVO codeWupinVO = Objects.requireNonNull(BeanUtil.copy(codeWupin, CodeWupinVO.class));

        //User createUser = UserCache.getUser(codeWupin.getCreateUser());

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeWupinMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupinEntity">
    <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupin">
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>