生产1P1S码

cl

2 天以前 7402d66b621b9b76c9932590b5c47d330486cf04

生产1P1S码

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

@@ -1134,6 +1134,8 @@
                code = StringUtils.leftPad(String.valueOf(Integer.valueOf(code)+1),7, "0");;//序列号
                result = mfCode+proTypeCode+batteryTypeCode+specificationsCode+traceInfoCode+proDateCode+code;

                log.info("读取到电芯码为：{},1P1S码为：{}",sfcCode,result);

                //更新日期和序列号
                LambdaUpdateWrapper<DaPsConf> lambdaUpdateWrapper = new LambdaUpdateWrapper<DaPsConf>();
                lambdaUpdateWrapper.set(DaPsConf::getProDateCode,proDateCode);//生产日期
@@ -1149,9 +1151,6 @@
        }catch (Exception e) {
            throw new RuntimeException(e);
        }
    }
    public static void main(String[] args) throws Exception {
        get1P1S("");
    }

}

 jcdm-ui/src/views/main/da/psConf/index.vue

@@ -74,6 +74,10 @@

        <el-table border v-loading="loading" :data="psConfList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="供应商识别码" align="center" prop="spareField1">
          </el-table-column>
          <el-table-column label="供应商名称" align="center" prop="remarks">
          </el-table-column>
          <el-table-column label="厂商代码" align="center" prop="mfCode">
          </el-table-column>
          <el-table-column label="产品类型代码" align="center" prop="proTypeCode">
@@ -88,18 +92,15 @@
          </el-table-column>
          <el-table-column label="序列号" align="center" prop="sfcCode">
          </el-table-column>
          <el-table-column label="状态 (启用enable，禁用disable）" align="center" prop="state">
          <el-table-column label="状态 (启用1，禁用0）" align="center" prop="state">
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remarks">
          </el-table-column>
          <el-table-column label="预留字段1" align="center" prop="spareField1">
          </el-table-column>
          <el-table-column label="预留字段2" align="center" prop="spareField2">

<!--          <el-table-column label="预留字段2" align="center" prop="spareField2">
          </el-table-column>
          <el-table-column label="创建用户" align="center" prop="createUser">
          </el-table-column>
          <el-table-column label="更改用户" align="center" prop="updateUser">
          </el-table-column>
          </el-table-column>-->
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
@@ -134,12 +135,18 @@
    />

    <!-- 添加或修改1P1S配置对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="600px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="供应商识别码" prop="spareField1">
          <el-input v-model="form.spareField1" placeholder="请输入供应商识别码" />
        </el-form-item>
        <el-form-item label="供应商名称" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入供应商名称" />
        </el-form-item>
        <el-form-item label="厂商代码" prop="mfCode">
          <el-input v-model="form.mfCode" placeholder="请输入厂商代码" />
        </el-form-item>
@@ -155,22 +162,17 @@
        <el-form-item label="追溯信息代码" prop="traceInfoCode">
          <el-input v-model="form.traceInfoCode" placeholder="请输入追溯信息代码" />
        </el-form-item>
        <el-form-item label="生产日期代码" prop="proDateCode">
          <el-input v-model="form.proDateCode" placeholder="请输入生产日期代码" />
        </el-form-item>
<!--        <el-form-item label="生产日期代码" prop="proDateCode">
          <el-input v-model="form.proDateCode" placeholder="请输入生产日期代码（不填）" />
        </el-form-item>-->
        <el-form-item label="序列号" prop="sfcCode">
          <el-input v-model="form.sfcCode" placeholder="请输入序列号" />
          <el-input v-model="form.sfcCode" placeholder="请输入序列号"/>
        </el-form-item>
        <el-form-item label="状态 (启用enable，禁用disable）" prop="state">
          <el-input v-model="form.state" placeholder="请输入状态 (启用enable，禁用disable）" />
        <el-form-item label="状态" prop="state">
          <el-input v-model="form.state" placeholder="请输入状态 (启用1，禁用0）" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
        <el-form-item label="预留字段1" prop="spareField1">
          <el-input v-model="form.spareField1" placeholder="请输入预留字段1" />
        </el-form-item>
        <el-form-item label="预留字段2" prop="spareField2">

<!--        <el-form-item label="预留字段2" prop="spareField2">
          <el-input v-model="form.spareField2" placeholder="请输入预留字段2" />
        </el-form-item>
        <el-form-item label="创建用户" prop="createUser">
@@ -178,7 +180,7 @@
        </el-form-item>
        <el-form-item label="更改用户" prop="updateUser">
          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />
        </el-form-item>
        </el-form-item>-->
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>