Merge remote-tracking branch 'origin/master'

吴健

2024-11-27 e4f2d8299d63b6f5de024994345ffae040e2a812

Merge remote-tracking branch 'origin/master'

 billion-main/src/main/java/com/billion/main/bs/controller/BsBomInfoController.java

@@ -69,9 +69,9 @@
    @PreAuthorize("@ss.hasPermi('bs:bomInfo:add')")
    @Log(title = "基础BOM", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody BsBomInfo bsBomInfo)
    public void add(@RequestBody BsBomInfo bsBomInfo)
    {
        return toAjax(bsBomInfoService.insertBsBomInfo(bsBomInfo));
       bsBomInfoService.insertBsBomInfo(bsBomInfo);
    }

    /**

 billion-main/src/main/java/com/billion/main/bs/domain/BsBomInfo.java

@@ -42,13 +42,6 @@
    @Excel(name = "状态(字典)")
    private String status;

    /** åˆ›å»ºç”¨æˆ· */
    @Excel(name = "创建用户")
    private String createUser;

    /** æ›´æ”¹ç”¨æˆ· */
    @Excel(name = "更改用户")
    private String updateUser;

    /** æ•°æ®æ¥æº */
    @Excel(name = "数据来源")

 billion-main/src/main/java/com/billion/main/bs/service/IBsBomInfoService.java

