-

admin

2024-04-16 ddb300bd410f6c9871c3c033e16451f709c2781e

-

 jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@
                // è¿‡æ»¤è¯·æ±‚
                .authorizeRequests()
                // å¯¹äºŽç™»å½•login æ³¨å†Œregister éªŒè¯ç captchaImage å…è®¸åŒ¿åè®¿é—®
                .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/**","/em/inspectionPlanItemsProject/**").permitAll()
                .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/**","/em/inspectionPlanItemsProject/**","/jcdmMes/**").permitAll()
                // é™æ€èµ„源，可匿名访问
                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java

@@ -155,8 +155,8 @@
        BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
        checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
        checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
        checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
//        bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
//        checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
        bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
        List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
        if(bsFormulaChildInfos.size()>0){
            String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java

@@ -105,6 +105,15 @@
    }

    /**
     * æ›´æ¢æ€»æˆå·
     */
    @PostMapping("/replaceAssemblyCode")
    public void replaceAssemblyCode(@RequestBody DaParamCollection daParamCollection)
    {
        daParamCollectionService.replaceAssemblyCode(daParamCollection);
    }

    /**
     * ä¿®æ”¹è®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集
     */
    @PreAuthorize("@ss.hasPermi('main:paramCollection:edit')")

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java

@@ -1,5 +1,6 @@
package com.jcdm.main.da.paramCollection.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
import lombok.Data;
@@ -99,14 +100,20 @@
    @Excel(name = "类型")
    private String type;

    @TableField(exist = false)
    private String model;

    @TableField(exist = false)
    private String productBarcode;

    @TableField(exist = false)
    private String tightenTheArray;

    @TableField(exist = false)
    private String productModel;

    @TableField(exist = false)
    private String yzSfcCode;

    public String getTightenTheArray() {
        return tightenTheArray;
    }

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java

@@ -71,4 +71,5 @@

    void insertBatch(List<DaParamCollection> confList);

    void replaceAssemblyCode(DaParamCollection daParamCollection);
}

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java

