Merge remote-tracking branch 'origin/master'

hdy

2024-01-06 9c5ce6d05798da90d130ddf42d366fab369735e7

Merge remote-tracking branch 'origin/master'

 README.md

@@ -3,8 +3,6 @@

## å¹³å°ç®€ä»‹

若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。

* å‰ç«¯é‡‡ç”¨Vue、Element UI。
* åŽç«¯é‡‡ç”¨Spring Boot、Spring Security、Redis & Jwt。
* æƒé™è®¤è¯ä½¿ç”¨Jwt，支持多终端认证系统。

 jcdm-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <!-- æ—¥å¿—存放路径 -->
    <property name="log.path" value="/home/ruoyi/logs" />
    <property name="log.path" value="/home/mes/logs" />
    <!-- æ—¥å¿—输出格式 -->
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />


 jcdm-common/src/main/java/com/jcdm/common/utils/file/FileTypeUtils.java

@@ -13,7 +13,7 @@
    /**
     * èŽ·å–文件类型
     * <p>
     * ä¾‹å¦‚: ruoyi.txt, è¿”回: txt
     * ä¾‹å¦‚: jcdm.txt, è¿”回: txt
     * 
     * @param file æ–‡ä»¶å
     * @return åŽç¼€ï¼ˆä¸å«".")
@@ -30,7 +30,7 @@
    /**
     * èŽ·å–文件类型
     * <p>
     * ä¾‹å¦‚: ruoyi.txt, è¿”回: txt
     * ä¾‹å¦‚: jcdm.txt, è¿”回: txt
     *
     * @param fileName æ–‡ä»¶å
     * @return åŽç¼€ï¼ˆä¸å«".")

 jcdm-common/src/main/java/com/jcdm/common/utils/file/FileUtils.java

@@ -256,7 +256,7 @@
    }

    /**
     * èŽ·å–文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
     * èŽ·å–文件名称 /profile/upload/2022/04/16/jcdm.png
     * 
     * @param fileName è·¯å¾„名称
     * @return æ²¡æœ‰æ–‡ä»¶è·¯å¾„的名称
@@ -274,7 +274,7 @@
    }

    /**
     * èŽ·å–不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
     * èŽ·å–不带后缀文件名称 /profile/upload/2022/04/16/jcdm.png
     * 
     * @param fileName è·¯å¾„名称
     * @return æ²¡æœ‰æ–‡ä»¶è·¯å¾„和后缀的名称

 jcdm-ui/src/views/index.vue

@@ -9,81 +9,7 @@
        <hr />
      </el-col>
    </el-row>
    <el-row :gutter="20">
      <el-col :sm="24" :lg="12" style="padding-left: 20px">
        <h2>江宸MES管理框架</h2>
        <p>

        </p>
      </el-col>

      <el-col :sm="24" :lg="12" style="padding-left: 50px">
        <el-row>
          <el-col :span="12">
            <h2>技术选型</h2>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="6">
            <h4>后端技术</h4>
            <ul>
              <li>SpringBoot</li>
              <li>Spring Security</li>
              <li>JWT</li>
              <li>MyBatis</li>
              <li>Druid</li>
              <li>Fastjson</li>
              <li>...</li>
            </ul>
          </el-col>
          <el-col :span="6">
            <h4>前端技术</h4>
            <ul>
              <li>Vue</li>
              <li>Vuex</li>
              <li>Element-ui</li>
              <li>Axios</li>
              <li>Sass</li>
              <li>Quill</li>
              <li>...</li>
            </ul>
          </el-col>
        </el-row>
      </el-col>
    </el-row>
    <el-divider />
    <el-row :gutter="20">
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>信息</span>
          </div>
          <div class="body">

          </div>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>日志</span>
          </div>
          <div class="body">

          </div>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="8">
        <el-card class="update-log">
          <div slot="header" class="clearfix">
            <span>支持</span>
          </div>
          <div class="body">

          </div>
        </el-card>
      </el-col>
    </el-row>
  </div>
</template>


 jcdm-ui/src/views/main/bs/material/index.vue

@@ -83,41 +83,48 @@

    <el-table v-loading="loading" border :data="materialList" @selection-change="handleSelectionChange" v-if="materialList.length > 0">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="物料编号" width="130" align="center" prop="materialCode">
      <el-table-column label="物料编号"  align="center" prop="materialCode" width="180">
      </el-table-column>
      <el-table-column label="物料名称" align="center" prop="materialName">
      <el-table-column label="物料名称" align="center" prop="materialName" width="250">
      </el-table-column>
      <el-table-column label="视图" align="center" prop="materialView">
      <el-table-column label="视图" align="center" prop="materialView" width="180">
      </el-table-column>
<!--      <el-table-column label="种类" align="center" prop="typeZ">-->
<!--      </el-table-column>-->
      <el-table-column label="类型" align="center" prop="typeL">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
        </template>
      </el-table-column>
      <el-table-column label="单位" align="center" prop="unit">

      <el-table-column label="型号" align="center" prop="typeZ" width="180">
      </el-table-column>

      <el-table-column label="单位" align="center" prop="unit" width="80">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
        </template>
      </el-table-column>
<!--      <el-table-column label="ERP规格" align="center" prop="erpSpec">-->
<!--      </el-table-column>-->
      <el-table-column label="数据来源" align="center" prop="dataSource">
      </el-table-column>
      <el-table-column label="状态" align="center" prop="status">

      <el-table-column label="状态" align="center" prop="status" width="80">
        <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 label="厂商" align="center" prop="supplier">
      </el-table-column>-->
      <el-table-column label="备注" align="center" prop="remarks" width="180">
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remarks">
      <el-table-column label="创建人" align="center" prop="createUser" width="150">
      </el-table-column>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
        </template>
      <el-table-column label="创建时间" align="center" prop="createTime" width="170">
      </el-table-column>
      <el-table-column label="更新人" align="center" prop="updateUser" width="150">
      </el-table-column>
      <el-table-column label="更新时间" align="center" prop="updateTime" width="170">
      </el-table-column>
      <el-table-column label="数据来源" align="center" prop="dataSource">
      </el-table-column>
      <el-table-column fixed="right" label="操作" width="200" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -167,14 +174,8 @@
        <el-form-item label="物料名称" prop="materialName">
          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
        </el-form-item>
        <el-form-item label="视图" prop="materialView">
          <el-input v-model="form.materialView" placeholder="请输入视图" />
        </el-form-item>
<!--        <el-form-item label="种类" prop="typeZ">-->
<!--          <el-input v-model="form.typeZ" placeholder="请输入种类" />-->
<!--        </el-form-item>-->
        <el-form-item label="类型" prop="typeL">
<!--          <el-input v-model="form.typeL" placeholder="请输入类型" />-->
        <el-form-item label="物料类型" prop="typeL">
          <!--          <el-input v-model="form.typeL" placeholder="请输入类型" />-->
          <el-select v-model="form.typeL" style="width: 204px;" placeholder="请选择单位" clearable>
            <el-option
              v-for="dict in dict.type.material_type"
@@ -183,6 +184,12 @@
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="物料型号" prop="typeZ">
          <el-input v-model="form.typeZ" placeholder="请输入种类" />
        </el-form-item>
        <el-form-item label="视图" prop="materialView">
          <el-input v-model="form.materialView" placeholder="请输入视图" />
        </el-form-item>
        <el-form-item label="单位" prop="unit">
<!--          <el-input v-model="form.unit" placeholder="请输入单位" />-->
@@ -198,12 +205,12 @@
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
        <el-form-item label="ERP规格" prop="erpSpec">
<!--        <el-form-item label="ERP规格" prop="erpSpec">
          <el-input v-model="form.erpSpec" placeholder="请输入ERP规格" />
        </el-form-item>
        <el-form-item label="厂商" prop="supplier">
        </el-form-item>-->
<!--        <el-form-item label="厂商" prop="supplier">
          <el-input v-model="form.supplier" placeholder="请输入厂商" />
        </el-form-item>
        </el-form-item>-->
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
@@ -286,9 +293,6 @@
        ],
        typeL: [
          { required: true, message: "类型不能为空", trigger: "blur" }
        ],
        unit: [
          { required: true, message: "单位不能为空", trigger: "blur" }
        ],
      }
    };

 jcdm-ui/src/views/main/kb/stationTerminal/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,170 @@
<template>
  <div class="app-container">
   <el-row :gutter="5">
     <el-col :span="6">
       <el-card shadow="hover">
         å·¥ä½ç¼–号 : OP1010
       </el-card>
     </el-col>
     <el-col :span="6">
       <el-card shadow="hover">
         å·¥ä½åç§° : è´´æ ‡æœº-贴码
       </el-card>
     </el-col>
     <el-col :span="12">
       <el-card shadow="hover">
         æ€»æˆç¼–码 : 1000000000000001
       </el-card>
     </el-col>

   </el-row>
   <el-row :gutter="5" style="margin-top: 5px">
     <el-col :span="6" >
       <el-card class="bottom-card">
         <div slot="header" class="clearfix">
           <span>当前工件信息</span>
         </div>
         <el-descriptions :column="1" border>
           <el-descriptions-item>
             <template slot="label">
               <span>工单编号</span>
             </template>
               <span>test00000001</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               <span>产品编号</span>
             </template>
             <span>test00000001</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               <span>产品型号</span>
             </template>
             <span>test00000001</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               <span>产品名称</span>
             </template>
             <span>test00000001</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               <span>节拍</span>
             </template>
             <span>江苏省苏州市吴中区吴中</span>
           </el-descriptions-item>
         </el-descriptions>
         <el-divider></el-divider>
         <el-row>
           <el-col :span="12">
             <el-button class="circle-button" circle></el-button>
             <span>&nbsp;PLC状态</span>
           </el-col>
           <el-col :span="12">
             <el-button class="circle-button" circle></el-button>
             <span>&nbsp;扫码枪状态</span>
           </el-col>
         </el-row>
         <el-row style="margin-top: 20px">
           <el-col :span="12">
             <el-button class="circle-button" circle></el-button>
             <span>&nbsp;工件到位</span>
           </el-col>
           <el-col :span="12">
             <el-button class="circle-button" circle></el-button>
             <span>&nbsp;扫码完成</span>
           </el-col>
         </el-row>
         <el-row style="margin-top: 20px">
           <el-col :span="12">
             <el-button class="circle-button" circle></el-button>
             <span>&nbsp;开始作业</span>
           </el-col>
           <el-col :span="12">
             <el-button class="circle-button" circle></el-button>
             <span>&nbsp;允许放行</span>
           </el-col>
         </el-row>
       </el-card>

     </el-col>
     <el-col :span="18">
       <el-tabs type="border-card"  style="height: 600px">
         <el-tab-pane>
           <span slot="label"> <a class="el-icon-date"></a>首页</span>
           <el-col :span="8">
             <el-table>
               <el-table-column label="序号" align="center" prop="repairIdentification" width="50px"/>
               <el-table-column label="操作内容" align="center" prop="boxCode"  width="300px"/>
             </el-table>
           </el-col>
           <el-col :span="16">
             <el-image style="height: 520px;width: 100%" :src="imgSrc"></el-image>
           </el-col>
         </el-tab-pane>
         <el-tab-pane>
           <span slot="label"> <b class="el-icon-date"></b>物料BOM</span>
           <el-empty >
             <span slot="description">暂无数据</span>
           </el-empty>
         </el-tab-pane>
         <el-tab-pane>
           <span slot="label"> <c class="el-icon-date"></c>采集清单</span>
           <el-empty >
             <span slot="description">暂无数据</span>
           </el-empty>
         </el-tab-pane>
         <el-tab-pane>
           <span slot="label"> <d class="el-icon-date"></d>安灯状态</span>
           <el-empty >
             <span slot="description">暂无数据</span>
           </el-empty>
         </el-tab-pane>
         <el-tab-pane>
           <span slot="label"> <e class="el-icon-date"></e>工艺配方</span>
           <el-empty >
             <span slot="description">暂无数据</span>
           </el-empty>
         </el-tab-pane>
       </el-tabs>
     </el-col>
   </el-row>


  </div>
</template>
<script>
export default {
  components: {},
  props: [],
  data() {
    return {
      imgSrc: '',
    }
  },
  computed: {},
  watch: {},
  created() {},
  mounted() {},
  methods: {}
}

</script>
<style scoped>
.bottom-card{
  height: 600px;
}
.circle-button{
  height: 30px;
  width: 30px;
  //background-color: #ce0b0b;
  //background-color: #00afff;
  background-color: #13ce66;
}

span{
  font-size: 15px;
}
</style>

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -469,8 +469,10 @@
    // åœ¨è¿™é‡Œç¼–写处理选中事件的逻辑
    handleSelectChange(selectedOption) {
      this.form.lineCode = null;
      this.queryParams.workshopCode = selectedOption;
      listLineInfo(this.queryParams).then(response => {
      let params = {
        workshopCode: selectedOption
      };
      listLineInfo(params).then(response => {
        this.lineOptions = response.rows;
      });
    },
@@ -509,7 +511,6 @@
    getList() {
      this.loading = true;
      listProductionOrde(this.queryParams).then(response => {
        console.log(response)
        this.productionOrdeList = response.rows;
        this.total = response.total;
        this.loading = false;