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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzq
2024-05-14 10:39:21 +08:00
parent c81d454a4f 3488d4b843
commit b713e082f5
5 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wms_pro/hd/.idea/sonarlint/issuestore/index.pb generated
View File

@@ -99,8 +99,6 @@ cnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/BmClassStandardTree.java,a/e/ae5dc050d1cb8e346c5d74dfdfbe81380844f770
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/IBmClassStandardService.java,c/5/c5993a1d750d7041a840a41a573358502883c091
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3
x
Hnladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java,9/e/9ebc8f924932814262c2d3968e862babba46e751
<EFBFBD>
@@ -137,12 +135,6 @@ m
cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java,a/4/a44b52a4bc649baab711c5bd57004aa22cc2206b
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6
<EFBFBD>
nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09
w
Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690
p
@@ -153,5 +145,25 @@ Dnladmin-system/src/main/java/org/nl/common/domain/entity/QParam.java,c/8/c81fd
`nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java,2/8/28bd56139ae8c49fb8b946a5db641cec587fe696
w
Gnladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java,f/0/f062b578de11e2952654784226f11bae7019cd76
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java,1/7/1734a0b319cf43162c6b2ef4cf7dc9cd2e838740
<EFBFBD>
jnladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java,1/7/17ecbef3e2c19e65dfe2e8c69c7b2fba4fcda5eb
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/ISyncFormMappingService.java,2/0/20de6d2c7b011146c7b4125faa76cbb7e8a530d1
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/dao/SyncFormMapping.java,1/1/111d63443dee5cc4cd3f439604732348c245895d
<EFBFBD>
mnladmin-system/src/main/java/org/nl/wms/sync_manage/service/form_mapping/impl/SyncFormMappingServiceImpl.java,f/d/fd8b72fa44840c56a25536d5ae8b06b3a561a0c8
<EFBFBD>
unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/SourceDataTypeHandler.java,0/7/073b8a027d5098b0e28da8f7a8076966a638cb0e
<EFBFBD>
<EFBFBD>nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/nodeType/source/impl/MappingSourceDataTypeHandler.java,a/3/a3a5a2860090b68804b8fad26d512236f3eae5b4
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java,2/0/20d3f5ca66f748f0a2bada36023b0308d4d552c0
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java,9/0/90cde14dd61225ba9c416f9d10269bab669cd1ad
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6
<EFBFBD>
nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java
View File

@@ -42,25 +42,6 @@ public class ActRuExecutionServiceImpl extends ServiceImpl<ActRuExecutionMapper,
Page<ActRuExecution> executionPage = this.page(page.build(), lqw);
List<ActRuExecution> records = executionPage.getRecords();
this.findChildren(records);
// for (ActRuExecution record : records) {
// LambdaQueryWrapper<ActRuExecution> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// lambdaQueryWrapper.eq(ActRuExecution::getParent_id, record.getProc_inst_id());
// List<ActRuExecution> list = this.list(lambdaQueryWrapper);
// ActReProcdef procdef = procdefService.getById(record.getDeployment_id());
// if (ObjectUtil.isNotEmpty(procdef)) {
// record.setDeployment_name(procdef.getName());
// }
// if (CollectionUtil.isNotEmpty(list)) {
// for (ActRuExecution execution : list) {
// ActReProcdef procdefChildren = procdefService.getById(execution.getDeployment_id());
// if (ObjectUtil.isNotEmpty(procdefChildren)) {
// execution.setDeployment_name(procdefChildren.getName());
// }
// }
// record.setHasChildren(true);
// record.setChildren(list);
// }
// }
return TableDataInfo.build(executionPage);
}

34
wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
View File

@@ -81,23 +81,28 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="code" label="单据编码"/>
<el-table-column prop="form_type" label="单据类型"/>
<el-table-column prop="biz_code" label="业务单据编码"/>
<el-table-column prop="biz_date" label="业务单据时间"/>
<el-table-column prop="material_id" label="物料id"/>
<el-table-column prop="pcsn" label="批次"/>
<el-table-column prop="qty" label="物料数量"/>
<el-table-column prop="vehicle_code" label="载具编号"/>
<el-table-column prop="status" label="单据状态"/>
<el-table-column prop="proc_inst_id" label="对应流程实例id"/>
<el-table-column prop="parent_id" label="父单据数据id"/>
<el-table-column type="selection" width="55"/>
<el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120"/>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120"/>
<el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130"/>
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120"/>
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
</el-table-column>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column
v-permission="['admin','Classstandard:edit','Classstandard:del']"
label="操作"
width="250px"
width="120px"
align="center"
fixed="right"
>
<template slot-scope="scope">
<udOperation
@@ -127,6 +132,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
// import UploadDialog from './UploadDialog'
let defaultForm = {
@@ -167,6 +173,7 @@ export default {
},
data() {
return {
cols:[],
classes: [],
uploadShow: false,
fromTypes: [],
@@ -185,6 +192,9 @@ export default {
methods: {
[CRUD.HOOK.beforeRefresh]() {
if (this.fromTypes.length > 0){
formstruc.getHeader(this.query.form_type).then(res => {
this.cols = res
})
return true
}
return false

5
wms_pro/qd/src/views/wms/sync_manage/field_mapping/AddDialog.vue
View File

@@ -103,6 +103,11 @@
<el-input v-model="scope.row.external_field_name" size="mini" />
</template>
</el-table-column>
<el-table-column align="center" label="映射表达式" prop="skipExpression">
<template scope="scope">
<el-input v-model="scope.row.skipExpression" size="mini" />
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancle">取消</el-button>

5
wms_pro/qd/src/views/wms/sync_manage/field_mapping/EditDialog.vue
View File

@@ -103,6 +103,11 @@
<el-input v-model="scope.row.external_field_name" size="mini" />
</template>
</el-table-column>
<el-table-column align="center" label="映射表达式" prop="skipExpression">
<template scope="scope">
<el-input v-model="scope.row.skipExpression" size="mini" />
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancle">取消</el-button>