-

admin

2024-05-18 a52d0875e95d60d228367f24fc937274df0b4244

-

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

@@ -95,6 +95,7 @@
            omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
            omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
            omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
            omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
            omProductionOrdeInfo.setCreateTime(new Date());
            omProductionOrdeInfo.setCreateUser("宸ュ巶MES");


 jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/ProductionOrderComponentRequest.java

对比新文件
@@ -0,0 +1,9 @@
package com.jcdm.main.restful.qingYan.doman;

import lombok.Data;

@Data
public class ProductionOrderComponentRequest {
    private String materialCode;
    private String operationSteps;
}

 jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/doman/RestFulOrder.java

对比新文件
@@ -0,0 +1,12 @@
package com.jcdm.main.restful.qingYan.doman;

import lombok.Data;

@Data
public class RestFulOrder {
    private String productNum;
    private String stationCode;
    private String materialCode;
    private String productionOrderNum;
//    private Long planQty;
}

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

@@ -561,7 +561,7 @@
        console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)

        if(this.headContent.sfcCode !== ''){
          this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
          this.$message('棰勮宸ヤ綅鎵弿鐗╂枡缂栫爜'+scanValue);
          console.log(scanValue)
          this.serialPortMethod(scanValue)
        } else {

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

@@ -714,7 +714,7 @@
            this.headContent.cardCode = scanValue
            this.bindcardCode();
          }else {
            this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
            this.$message('宸ヤ綅缁堢鎵弿鐗╂枡缂栫爜'+scanValue);
            console.log(scanValue)
            this.serialPortMethod(scanValue)
          }