@@ -60,6 +60,9 @@
    @Resource
    private SqlSessionFactory sqlSessionFactory;

    @Autowired
    private IDaParamCollectionService daParamCollectionService;

    /**
     * æŸ¥è¯¢è®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集
     * 
@@ -266,4 +269,19 @@
        }

    }

    @Override
    public void replaceAssemblyCode(DaParamCollection daParamCollection) {
        List<DaParamCollection> list = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>()
                .eq(DaParamCollection::getSfcCode, daParamCollection.getSfcCode())
                .eq(DaParamCollection::getLocationCode, daParamCollection.getLocationCode())
        );
        if(list.size() > 0){
            for (DaParamCollection paramCollection : list) {
                paramCollection.setSfcCode(daParamCollection.getYzSfcCode());
                daParamCollectionService.saveOrUpdate(paramCollection);
            }
        }

    }
}

 jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java

ÎļþÃû´Ó jcdm-main/src/main/java/com/jcdm/main/restful/controller/testClass.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.jcdm.main.restful.controller;
package com.jcdm.main.restful.factoryMes.controller;

import java.util.Date;
import java.util.Timer;

 jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java

ÎļþÃû´Ó jcdm-main/src/main/java/com/jcdm/main/restful/service/RestfulService.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.jcdm.main.restful.service;
package com.jcdm.main.restful.factoryMes.service;

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;

 jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml

@@ -18,8 +18,8 @@
        <result property="paramLower"    column="param_lower"    />
        <result property="paramStandard"    column="param_standard"    />
        <result property="collectionTime"    column="collection_time"    />
        <result property="spareField1"    column="spare_field_1"    />
        <result property="spareField2"    column="spare_field_2"    />
        <result property="spareField1"    column="spare_field1"    />
        <result property="spareField2"    column="spare_field2"    />
        <result property="createUser"    column="create_user"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateUser"    column="update_user"    />
@@ -31,7 +31,7 @@
    </resultMap>

    <sql id="selectDaParamCollectionVo">
        select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
        select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field1, spare_field2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
    </sql>

    <select id="selectDaParamCollectionList" parameterType="DaParamCollection" resultMap="DaParamCollectionResult">
@@ -69,8 +69,8 @@
            <if test="paramLower != null">param_lower,</if>
            <if test="paramStandard != null">param_standard,</if>
            <if test="collectionTime != null">collection_time,</if>
            <if test="spareField1 != null">spare_field_1,</if>
            <if test="spareField2 != null">spare_field_2,</if>
            <if test="spareField1 != null">spare_field1,</if>
            <if test="spareField2 != null">spare_field2,</if>
            <if test="createUser != null">create_user,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateUser != null">update_user,</if>

 jcdm-ui/src/api/main/da/paramCollection/paramCollection.js

@@ -35,6 +35,15 @@
  })
}

// çº¿è¾¹æ€»æˆæ¢æ€»æˆç 
export function replaceAssemblyCode(data) {
  return request({
    url: '/main/paramCollection/replaceAssemblyCode',
    method: 'post',
    data: data
  })
}

// æ–°å¢žè®¾å¤‡äº§å“è¿‡ç¨‹å‚数采集 saveCampaignTimeParameters
export function saveCampaignTimeParameters(data) {
  return request({

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

@@ -96,7 +96,13 @@
<!--           </el-col>-->
<!--         </el-row>-->
         <el-row style="margin-top: 20px">
             <el-button @click="Release" type="primary">放行</el-button>
           <el-col></el-col>
             <span style="width: 130px;" class="head-font">预装总成号 : {{headContent.yzSfcCode}}</span>
         </el-row>
         <el-row style="margin-top: 20px">
<!--             <el-button @click="Release" type="primary">绑定</el-button>-->
           <el-button @click="bindYzSfc" type="primary">绑定</el-button>

         </el-row>
       </el-card>

@@ -308,7 +314,8 @@
  addBasicParameters,
  addParamCollection,
  addTighteningParameters,
  saveCampaignTimeParameters
  saveCampaignTimeParameters,
  replaceAssemblyCode,
} from "@/api/main/da/paramCollection/paramCollection";

export default {
@@ -331,6 +338,7 @@
        processesCode: 'OP1010',
        processesName: '贴标机-贴码',
        sfcCode: '',
        yzSfcCode: '',
      },
      workpieceInformation: {
        workOrderNo: null,
@@ -361,7 +369,7 @@
      },
      content: '',
      activeName: 'first',
      url: "ws://192.168.1.100:8080/websocket/message/",
      url: "ws://192.168.1.106:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -428,6 +436,19 @@
  methods: {
    serialLink() {
      this.open1 = true
    },
    bindYzSfc(){
      if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
        let param = {
          sfcCode: this.headContent.sfcCode,
          locationCode: this.headContent.processesCode,
          yzSfcCode: this.headContent.yzSfcCode
        }
        this.$message('可以绑定！');
        replaceAssemblyCode(param).then(response => {

        });
      }
    },
    Release(){
      // this.$message('portsList！'+this.portsList.length);
@@ -661,23 +682,24 @@
      else {
        const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
        console.log("串口收到数据-------------------"+scanValue)
        // if(this.cakeLamp.InPlace=== 1){
          if(this.headContent.sfcCode !== ''){

        if(this.headContent.sfcCode !== ''){
          if(scanValue.includes("SS")){
            this.headContent.yzSfcCode = scanValue
          }else {
            this.$message('扫描物料编码'+scanValue);
            console.log(scanValue)
            this.serialPortMethod(scanValue)
          }else {
            this.$message('扫码识别产品序列号'+scanValue);
            this.headContent.sfcCode = scanValue;
            this.queryParams.productNum = scanValue;
            this.getList()
            // this.getListFormulaChild()
            this.cakeLamp.scanFinish = 1
            this.cakeLamp.startWork = 1
          }
        // }else {
        //   this.$message('工件未到位禁止扫码！');
        // }
        } else {
          this.$message('扫码识别产品序列号'+scanValue);
          this.headContent.sfcCode = scanValue;
          this.queryParams.productNum = scanValue;
          this.getList()
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1
        }

      }
    },
    clearHistory() {