@@ -35,7 +35,7 @@
     * @param bsBomInfo åŸºç¡€BOM
     * @return ç»“æžœ
     */
    public int insertBsBomInfo(BsBomInfo bsBomInfo);
    public void insertBsBomInfo(BsBomInfo bsBomInfo);

    /**
     * ä¿®æ”¹åŸºç¡€BOM

 billion-main/src/main/java/com/billion/main/bs/service/impl/BsBomInfoServiceImpl.java

@@ -1,6 +1,9 @@
package com.billion.main.bs.service.impl;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.billion.common.exception.ServiceException;
import com.billion.common.utils.DateUtils;
import com.billion.main.bs.domain.BsBomInfo;
import com.billion.main.bs.mapper.BsBomInfoMapper;
@@ -53,10 +56,13 @@
     * @return ç»“æžœ
     */
    @Override
    public int insertBsBomInfo(BsBomInfo bsBomInfo)
    public  void insertBsBomInfo(BsBomInfo bsBomInfo)
    {
        bsBomInfo.setCreateTime(DateUtils.getNowDate());
        return bsBomInfoMapper.insertBsBomInfo(bsBomInfo);
        List<BsBomInfo> checkList = this.list(new LambdaQueryWrapper<BsBomInfo>().eq(BsBomInfo::getBomCode, bsBomInfo.getBomCode()));
        if (CollUtil.isNotEmpty(checkList)){
            throw new ServiceException("已存在工单编号为"+bsBomInfo.getBomCode()+"的数据");
        }
        this.save(bsBomInfo);
    }

    /**

 billion-main/src/main/resources/mapper/bs/BsBomInfoMapper.xml

@@ -13,16 +13,16 @@
        <result property="version"    column="version"    />
        <result property="status"    column="status"    />
        <result property="remark"    column="remark"    />
        <result property="createUser"    column="create_user"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateUser"    column="update_user"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="dataSource"    column="data_source"    />
        <result property="delFlag"    column="del_flag"    />
    </resultMap>

    <sql id="selectBsBomInfoVo">
        select id, bom_code, bom_name, product_code, product_name, version, status, remark, create_user, create_time, update_user, update_time, data_source, del_flag from bs_bom_info
        select id, bom_code, bom_name, product_code, product_name, version, status, remark, create_by, create_time, update_by, update_time, data_source, del_flag from bs_bom_info
    </sql>

    <select id="selectBsBomInfoList" parameterType="BsBomInfo" resultMap="BsBomInfoResult">
@@ -34,8 +34,8 @@
            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
            <if test="version != null  and version != ''"> and version = #{version}</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
            <if test="dataSource != null  and dataSource != ''"> and data_source = #{dataSource}</if>
        </where>
    </select>
@@ -56,9 +56,9 @@
            <if test="version != null">version,</if>
            <if test="status != null">status,</if>
            <if test="remark != null">remark,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateUser != null">update_user,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="dataSource != null">data_source,</if>
            <if test="delFlag != null">del_flag,</if>
@@ -72,9 +72,9 @@
            <if test="version != null">#{version},</if>
            <if test="status != null">#{status},</if>
            <if test="remark != null">#{remark},</if>
            <if test="createUser != null">#{createUser},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateUser != null">#{updateUser},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="dataSource != null">#{dataSource},</if>
            <if test="delFlag != null">#{delFlag},</if>
@@ -91,9 +91,9 @@
            <if test="version != null">version = #{version},</if>
            <if test="status != null">status = #{status},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="createUser != null">create_user = #{createUser},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateUser != null">update_user = #{updateUser},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="dataSource != null">data_source = #{dataSource},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>

 billion-ui/src/components/itemSelect/single.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,205 @@
<template>
  <el-dialog title="物料产品选择"
             v-if="showFlag"
             :visible.sync="showFlag"
             :modal= false
             width="80%"
             center
  >
    <el-row :gutter="20">
      <!--物料数据-->
      <el-col :span="24" :xs="24">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="物料编码" prop="materialCode">
            <el-input
              v-model="queryParams.materialCode"
              placeholder="请输入物料编码"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="物料名称" prop="materialName">
            <el-input
              v-model="queryParams.materialName"
              placeholder="请输入物料名称"
              clearable
              style="width: 240px"
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
        <el-table border v-loading="loading" :data="itemList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
          <el-table-column width="50" align="center" >
            <template v-slot="scope">
              <el-radio v-model="selectedItemId" :label="scope.row.id" @change="handleRowChange(scope.row)">{{""}}</el-radio>
            </template>
          </el-table-column>
          <el-table-column label="物料编号" align="center" prop="materialCode">
          </el-table-column>
          <el-table-column label="物料名称" align="center" prop="materialName">
          </el-table-column>
          <el-table-column label="单位" align="center" prop="unit">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
            </template>
          </el-table-column>
          <el-table-column label="创建时间" align="center" prop="createTime">
          </el-table-column>
          <el-table-column label="状态" align="center" prop="status">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
            </template>
          </el-table-column>
          <el-table-column label="厂商" align="center" prop="supplier">
          </el-table-column>
        </el-table>

        <pagination
          v-show="total>0"
          :total="total"
          :page.sync="queryParams.pageNum"
          :limit.sync="queryParams.pageSize"
          @pagination="getList"
        />
      </el-col>
    </el-row>
    <div slot="footer" class="dialog-footer">
      <el-button type="primary" @click="confirmSelect">ç¡® å®š</el-button>
      <el-button @click="showFlag=false">取 æ¶ˆ</el-button>
    </div>
  </el-dialog>
</template>

<script>
import { listMaterialInfo} from "@/api/main/bs/materialInfo";

export default {
  name: "MdItemSingle",
  dicts: ['sys_yes_no','mes_item_product','material_type','unit','sys_normal_disable'],
  data() {
    return {
      showFlag:false,
      // é€‰ä¸­æ•°ç»„
      selectedItemId: undefined,
      selectedRows: undefined,
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
      multiple: true,
      // æ˜¾ç¤ºæœç´¢æ¡ä»¶
      showSearch: true,
      // æ€»æ¡æ•°
      total: 0,
      // ç‰©æ–™äº§å“è¡¨æ ¼æ•°æ®
      itemList: null,
      // éƒ¨é—¨æ ‘选项
      itemTypeOptions: undefined,
      // éƒ¨é—¨åç§°
      itemTypeName: undefined,
      defaultProps: {
        children: "children",
        label: "label"
      },
      // æŸ¥è¯¢å‚æ•°
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        materialCode: undefined,
        materialName: undefined,
        itemTypeId: 0,
        typeL: 1,
      },
      // åˆ—信息
      columns: [
        { key: 0, label: `物料/产品编码`, visible: true },
        { key: 1, label: `物料/产品名称`, visible: true },
        { key: 2, label: `规格型号`, visible: true },
        { key: 3, label: `单位`, visible: true },
        { key: 4, label: `物料/产品`, visible: true },
        { key: 5, label: `物料分类`, visible: true },
        { key: 6, label: `创建时间`, visible: true }
      ]
    };
  },
  watch: {
    // æ ¹æ®åç§°ç­›é€‰åˆ†ç±»æ ‘
    itemTypeName(val) {
      this.$refs.tree.filter(val);
    }
  },
  created() {
    this.getList();
  },
  methods: {
    /** æŸ¥è¯¢ç‰©æ–™ç¼–码列表 */
    getList() {
      this.loading = true;
      listMaterialInfo(this.queryParams).then(response => {
          this.itemList = response.rows;
          this.total = response.total;
          this.loading = false;
        }
      );
    },
    // ç­›é€‰èŠ‚点
    filterNode(value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
    },
    // èŠ‚点单击事件
    handleNodeClick(data) {
      this.queryParams.itemTypeId = data.id;
      this.handleQuery();
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** é‡ç½®æŒ‰é’®æ“ä½œ */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    handleCurrent(row){
      if(row){
        this.selectedRows = row;
      }
    },
    handleRowDbClick(row){
      if(row){
        this.selectedRows = row;
        this.$emit('onSelected',this.selectedRows);
        this.showFlag = false;
      }
    },
    // å•é€‰é€‰ä¸­æ•°æ®
    handleRowChange(row) {
      debugger;
      if(row){
        this.selectedRows = row;
      }
    },
    //确定选中
    confirmSelect(){
      if(this.selectedItemId ==null || this.selectedItemId==0){
        this.$notify({
          title:'提示',
          type:'warning',
          message: '请至少选择一条数据!'
        });
        return;
      }
      console.log(this.selectedRows)

      this.$emit('onSelected',this.selectedRows);
      this.showFlag = false;
    }
  }
};
</script>

 billion-ui/src/views/main/bs/bomChildInfo/index.vue

