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

opt: 库区,仓库,仓位管理功能WQL修改成mybatis-plus

Browse Source
This commit is contained in:
yanps
2024-10-17 08:48:03 +08:00
parent 6d691722ef
commit 84820cbfb5
41 changed files with 3558 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs2/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
View File

@@ -1,3 +1,4 @@
/*
package org.nl;
import org.junit.jupiter.api.Test;
@@ -11,11 +12,13 @@ import org.springframework.scheduling.annotation.Scheduled;
import java.util.Scanner;
import java.util.concurrent.*;
*/
/**
* @Author: lyd
* @Description: 单元测试
* @Date: 2023/5/15
*/
*//*
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class ApplicationTest {
@Autowired
@@ -80,3 +83,4 @@ public class ApplicationTest {
}
*/

2
acs2/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -165,7 +165,7 @@
<span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
</template>
</el-table-column>
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<!-- <el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" /> -->
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" />