配瓦

yyt

2024-06-29 c9745dfbbd9f64b1b84574446ab93f32a76896fe

配瓦

 jcdm-admin/src/main/resources/application-druid.yml

@@ -19,14 +19,14 @@
#                url: jdbc:sqlserver://192.168.0.189:1433;DataBaseName=Jcdm041-Mes
#                username: sa
#                password: JCDM@2023
            master:
                 url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
                 username: sa
                 password: sam@123456
#            master:
#                 url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
#                 username: dt
#                 password: dtroot
#                 username: sa
#                 password: sam@123456
            master:
                 url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm041-Mes
                 username: dt
                 password: dtroot
#            master:
#                 url: jdbc:sqlserver://192.168.6.238:1433;DataBaseName=Jcdm041-Mes
#                 username: dt
@@ -81,7 +81,7 @@
                    enabled: true
                    # 慢SQL记录
                    log-slow-sql: true
                    slow-sql-millis: 1000
                    slow-sql-millis: 2000
                    merge-sql: true
                wall:
                    config:

 jcdm-admin/src/main/resources/application.yml

@@ -136,10 +136,11 @@
    primary: default
    config:
      default:
        endpoint: opc.tcp://127.0.0.1:49320
        endpoint: opc.tcp://10.10.12.84:49320
        security-policy: none
websocketUrl: 'ws://10.10.12.100:8081/websocket/'
#websocketUrl: 'ws://127.0.0.1:8081/websocket/'
#websocketUrl: 'ws://10.10.8.253:8081/websocket/'

# mybatis-plus
#mybatis-plus:

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java

@@ -386,6 +386,4 @@
        bsOrderSchedulingService.updateBsOrderScheduling(OrderScheduling);
        return R.ok();
    }


}

 jcdm-main/src/main/java/com/jcdm/main/da/opcuaconfig/controller/DaOpcuaConfigController.java

@@ -199,6 +199,9 @@
                if (CollUtil.isNotEmpty(XTParamCollection)) {
                    xParamCollection = XTParamCollection.get(0);
                }

                ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.HOP030.Partcode", "1");
                miloService.writeToOpcByte(entity6);
            }
        } catch (Exception e) {
            throw new RuntimeException(e);

 jcdm-main/src/main/java/com/jcdm/main/da/tileMatchRules/controller/DaTileMatchRulesController.java

@@ -11,6 +11,7 @@
import com.jcdm.main.da.tileMatchCollection.domain.DaTileMatchCollection;
import com.jcdm.main.da.tileMatchCollection.service.IDaTileMatchCollectionService;
import com.jcdm.main.da.tileMatchMiddleware.domain.DaTileMatchMiddleware;
import com.kangaroohy.milo.model.ReadWriteEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -193,6 +194,9 @@
                    DaParamCollection lastOne = XTParamCollection.get(0);
                    XT = lastOne.getParamValue();
                }

                ReadWriteEntity entity6 = new ReadWriteEntity("CFL4HX.HOP040.Partcode", "1");
                miloService.writeToOpcByte(entity6);
            }
        } catch (Exception e) {
            throw new RuntimeException(e);

 jcdm-ui/src/views/main/cfkb/BalanceShaft/index.vue

@@ -87,7 +87,7 @@
        pageSize: 10,
        productSeries: '380Y',
        scanObject1: null,
        scanObject2: 'P0NYK0410001000;T231107031;D2222232;S500003',
        scanObject2: '',
        axisName: null,
        neckName: null,
        tileName: '平衡轴瓦',
@@ -106,7 +106,7 @@
        pageSize: 10,
        productSeries: null,
        scanObject1: null,
        scanObject2: 'P0NYK0410001000;T231107031;D2222232;S500003',
        scanObject2: '',
        axisName: null,
        neckName: null,
        tileName: null,
@@ -184,7 +184,7 @@
          this.$message({
            message: h('p',null, [
              h('span', null, '警告 '),
              h('i', { style: 'color: black' }, '箱体码或曲轴码输入有误'),
              h('i', { style: 'color: black' }, '箱体码或平衡轴码输入有误'),
              h()]),
            type: 'error',
            center: true,
@@ -209,10 +209,10 @@

    // 取箱体码第三段为配瓦值
    axisValueextracted() {
      const parts1 = this.from.scanObject1.split(";");
      if (parts1.length >= 3) {
      const parts1 = this.from.scanObject1.split(",");
      if (parts1.length >= 2) {
        //const axisValueextracted = parts1[2].substring(3,4);
        const axisValueextracted = parts1[2];
        const axisValueextracted = parts1[1];
        return this.queryParams.axisValue= axisValueextracted;

      }

 jcdm-ui/src/views/main/cfkb/crankshaft/index.vue

@@ -266,10 +266,10 @@

    // 取箱体码第三段为配瓦值
    axisValueextracted() {
      const parts1 = this.from.scanObject1.split(";");
      if (parts1.length >= 3) {
      const parts1 = this.from.scanObject1.split(",");
      if (parts1.length >= 2) {
        //const axisValueextracted = parts1[2].substring(3,4);
        const axisValueextracted = parts1[2];
        const axisValueextracted = parts1[1];
        return this.queryParams.axisValue= axisValueextracted;

      }