@@ -165,10 +165,13 @@
          <el-input v-model="form.locationName" placeholder="请输入工位名称" />
        </el-form-item>
        <el-form-item label="物料编码" prop="materialCode">
          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
          <el-input v-model="form.materialCode" placeholder="请选择产品" >
            <el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
          </el-input>
          <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
        </el-form-item>
        <el-form-item label="物料名称" prop="materialName">
          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
          <el-input disabled v-model="form.materialName" placeholder="请输入物料名称" />
        </el-form-item>
        <el-form-item label="单耗" prop="costQty">
          <el-input v-model="form.costQty" placeholder="请输入单耗" />
@@ -191,9 +194,11 @@
<script>
import { listBomChildInfo, getBomChildInfo, delBomChildInfo, addBomChildInfo, updateBomChildInfo } from "@/api/main/bs/bomChildInfo";
import { listBomInfo } from "@/api/main/bs/bomInfo";
import ItemSelect from "@/components/itemSelect/single.vue";

export default {
  name: "BomChildInfo",
  components: {ItemSelect},
  data() {
    return {
      // é®ç½©å±‚
@@ -257,6 +262,16 @@
    this.getProcesses();
  },
  methods: {
    //物料选择弹出框
    onItemSelected(obj){
      if(obj !== undefined && obj !== null){
        this.form.materialCode = obj.materialCode;
        this.form.materialName = obj.materialName;
      }
    },
    handleSelectMaterial(){
      this.$refs.itemSelect.showFlag = true;
    },
    /** è¿”回按钮操作 */
    handleClose() {
      const obj = { path: "/main/bs/bomInfo" };

 billion-ui/src/views/main/bs/bomInfo/index.vue

@@ -97,7 +97,11 @@
      <el-table-column show-overflow-tooltip="true" label="产品编码" align="center" prop="productCode"/>
      <el-table-column show-overflow-tooltip="true" label="产品名称" align="center" prop="productName" />
      <el-table-column show-overflow-tooltip="true" label="版本" align="center" prop="version" />
      <el-table-column show-overflow-tooltip="true" label="状态" align="center" prop="status" />
      <el-table-column label="状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column show-overflow-tooltip="true" label="备注" align="center" prop="remark" />
    </el-table>

@@ -124,6 +128,15 @@
        <el-form-item label="产品名称" prop="productName">
          <el-input v-model="form.productName" placeholder="请输入产品名称" />
        </el-form-item>
        <el-form-item label="工单状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
        </el-form-item>
@@ -141,6 +154,7 @@

export default {
  name: "BomInfo",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // é®ç½©å±‚