Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes

wujian

2024-01-18 b395c6c17048f4862dd07e54fdb2122905402794

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

@@ -117,9 +117,9 @@
<!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="warning"
          type="success"
          plain
          icon="el-icon-download"
          icon="el-icon-wind-power"
          size="mini"
          @click="getProductionNotice"
          v-hasPermi="['om:productionOrde:receive']"
@@ -793,7 +793,7 @@
          this.saveBoxCode()
        }else {
          let maxNumValue = response.rows[0].maxnumValue;
          if(startCode<maxNumValue){
          if(startCode<=maxNumValue){
            this.$message.error('箱体条码重复，请重新输入起始编号！');
          }else {
            this.saveBoxCode()