Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-17 ce608d43dea0a772a8204d552274731d9107b607

Merge remote-tracking branch 'origin/master'

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

@@ -128,6 +128,7 @@
                bsOrderScheduling.setProductionStatus("1");
                bsOrderScheduling.setOperator(getUserName());
                bsOrderScheduling.setOperateTime(fomateDate);
                bsOrderScheduling.setProductType(omProductionOrdeInfo.getTypeL());//产品类型
                bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
                startCode++;
            }
@@ -138,6 +139,7 @@
            bsModelNumber.setModelDate(dateTimeRule);
            bsModelNumber.setMaxnumValue((startCode - 1) + "");
            bsModelNumber.setSaveTime(fomateDate);
            bsModelNumber.setLastNumber((startCode - 1) + "");
            bsModelNumberService.insertBsModelNumber(bsModelNumber);
        }
        //更新工单状态

 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java

@@ -148,6 +148,8 @@
    @Excel(name = "种类")
    private String typeZ;

    private String typeL;

    /** 预留字段1 */
    private String spareField1;

@@ -556,7 +558,13 @@
        return typeZ;
    }

    public String getTypeL() {
        return typeL;
    }

    public void setTypeL(String typeL) {
        this.typeL = typeL;
    }


    @Override

 jcdm-ui/src/views/main/bs/material/index.vue

@@ -98,7 +98,7 @@
        </template>
      </el-table-column>

      <el-table-column label="产品型号" align="center" prop="typeZ" width="150">
      <el-table-column label="机型" align="center" prop="typeZ" width="150">
      </el-table-column>
      <el-table-column label="特殊代码" align="center" prop="mark" width="120">
      </el-table-column>

 jcdm-ui/src/views/main/bs/modelNumber/index.vue

@@ -26,14 +26,14 @@
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
          <el-form-item label-width="100" label="上次的编号" prop="lastNumber">
<!--          <el-form-item label-width="100" label="上次的编号" prop="lastNumber">
            <el-input
              v-model="queryParams.lastNumber"
              placeholder="请输入上次的编号"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          </el-form-item>-->
<!--          <el-form-item label="状态" prop="status">-->
<!--            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>-->

@@ -97,7 +97,7 @@
<!--          </el-form-item>-->
          <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>
<!--            <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>-->
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>

 jcdm-ui/src/views/main/bs/orderScheduling/index.vue

@@ -155,7 +155,9 @@

          </el-table-column>
          <el-table-column label="产品类型" align="center" prop="productType">

            <template slot-scope="scope">
              <dict-tag :options="dict.type.material_type" :value="scope.row.productType"/>
            </template>
          </el-table-column>
          <el-table-column label="机型" align="center" prop="model">

@@ -368,7 +370,7 @@

export default {
  name: "OrderScheduling",
  dicts: ['order_scheduling_produce_status','quality_status','print_status'],
  dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'],
  data() {
    return {
      // 遮罩层

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

@@ -733,6 +733,7 @@
        this.materialQueryParams.materialCode = response.data.productCode;
        listMaterial(this.materialQueryParams).then(response => {
          this.markNo = response.rows[0].mark
          this.form.typeL = response.rows[0].typeL;
        });
        this.form = response.data;
        this.Createopen = true;
@@ -780,14 +781,20 @@
        model: this.form.typeZ,
        modelDate: this.form.dateTimeRule,
      }
      if(startCode>999){
        this.$message.error('起始编号超出最大范围，请输入1-999的数字！');
        return;
      }else if(startCode<1){
        this.$message.error('起始编号超出最小范围，请输入1-999的数字！');
        return;
      }
      listModelNumber(queryParams).then(response => {
        if(response.rows.length === 0){
          this.saveBoxCode()
        }else {
          let maxNumValue = response.rows[0].maxnumValue;
          if(startCode<maxNumValue){
            this.$message.error('新建的不能比查询出的小');
            return;
            this.$message.error('箱体条码重复，请重新输入起始编号！');
          }else {
            this.saveBoxCode()
          }