代码测试后更新

ZengTao

2024-01-22 7fac117d5b0217be53bdf7945bcfb3c1715b5bbb

代码测试后更新

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -360,6 +360,7 @@
  "Hand Movement":"Hand Movement",

  "Please enter the correct glassID":"Please enter the correct glassID",

  "Switch":"Switch",

  "This frame has glass that is currently outing":"This frame has glass that is currently outing",

    "ServoManualone": {

      "A01 所在格子": "A01 Current Grid",

      "数量": "Quantity",


 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -36,6 +36,9 @@
  "northglassMESsystem": "北玻MES系统",

  "exit": "退出",

  "changePassword": "修改密码",

  "Old password":"旧密码",

  "New password":"新密码",

  "Confirm password":"提交密码",

  "resetPassword": "重置密码",

  "home": "主页",

  "role": "角色",

@@ -350,6 +353,7 @@
  "Hand Movement":"手动",

  "Please enter the correct glassID":"请输入正确的玻璃ID",

  "Switch":"切换",

  "This frame has glass that is currently outing":"此铝框有正在出片的玻璃",

  "langparameter": {

    "conveyor Velocity(Auto FAST)": "D01-D06 皮带输送自动快速",

    "conveyor Velocity(Auto SLOW)": "D01-D06 皮带输送自动慢速",


 CanadaMes-ui/src/views/home/index.vue

@@ -787,7 +787,7 @@
                        <el-table-column :min-width="90" prop="barcode" :label="$t('Complete')">

                            <template slot-scope='scope' style="height:100px;height:100px;">

                                <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                                    :disabled="!(!isAllowQueue && scope.row.state != 2 && scope.row.state != 4)"

                                    :disabled="!(!isAllowQueue && scope.row.state != 1 && scope.row.state != 2)"

                                    @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{

                                        $t('Complete')

                                    }}</el-button>

@@ -1629,6 +1629,8 @@
                    DeleteProductionQueueGlass(id).then(res => {

                        if (res.data.message == 200) {

                            this.$message.success(this.$t('Operation successful'));

                        }else{

                            this.$message.error(this.$t('This frame has glass that is currently outing'));

                        }

                    });

                }


 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -153,7 +153,7 @@
            // // TODO: handle exception

            // }



            // if (S7control.getinstance().CheckConnected() == true) {

            if (S7control.getinstance().CheckConnected() == true) {

                // 获取当前扫码方式



                List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);

@@ -264,37 +264,7 @@
                for (Boolean emergencystop : emergencystops) {

                    jsonObject.append("emergencystop", emergencystop);

                }



                // // 终止继续按钮

                // List<String> niuanaddressList3 =

                // Arrays.asList(config.getProperty("Parameter2.stop").split(","));

                // List<Boolean> anniuread =

                // S7control.getinstance().readBits(niuanaddressList3);

                // // Boolean[] value4 = { false, false};

                // // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));

                // Boolean[] value5 = { true };

                // List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));

                // short[] anniuparams = new short[anniuread.size()];

                // for (int i = 0; i < anniuread.size(); i++) {

                // boolean value = anniuread.get(i);

                // anniuparams[i] = value ? (short) 1 : (short) 0;

                // }



                // short[] resets2 = new short[resets.size()];

                // for (int i = 0; i < resets.size(); i++) {

                // boolean value = resets.get(i);

                // resets2[i] = value ? (short) 1 : (short) 0;

                // }



                // for (short number : resets2) {



                // if (number == 1) {

                // jsonObject.append("Abort", anniuparams);



                // }



                // }

            // }

            }



            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);

            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);


 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -17,28 +17,28 @@
        //
        System.out.println("启动完成");

         new PlcHold().start();
        //  new PlcHold().start();

        new Plchome().start();
        new PlcLayout().start();
        new Plcalarm().start();
        // new PlcLayout().start();
        // new Plcalarm().start();

        new Plcsign().start();
        // new Plcsign().start();

        new Plcstate().start();
        new PlcPositioning1().start();
        // new Plcstate().start();
        // new PlcPositioning1().start();

        new PlcParameter2().start();
        // new PlcParameter2().start();

        new PLCAutomaticParameterSetting().start();
        // new PLCAutomaticParameterSetting().start();

        new PlcManualonePosition().start();
        new PlcManualonePosition2().start();
        new PlcServoManualone().start();
        new PLCManualJog().start();
        new Plclog().start();
        // new PlcManualonePosition().start();
        // new PlcManualonePosition2().start();
        // new PlcServoManualone().start();
        // new PLCManualJog().start();
        // new Plclog().start();

        new PlcInteractionState().start();
        // new PlcInteractionState().start();
        //new PlcParameter1Review().start();
       // new PLCAutomaticParameterSettingReview().start();
    }

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -335,11 +335,7 @@
  // 根据铝框id删除出片队列玻璃
  @PostMapping("/DeleteProductionQueueGlass")
  public Result DeleteProductionQueueGlass(String FrameNo) {
    homeMapper.CompleteQueueByFrameNo(FrameNo);

    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
    return outSliceServive.CompleteQueueByFrameNo(FrameNo);
  }

  // 添加铝框id对应玻璃到出片队列

 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java

@@ -179,12 +179,12 @@
  @Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39)")
  List<RolePermission> SelectPermissionByUserName(String username);

  //根据玻璃完成出片任务
  @Update("update out_slice set state=3 where id=#{id}")
  void CompleteQueue(String id);
  // //根据玻璃完成出片任务
  // @Update("update out_slice set state=2 where id=#{id}")
  // void CompleteQueue(String id);

  //根据玻璃完成出片任务
  @Update("update out_slice set state=3 where id=#{id}")
  @Update("update out_slice set state=2 where glassid=#{glassid}")
  void CompleteQueueByGlassId(String glassid);

  //查询铝框id对应玻璃完成数量
@@ -223,4 +223,9 @@
  @Update("update storage_cage set width=width+#{width} where   cage=#{cage} and cell=#{cell};")
  void UpdataCageWidth(double width, int cage, int cell);

  //获取铝框有没有正在出片的玻璃
  @Select("select count(*) from out_slice where barcode=#{frameNo} and state=1")
  Short SelectOutingQueueCount(String frameNo);
  

}

 springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java

@@ -52,16 +52,7 @@

  // 完成出片任务
  public Result CompleteQueue(String id, String frameid, String glassid) {
    homeMapper.CompleteQueue(id);
    Short num = homeMapper.SelectCountByFrameNo(frameid);
    if (num == 0) {
      homeMapper.CompleteQueueByFrameNo(frameid);
    }
    StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
    if (storageCage != null && storageCage.getState().equals("3")) {
      spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
      homeMapper.DeleteByGlassID(glassid);
    }
    homeMapper.CompleteQueueByGlassId(glassid);
    Map<String, Object> map = new HashMap<>();
    map.put("message", "200");
    return Result.success(map);
@@ -122,4 +113,16 @@
    return homeMapper.SelectCurrentFrame();
  }

public Result CompleteQueueByFrameNo(String frameNo) {
  Map<String, Object> map = new HashMap<>();
  Short num= homeMapper.SelectOutingQueueCount(frameNo);
  if(num==0){
    homeMapper.CompleteQueueByFrameNo(frameNo);
    map.put("message", "200");
  }else{
    map.put("message", "300");
  }
  return Result.success(map);
}

}