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

fix : 测试流程

Browse Source
This commit is contained in:
lishuai
2024-01-31 08:56:34 +08:00
parent 6da99e2db8
commit 10c25d60a6
4 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java
View File

@@ -132,10 +132,9 @@ public class AddressServiceImpl extends CommonServiceImpl<AddressMapper, Address
@Override
public void create(AddressDto dto) {
CommonFinalParam commonFinalParam = new CommonFinalParam();
String Methods_code = dto.getMethods_code();
AddressDto methodsDto = this.findByCode(Methods_code);
if (methodsDto != null && commonFinalParam.getDELETE().equals(methodsDto.getIs_delete()) && dto.getMethods_code().equals(methodsDto.getMethods_code())) {
if (methodsDto != null && CommonFinalParam.DELETE.equals(methodsDto.getIs_delete()) && dto.getMethods_code().equals(methodsDto.getMethods_code())) {
throw new BadRequestException(LangProcess.msg("error_checkExist", methodsDto.getMethods_code()));
}
Long userId = Long.valueOf(SecurityUtils.getCurrentUserId());

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
View File

@@ -190,7 +190,7 @@ public interface OpcDeviceDriver extends DeviceDriver {
* @return
*/
default String getStringValue(String protocol) {
return (String) this.getOpcValueAccessor().getValue(this.getItem(protocol));
return String.valueOf(this.getOpcValueAccessor().getValue(this.getItem(protocol)));
}
/**

38
acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue
View File

@@ -41,7 +41,43 @@
</el-select>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="取货点" prop="device_code">
<el-select
v-model="form.get_device_code"
multiple
filterable
reserve-keyword
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货点" prop="device_code" label-width="100px">
<el-select
v-model="form.put_device_code"
filterable
reserve-keyword
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card class="box-card" shadow="never">

38
acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue
View File

@@ -41,7 +41,43 @@
</el-select>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="取货点" prop="device_code">
<el-select
v-model="form.get_device_code"
multiple
filterable
reserve-keyword
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货点" prop="device_code" label-width="100px">
<el-select
v-model="form.put_device_code"
filterable
reserve-keyword
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card class="box-card" shadow="never">