Merge remote-tracking branch 'origin/shzhjxydwcs_cs20251105' into shzhjxydw...

lsh

4 天以前 ea12b685190254228d88a0de261b1e399fcbf15b

 src/main/webapp/views/deviceOperate/crnOperate.html

@@ -75,18 +75,21 @@
                     </el-form-item>
                  </el-form>
                  <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
                     <el-form-item label="测试库位数量">
                        <el-input v-model="formParam.locMastDemoCount" placeholder="测试库位数量"></el-input>
                     </el-form-item>
                     <el-form-item label="测试库位">
                        <el-input v-model="formParam.locMastDemo" placeholder="测试库位 分隔符;"></el-input>
                     </el-form-item>
                     <el-form-item label="堆垛机放货站点">
                        <el-input v-model="formParam.staOutDemo" placeholder="堆垛机放货站点"></el-input>
                     </el-form-item>
                     <el-form-item label="堆垛机取货站点">
                        <el-input v-model="formParam.staIntDemo" placeholder="堆垛机取货站点"></el-input>
                     </el-form-item>
<!--                     <el-form-item label="测试库位数量">-->
<!--                        <el-input v-model="formParam.locMastDemoCount" placeholder="测试库位数量"></el-input>-->
<!--                     </el-form-item>-->
<!--                     <el-form-item label="原始出库库位">-->
<!--                        <el-input v-model="formParam.locMastDemoF" placeholder="原始有物库位"></el-input>-->
<!--                     </el-form-item>-->
<!--                     <el-form-item label="原始空库位">-->
<!--                        <el-input v-model="formParam.locMastDemoE" placeholder="原始无物库位"></el-input>-->
<!--                     </el-form-item>-->
<!--                     <el-form-item label="堆垛机放货站点">-->
<!--                        <el-input v-model="formParam.staOutDemo" placeholder="堆垛机放货站点"></el-input>-->
<!--                     </el-form-item>-->
<!--                     <el-form-item label="堆垛机取货站点">-->
<!--                        <el-input v-model="formParam.staIntDemo" placeholder="堆垛机取货站点"></el-input>-->
<!--                     </el-form-item>-->
                  </el-form>
                  <el-form label-position="top" :inline="true" class="demo-form-inline">
                     <el-form-item label="">
@@ -95,9 +98,9 @@
                     <el-form-item label="">
                        <el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">可出</el-checkbox>
                     </el-form-item>
                     <el-form-item label="">
                        <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">演示</el-checkbox>
                     </el-form-item>
<!--                     <el-form-item label="">-->
<!--                        <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">演示</el-checkbox>-->
<!--                     </el-form-item>-->
                  </el-form>
                  <div>
<!--                     <el-button @click="requestOperate('put')" type="primary">入库</el-button>-->
@@ -220,7 +223,8 @@
               sourceLev: 1,
               staNo: null,
               locMastDemoCount: 3,
               locMastDemo: null,
               locMastDemoF: null,
               locMastDemoE: null,
               staOutDemo: null,
               staIntDemo: null,
               row: 1,
@@ -352,7 +356,8 @@
                        hpMk: this.hpMkDemo ? "Y" : "N",
                        staOutDemo: this.formParam.staOutDemo,
                        staIntDemo: this.formParam.staIntDemo,
                        locMastDemo: this.formParam.locMastDemo,
                        locMastDemoF: this.formParam.locMastDemoF,
                        locMastDemoE: this.formParam.locMastDemoE,
                        locMastDemoCount: this.formParam.locMastDemoCount,
                        crnNo: this.formParam.crnNo
                     }