Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/api/GetItem.js

@@ -75,4 +75,11 @@
    data
  })
}

//删除
export function deleteCode(data) {
  return request({
    url: 'api/ubcs-code/mdmEngineController/deleteCode',
    method: 'DELETE',
    data:data
  })
}

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -95,7 +95,7 @@
  </basic-container>
</template>
<script>
import {MasterTable, TableData, FindData, addSaveCode, editSaveCode} from "@/api/GetItem";
import {MasterTable, TableData, FindData, addSaveCode, editSaveCode,deleteCode} from "@/api/GetItem";
import {processTS,changeStatus} from "@/api/template/setPersonnel"
import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
@@ -344,6 +344,8 @@
        if (uniqueFlag === 'CODEENABLE') return this.Enable()
        //回收
        if (uniqueFlag === 'CODERECYCLE') return this.Recovery()
        //删除
        if (uniqueFlag === 'CODEDELETE') return this.enumDeleteRow()
        //  相似项查询
        //  if(uniqueFlag === 'CODEEDIT') return this.similarHandler()
      });
@@ -382,10 +384,11 @@
            showMessage = false;
          } else if (showMessage) {
            processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
              if (res.data.records != [] && res.data.code != 200)  {
              if (res.data.records != [])  {
                this.userName = localStorage.getItem("username");
                this.parameter.template = this.userName + "-发布" + "[物品]";
                this.parameter.type = 'PUBLIC'
                this.parameter.type = 'PUBLIC';
                this.parameter.code=this.templateOid
                this.title = '流程审批'
                this.visibleFlow = true;
                this.onLoad()
@@ -608,7 +611,30 @@
    },
    //删除
    enumDeleteRow(row) {
      this.tableData.splice(row, 1);
      this.$confirm('是否删除选中数据?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        const list=[];
        this.selectRow.forEach((item)=>{list.push(item.oid)})
        console.log(list)
        deleteCode({codeClassifyOid:this.codeClassifyOid,oidList:list}).then(res=>{
          console.log(res)
          if(res.data.code === 200){
            this.$message({
              type: 'success',
              message: '删除成功!'
            });
          }
          this.onLoad()
        })
      }).catch(() => {
        this.$message({
          type: 'info',
          message: '已取消删除'
        });
      });
    },
    // 将正在编辑的行的状态变为 null ，即退出编辑状态
    saveRow() {

 Source/UBCS-WEB/vue.config.js

@@ -30,6 +30,7 @@
        // target: 'http://192.168.1.51:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.0.105:37000',
        // target: 'http://192.168.0.103:37000',
        // target: 'http://192.168.1.63:37000',
        // target: 'http://192.168.3.7:37000',

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java

@@ -516,6 +516,7 @@
            List<BtmTypeAttributeVO> beforeAttributes = btmTypeByOid.getAttributes();
            // 处理属性，多余的删除，不存在的添加
            afterAttributes = updateAttributeForBtm(btmTypeByOid.getOid(),beforeAttributes, attributes);
            baseMapper.updateByPrimaryKey(btmTypeDO);
        }
        BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(btmTypeDO);
        //在创建表的时候还需要把默认的字段带上。
@@ -577,8 +578,12 @@
        List<BtmTypeAttributeVO> voListAdd = btmTypeAttributeService.checkAndInsert(oid, addList, AuthUtil.getUserAccount(), new Date());
        List<BtmTypeAttributeVO> voListUpdate = btmTypeAttributeService.checkAndUpdate(oid, modifyList, AuthUtil.getUserAccount(), new Date());
        List<BtmTypeAttributeVO> returnList = new ArrayList<>();
        returnList.addAll(Objects.requireNonNull(voListAdd));
        returnList.addAll(Objects.requireNonNull(voListUpdate));
        if(!CollectionUtils.isEmpty(voListAdd)) {
            returnList.addAll(Objects.requireNonNull(voListAdd));
        }
        if(!CollectionUtils.isEmpty(voListUpdate)) {
            returnList.addAll(Objects.requireNonNull(voListUpdate));
        }
        return returnList;
    }


 Source/UBCS/ubcs-service/ubcs-omd/src/main/resources/mapper/BtmTypeMapper.xml

@@ -159,14 +159,10 @@
            sub_life_cycle_name = #{subLifeCycleName,jdbcType=VARCHAR},
            view_flag = #{viewFlag,jdbcType=VARCHAR},
            view_create_sql = #{viewCreateSql,jdbcType=VARCHAR},
            btm_name =#{btmName,jdbcType=VARCHAR },
            owner = #{owner,jdbcType=VARCHAR },
            creator = #{creator,jdbcType=VARCHAR},
            create_time = #{createTime,jdbcType=TIMESTAMP},
            last_modifier = #{lastModifier,jdbcType=VARCHAR},
            last_modify_time = #{lastModifyTime,jdbcType=TIMESTAMP},
            ts = #{ts,jdbcType=TIMESTAMP},
            biz-domain = #{bizDomain,jdbcType=VARCHAR},
            biz_domain = #{bizDomain,jdbcType=VARCHAR},
            consistence = #{consistence,jdbcType=VARCHAR}
        where OID = #{oid,jdbcType=VARCHAR}
    </update>