Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-15 7f1dbf4296013a4b15fbc2748de072f7c7ad4388

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java

@@ -22,6 +22,8 @@
    @Excel(name = "物料编号")
    private String materialCode;

    @Excel(name = "车型")
    private String carType;
    /** 物料名称 */
    @Excel(name = "物料名称")
    private String materialName;
@@ -97,6 +99,12 @@
    public String getMaterialCode() 
    {
        return materialCode;
    }
    public void setCarType(String carType) {this.carType = carType;}

    public String getCarType()
    {
        return carType;
    }
    public void setMaterialName(String materialName) 
    {
@@ -241,6 +249,7 @@
            .append("id", getId())
            .append("materialCode", getMaterialCode())
            .append("materialName", getMaterialName())
            .append("carType", getCarType())
            .append("materialView", getMaterialView())
            .append("typeZ", getTypeZ())
            .append("typeL", getTypeL())

 jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java

@@ -58,6 +58,8 @@
    @Excel(name = "更改用户")
    private String updateUser;

    @Excel(name = "网卡地址")
    private String macAddress;
    /** 备注 */
    @Excel(name = "备注")
    private String remarks;
@@ -76,9 +78,15 @@
        this.processesCode = processesCode;
    }

    public String getProcessesCode() 
    public String getProcessesCode()
    {
        return processesCode;
    }
    public void setMacAddress(String macAdress) {this.macAddress = macAdress;}

    public String getMacAddress()
    {
        return macAddress;
    }
    public void setProcessesName(String processesName) 
    {
@@ -176,6 +184,7 @@
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("processesCode", getProcessesCode())
             .append("macAddress", getMacAddress())
            .append("processesName", getProcessesName())
            .append("processesType", getProcessesType())
            .append("ipAddress", getIpAddress())

 jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml

@@ -23,10 +23,12 @@
        <result property="status"    column="status"    />
        <result property="supplier"    column="supplier"    />
        <result property="mark"    column="mark"    />
        <result property="carType"    column="car_type"    />

    </resultMap>

    <sql id="selectBsMaterialInfoVo">
        select id, material_code, mark, material_name, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
        select id, material_code, mark, material_name,car_type, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
    </sql>

    <select id="selectBsMaterialInfoList" parameterType="BsMaterialInfo" resultMap="BsMaterialInfoResult">
@@ -41,6 +43,7 @@
            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
            <if test="matterVersion != null  and matterVersion != ''"> and matter_version = #{matterVersion}</if>
            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
            <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
            <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
            <if test="createTime != null "> and create_time = #{createTime}</if>
            <if test="updateUser != null  and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -63,6 +66,7 @@
            <if test="id != null">id,</if>
            <if test="materialCode != null">material_code,</if>
            <if test="materialName != null">material_name,</if>
            <if test="carType != null">car_type,</if>
            <if test="mark != null">mark,</if>
            <if test="materialView != null">material_view,</if>
            <if test="typeZ != null">type_z,</if>
@@ -84,6 +88,7 @@
            <if test="id != null">#{id},</if>
            <if test="materialCode != null">#{materialCode},</if>
            <if test="materialName != null">#{materialName},</if>
            <if test="carType != null">#{carType},</if>
            <if test="mark != null">#{mark},</if>
            <if test="materialView != null">#{materialView},</if>
            <if test="typeZ != null">#{typeZ},</if>
@@ -108,6 +113,7 @@
        <trim prefix="SET" suffixOverrides=",">
            <if test="materialCode != null">material_code = #{materialCode},</if>
            <if test="materialName != null">material_name = #{materialName},</if>
            <if test="carType != null">car_type = #{carType},</if>
            <if test="mark != null">mark = #{mark},</if>
            <if test="materialView != null">material_view = #{materialView},</if>
            <if test="typeZ != null">type_z = #{typeZ},</if>

 jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml

@@ -19,15 +19,17 @@
        <result property="updateUser"    column="update_user"    />
        <result property="updateTime"    column="update_time"    />
        <result property="remarks"    column="remarks"    />
        <result property="macAddress"    column="mac_address"    />
    </resultMap>

    <sql id="selectScStationConfVo">
        select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
        select id, processes_code, mac_address,processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
    </sql>

    <select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
        <include refid="selectScStationConfVo"/>
        <where>  
            <if test="macAddress != null  and macAddress != ''"> and mac_adress = #{macAddress}</if>
            <if test="processesCode != null  and processesCode != ''"> and processes_code = #{processesCode}</if>
            <if test="processesName != null  and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
            <if test="processesType != null  and processesType != ''"> and processes_type = #{processesType}</if>
@@ -51,6 +53,7 @@
        insert into sc_station_conf
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="processesCode != null">processes_code,</if>
            <if test="macAddress != null">mac_address,</if>
            <if test="processesName != null">processes_name,</if>
            <if test="processesType != null">processes_type,</if>
            <if test="ipAddress != null">ip_address,</if>
@@ -66,6 +69,7 @@
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="processesCode != null">#{processesCode},</if>
            <if test="macAddress != null">#{macAddress},</if>
            <if test="processesName != null">#{processesName},</if>
            <if test="processesType != null">#{processesType},</if>
            <if test="ipAddress != null">#{ipAddress},</if>
@@ -86,6 +90,7 @@
        <trim prefix="SET" suffixOverrides=",">
            <if test="processesCode != null">processes_code = #{processesCode},</if>
            <if test="processesName != null">processes_name = #{processesName},</if>
            <if test="macAddress != null">mac_address = #{macAddress},</if>
            <if test="processesType != null">processes_type = #{processesType},</if>
            <if test="ipAddress != null">ip_address = #{ipAddress},</if>
            <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>

 jcdm-ui/src/views/dashboard/LineChart.vue

@@ -63,6 +63,10 @@
    },
    setOptions({ expectedData, actualData } = {}) {
      this.chart.setOption({
        title: {
          text: '小时产量对比', // 标题文本
          left: 'left' // 标题位置
        },
        xAxis: {
          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
          boundaryGap: false,

 jcdm-ui/src/views/dashboard/PanelGroup.vue

@@ -7,7 +7,7 @@
        </div>
        <div class="card-panel-description">
          <div class="card-panel-text">
            访客
            合箱上线
          </div>
          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
        </div>
@@ -20,7 +20,7 @@
        </div>
        <div class="card-panel-description">
          <div class="card-panel-text">
            消息
            合箱下线
          </div>
          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
        </div>
@@ -33,7 +33,7 @@
        </div>
        <div class="card-panel-description">
          <div class="card-panel-text">
            金额
            总装上线
          </div>
          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
        </div>
@@ -46,7 +46,7 @@
        </div>
        <div class="card-panel-description">
          <div class="card-panel-text">
            订单
            总装下线
          </div>
          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
        </div>

 jcdm-ui/src/views/dashboard/PieChart.vue

@@ -45,29 +45,43 @@
      this.chart = echarts.init(this.$el, 'macarons')

      this.chart.setOption({
        title: {
          text: '工位堵塞Top5', // 标题文本
          left: 'center' // 标题位置
        },
        tooltip: {
          trigger: 'item',
          formatter: '{a} <br/>{b} : {c} ({d}%)'
        },
        // textStyle
        legend: {
          left: 'center',
          bottom: '10',
          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
          orient: 'vertical',

          left: 'left',
          // left: 'center',
          // bottom: '10',//左侧高度
          data: ['OP460', 'OP090', 'OP660', 'OP650', 'OP730']
        },
        series: [
          {
            name: 'WEEKLY WRITE ARTICLES',
            type: 'pie',
            roseType: 'radius',
            radius: [15, 95],
            center: ['50%', '38%'],
            // roseType: 'radius',//更改样式
            radius: '50%',
            // labelLine: {
            //   length: 10 // 调整标签线的长度
            // },
            center: ['50%', '60%'],
            data: [
              { value: 320, name: 'Industries' },
              { value: 240, name: 'Technology' },
              { value: 149, name: 'Forex' },
              { value: 100, name: 'Gold' },
              { value: 59, name: 'Forecasts' }
              { value: 5, name: 'OP460' },
              { value: 9, name: 'OP090' },
              { value: 5, name: 'OP660' },
              { value: 5, name: 'OP650' },
              { value: 7, name: 'OP730' }
            ],
            label: {
              formatter: '{b}: {c} ({d}%)'
            },
            animationEasing: 'cubicInOut',
            animationDuration: 2600
          }

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

@@ -89,6 +89,10 @@
      </el-table-column>
      <el-table-column label="视图" align="center" prop="materialView" width="180">
      </el-table-column>
      <el-table-column label="特殊代码" align="center" prop="mark" width="180">
      </el-table-column>
      <el-table-column label="车型" align="center" prop="carType" width="180">
      </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"/>
@@ -170,6 +174,12 @@
      <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
        <el-form-item label="物料编号" prop="materialCode">
          <el-input v-model="form.materialCode" placeholder="请输入物料编号" />
        </el-form-item>
        <el-form-item label="特殊代码" prop="mark">
          <el-input v-model="form.mark" placeholder="请输入特殊代码" />
        </el-form-item>
        <el-form-item label="车型" prop="carType">
          <el-input v-model="form.carType" placeholder="请输入特殊代码" />
        </el-form-item>
        <el-form-item label="物料名称" prop="materialName">
          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
@@ -262,6 +272,7 @@
        pageNum: 1,
        pageSize: 10,
        materialCode: null,
        carType:null,
        materialName: null,
        materialView: null,
        typeZ: null,
@@ -324,6 +335,7 @@
        materialName: null,
        materialView: null,
        typeZ: null,
        carType:null,
        typeL: null,
        unit: null,
        matterVersion: null,

 jcdm-ui/src/views/main/sc/stationConf/index.vue

@@ -89,6 +89,9 @@
          </el-table-column>
          <el-table-column label="IP地址" align="center" prop="ipAddress">
          </el-table-column>
          <el-table-column label="网卡地址" align="center" prop="macAddress">
          </el-table-column>

          <el-table-column label="备注" align="center" prop="remarks">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
@@ -147,6 +150,9 @@
        <el-form-item label="IP地址" prop="ipAddress">
          <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
        </el-form-item>
        <el-form-item label="网卡地址" prop="macAddress">
          <el-input v-model="form.macAddress" placeholder="请输入网卡地址" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
@@ -195,6 +201,7 @@
        processesName: null,
        processesType: null,
        ipAddress: null,
        macAddress: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,