-

admin

2024-05-13 288790d3b02242a073769db87a20f0912adcdf56

-

 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java

@@ -83,7 +83,7 @@
        if(list.size() > 0){
            paramProductNum = list.get(list.size()-1).getProductNum();
        }
        String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
        String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "OP230");
        JSONObject jsonObject = new JSONObject(orderJsonString);
        // 从JSONObject中获取data对象
        JSONObject dataObject = jsonObject.getJSONObject("data");

 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java

@@ -83,12 +83,19 @@
        lists.add(OPCElement.PACK_OP400_AngleResult);//请求记录数据
        lists.add(OPCElement.PACK_OP410_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP410_AngleResult);//请求记录数据
        lists.add(OPCElement.PACK_OP4301_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP4302_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP4303_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP4304_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP440_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP440_AngleResult);//请求记录数据
        lists.add(OPCElement.PACK_OP450_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP450_AngleResult);//请求记录数据
        lists.add(OPCElement.PACK_OP460_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP460_AngleResult);//请求记录数据
        lists.add(OPCElement.PACK_OP4801_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP4802_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP4803_RecordData);//请求记录数据

        lists.add(OPCElement.PACK_OP500_RecordData);//请求记录数据
        lists.add(OPCElement.PACK_OP500_AngleResult);//请求记录数据
//

 jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java

