root/project_promession
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
psh
2023-12-26 16:33:44 +08:00
parent abcc8264ef
commit ed8d295c1a
4 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java
View File

@@ -158,6 +158,11 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
param.put("device_code", this.device_code); param.put("device_code", this.device_code);
param.put("is_have", this.number == 0 ? 0 : 1); param.put("is_have", this.number == 0 ? 0 : 1);
this.shipDeviceUpdate(param); this.shipDeviceUpdate(param);
} else if (move==1) {
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
param.put("is_have",move);
this.shipDeviceUpdate(param);
} else { } else {
this.requireSucess = true; this.requireSucess = true;
} }

5
acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
View File

@@ -100,6 +100,11 @@
<el-switch v-model="form.manual_create_task" /> <el-switch v-model="form.manual_create_task" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="是否开启等待" label-width="150px">
<el-switch v-model="form.wait" />
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否请求wms" label-width="150px"> <el-form-item label="是否请求wms" label-width="150px">
<el-switch v-model="form.reqWms" /> <el-switch v-model="form.reqWms" />

5
acs/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
View File

@@ -93,6 +93,11 @@
<el-switch v-model="form.manual_create_task" /> <el-switch v-model="form.manual_create_task" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="是否开启等待" label-width="150px">
<el-switch v-model="form.wait" />
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否请求wms" label-width="150px"> <el-form-item label="是否请求wms" label-width="150px">
<el-switch v-model="form.reqWms" /> <el-switch v-model="form.reqWms" />

5
acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue
View File

@@ -7,6 +7,11 @@
</div> </div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px"> <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row> <el-row>
<el-col :span="8">
<el-form-item label="是否开启等待" label-width="150px">
<el-switch v-model="form.wait" />
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否请求wms" label-width="150px"> <el-form-item label="是否请求wms" label-width="150px">
<el-switch v-model="form.reqWms" /> <el-switch v-model="form.reqWms" />