@@ -24,6 +24,16 @@
    public static final String PACK_OP2502_AngleResult = "PACK.OP250-2.AngleResult";//请求拧紧数据
    public static final String PACK_OP2503_AngleResult = "PACK.OP250-3.AngleResult";//请求拧紧数据

    public static final String PACK_OP4301_RecordData = "PACK.OP430-1.RecordData";//请求拧紧数据
    public static final String PACK_OP4302_RecordData = "PACK.OP430-2.RecordData";//请求拧紧数据
    public static final String PACK_OP4303_RecordData = "PACK.OP430-3.RecordData";//请求拧紧数据
    public static final String PACK_OP4304_RecordData = "PACK.OP430-4.RecordData";//请求拧紧数据

    public static final String PACK_OP4801_RecordData = "PACK.OP480-1.RecordData";//请求拧紧数据
    public static final String PACK_OP4802_RecordData = "PACK.OP480-2.RecordData";//请求拧紧数据
    public static final String PACK_OP4803_RecordData = "PACK.OP480-3.RecordData";//请求拧紧数据



    /**
     * OP260

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -5,6 +5,7 @@
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -50,6 +51,9 @@
    //区分pack型号的工位
    public List<String> packIdList = Arrays.asList("OP280","OP360","OP390","OP470");

    //测试设备手动工位
    public List<String> testList = Arrays.asList("OP430-1","OP430-2","OP430-3","OP430-4","OP480-1","OP480-2","OP480-3","OP440");


    //空的
    public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -91,20 +95,7 @@
                String tab = nodes[2];//标记
                String tabVlaue = value.toString();//地址值

                //请求下发SN号
                if (("RecordSN").equals(tab) && "1".equals(tabVlaue)) {
                    //获取SN号方法
                    String SNCode = getSNCode();

                    //下发SN
                    String SNCodeAddress = thoroughfare + "." + device + ".SNCode";
                    miloService.writeToOpcChar(ReadWriteEntity.builder().identifier(SNCodeAddress).value(SNCode).build());
                    //下发SN完成
                    String recordSNDoneAddress = thoroughfare + "." + device + ".RecordSNDone";
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(recordSNDoneAddress).value(1).build());
                }
                //请求记录数据
                else if (("RecordData").equals(tab)) {
                if (("RecordData").equals(tab)) {
                    String recordDataDoneValue = "";

                    if("1".equals(tabVlaue)){
@@ -117,49 +108,51 @@
                        //自动工位
                        if(automaticList.stream().anyMatch(s -> s.equals(device))){
                            //plc给我们一个模组码，拿模组码校验出型号
                            if(distinguishingModules.stream().anyMatch(s -> s.equals(device))) {
                            if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                //读模组码
//                                String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
//                                String productTye = thoroughfare + "." + device + ".ProductType";
//                                if (null != moduleCode && moduleCode.length() == 24) {
//                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7, 8))).build());
//                                    //进站保存数据
////                              inSaveDate(thoroughfare,device)
//                                    //记录数据完成
                                    String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
//
                                Object moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();

                                if(moduleCode!=null){
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
//
//
//                                    //请求工单
//                                } else {
//                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
//                                }
                                }else {
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                }
                            }else {
                                if(agvId.stream().anyMatch(s -> s.equals(device))){
                                    String agvId = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue().toString();
                                    String PACKCode = thoroughfare + "." + device + ".MPACKCode";
                                    if (null != agvId) {
                                        OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvId));
                                        String packId = one.getProductNum();
                                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
                                    } else {
                                    Object agvIdObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue();
                                    //agvId 小车码是否为空
                                    if(agvIdObject!=null){
                                        String PACKCode = thoroughfare + "." + device + ".MPACKCode";
                                        OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvIdObject.toString()));
                                        //小车码查找工单是否为空
                                        if(one!=null){
                                            String packId = one.getProductNum();
                                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
                                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                        }else {
                                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                        }
                                    }else {
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                    }
                                }
                                //pack 如果区分型号的话就要处理
                                //记录数据完成
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";

                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                }else {
                                    String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                    Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".PACKCode").getValue();
                                    if(packCodeObject!=null){
                                        //pack 如果区分型号的话就要处理
                                        //记录数据完成
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
                                    }else {
                                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
                                    }

                                }
                            }
                        }else {
                            //手动工位处理逻辑
//                            if(automaticList.stream().noneMatch(s -> s.equals(device))){
                                //给前端发工件到位信号
                                WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
//                            }
                            //校验合格不合格如果合格可以进站
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
                            String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";

                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
@@ -181,6 +174,10 @@
                                WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
                            }else {
                                WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                            }
                            if(testList.stream().anyMatch(s -> s.equals(device))){
                                String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
                            }
                        }
                    }else {
@@ -356,12 +353,20 @@
                    ParamCollection.setParamCode(list.get(i).getCollectParameterId());
                    ParamCollection.setLocationCode(device);
                    if(tt.contains("Time")){
                        String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
                        ParamCollection.setParamValue(str);
//                        String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
//                        ParamCollection.setParamValue(str);
                        ParamCollection.setParamValue(TimeUtil.getYyyyDdMm(TimeUtil.stringProcessing(tt)));
                    }else {
                        ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
                    }
                    ParamCollection.setSfcCode(packCode);
                    if(device.contains("OP360")){
                        String node = nodeIdList.get(i);
                        Object value = miloService.readFromOpcUa("PACK.OP360.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
                        if(value!=null){
                            ParamCollection.setModuleCode(value.toString());
                        }
                    }
                    ParamCollection.setParamName(list.get(i).getCollectParameterName());
                    ParamCollection.setParamUpper(list.get(i).getParamUpper());
                    ParamCollection.setParamLower(list.get(i).getParamLower());

 jcdm-main/src/main/java/com/jcdm/main/plcserver/util/TimeUtil.java

@@ -7,6 +7,11 @@
import java.util.TimeZone;

public class TimeUtil {
    public static void main(String[] args) {
        String str = "PACK.OP360.ModuleSNCode1";
        System.out.println(str.charAt(str.length()-1));
    }

    public static String stringProcessing(String dateTimeStr){
        String result = "";
        // 找到 "javaDate=" 的位置
@@ -51,4 +56,27 @@
        }
        return result;
    }

    public static String getYyyyDdMm(String inputDate){
        String outputPattern = "yyyy-MM-dd HH:mm:ss";

        // 定义一个解析器，用于忽略时区（仅作为示例，可能需要调整以处理不同的输入）
        SimpleDateFormat parser = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
        parser.setLenient(false); // 设置不宽松，以严格匹配格式

        // 解析日期字符串
        Date date = null;
        try {
            date = parser.parse(inputDate);
        } catch (ParseException e) {
            e.printStackTrace();
        }

        // 定义一个格式化器，用于输出所需的格式
        SimpleDateFormat formatter = new SimpleDateFormat(outputPattern);

        // 格式化日期
        String outputDate = formatter.format(date);
        return outputDate;
    }
}

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

@@ -526,6 +526,8 @@
      this.workpieceInformation.productModel = null;
      this.workpieceInformation.productName = null;
      this.headContent.sfcCode = '';
      this.headContent.yzSfcCode = '';
      this.headContent.cardCode = '';
    },
    changeMenu(tab, event) {
      console.log(tab, event);

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

@@ -28,6 +28,14 @@
          />
        </el-select>
      </el-form-item>
      <div style="display: none">
        <div id="printMe" style="width: 500px;">
          <div ref="canvasWrapper" id="canvasWrapper" style="display: flex;justify-content: center;"></div>
          <p style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;">{{packCode}}</p>
        </div>
        <el-button @click="print">打印</el-button>
        <el-button @click="test1">生成二维码</el-button>
      </div>
      <el-form-item style="float: right">
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>
@@ -283,6 +291,7 @@
  updateProductionOrde,
  receivingWorkOrders
} from "@/api/main/om/productionOrde/productionOrde";
import QRCode from "qrcodejs2";

export default {
  name: "ProductionOrde",
@@ -292,6 +301,8 @@
  },
  data() {
    return {
      // packCode: '0RSPB001139E3AE4X0000011',
      packCode: 'test111',
      titleName: '',
      options: [],
      lineOptions: [],
@@ -383,12 +394,52 @@
    this.getList();
    this.initWorkshop();
  },
  mounted() {
    this.test1()
  },
  methods: {
    getWorkOrders(){
      receivingWorkOrders().then(response => {
        this.$modal.msgSuccess(response.msg);
     async getWorkOrders(){
      await receivingWorkOrders().then(response => {
        this.getList()
        this.packCode = response.msg;
        this.test1()
      });
      setTimeout(() => {
        this.print()
      },50)
    },
     print() {
      // 本页面直接打印（有bug单岁先不要删）
      // let oldStr = window.document.body.innerHTML;
      // let newStr = document.getElementById('printMe').innerHTML;
      // document.body.innerHTML = newStr;
      // window.print();
      // document.body.innerHTML = oldStr;
      // return false;

      // 新开页面打印
      //  document.getElementById('canvasWrapper').innerHTML = '';
      let newStr = document.getElementById('printMe').innerHTML;
      let newWin = window.open('', '_blank');
      newWin.document.body.innerHTML = newStr;
      newWin.print();
      return false;
    },
    test1(){
      document.getElementById('canvasWrapper').innerHTML = ''
      this.$nextTick(() => {
        let qrCode = new QRCode('canvasWrapper',{
          width: 80,
          height: 80,
          padding: 0,
          margin: 0,
          text: this.packCode,
          colorDark: '#000',
          colorLight: '#fff'
        })
      })
      // console.log(this.packCode)
      // this.print()
    },
    /** 导入按钮操作 */
    handleImport() {