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

add:添加出库单主表源单编码

Browse Source
This commit is contained in:
zhangzq
2024-12-11 23:15:16 +08:00
parent c4426b1fbb
commit 2272511278
10 changed files with 64 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java
View File

@@ -58,9 +58,9 @@ public class BaseQuery<T> {
* 通过buid构建
*/
public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()
,"start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LT).build()
,"start_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.GE).build()
,"end_time", QParam.builder().k(new String[]{"create_time"}).type(QueryTEnum.LE).build()
,"plan_start_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.LE).build()
,"plan_start_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.GE).build()
,"plan_end_time", QParam.builder().k(new String[]{"plandeliver_date"}).type(QueryTEnum.LE).build()
,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
);

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/sevice/PdaIOService.java
View File

@@ -110,6 +110,7 @@ public class PdaIOService {
mst.setCode(CodeUtil.getNewCode("IO_CODE"));
mst.setStatus(StatusEnum.FORM_STATUS.code("已分配"));
mst.setSource_form_id(pdaFormOutMst.getId());
mst.setSource_form_code(pdaFormOutMst.getCode());
mst.setSource_form_type(pdaFormOutMst.getForm_type());
mst.setProduct_area(mst.getForm_data().getString("product_area"));
mst.setBill_type(billType);

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -120,6 +120,9 @@
<if test="query.code != null and query.code != ''">
and code = #{query.code}
</if>
<if test="query.search != null and query.search != ''">
and code = #{query.search}
</if>
<if test="query.status != null and query.status != ''">
and pm_form_data.status IN
<foreach collection="query.status" item="status" separator="," open="(" close=")">

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
View File

@@ -2,6 +2,8 @@ package org.nl.wms.pm_manage.form_data.service.dto;
import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.common.domain.entity.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import java.util.Map;
@@ -15,7 +17,13 @@ public class FormDataQuery extends BaseQuery<PmFormData> {
private String form_type;
private String code;
private String search;
private String parent_id;
private String[] status;
private Map<String,String> form_query;
@Override
public void paramMapping() {
super.doP.put("search", QParam.builder().k(new String[]{"code"}).type(QueryTEnum.EQ).build());
}
}

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java
View File

@@ -16,5 +16,6 @@ public class StorInvQuery extends BaseQuery<StIvtIostorinv>{
private String bill_type;
private Boolean in_storage;
private String product_code;
private String source_form_code;
}

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java
View File

@@ -61,6 +61,11 @@ public class StIvtIostorinv implements Serializable {
*/
private String source_form_id;
/**
* 源单编码
*/
private String source_form_code;
/**
* 源单类型
*/

12
wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
View File

@@ -48,6 +48,9 @@
<el-form-item label="源单类型" prop="source_form_type">
<el-input v-model="form.source_form_type" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="源单编码" prop="source_form_code">
<el-input v-model="form.source_form_code" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="源单id" prop="source_form_id">
<el-input v-model="form.source_form_id" clearable style="width: 150px"/>
</el-form-item>
@@ -152,6 +155,11 @@
<el-input v-model="tableData[scope.$index].source_form_type" class="input-with-select"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_code" label="源单编码" width="190" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].source_form_code" class="input-with-select"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" width="190" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].source_form_id" class="input-with-select"/>
@@ -213,6 +221,7 @@ const defaultForm = {
product_area: '',
source_form_type: '',
source_form_id: '',
source_form_code: '',
source_form_date: '',
create_name: '',
create_time: '',
@@ -353,6 +362,7 @@ export default {
data.single_weight = row.single_weight
data.source_form_type = ''
data.source_form_id = ''
data.source_form_code = ''
data.unit_id = row.unit_id
data.form_data = {}
this.dtlCols.forEach(a => {
@@ -370,6 +380,7 @@ export default {
let rows = [];
this.form.source_form_type = mst.form_type
this.form.source_form_id = mst.id
this.form.source_form_code = mst.code
let mst_form_data = mst.form_data;
if (data['item'] == null || data['item'].length == 0) {
rows.push(mst)
@@ -392,6 +403,7 @@ export default {
data.source_form_type = row.form_type
data.single_weight = row.single_weight
data.source_form_id = row.id
data.source_form_code = row.code
data.unit_id = row.unit_id
data.form_data = {}
let fowFormData = row.form_data;

12
wms_pro/qd/src/views/wms/stor_manage/in/index.vue
View File

@@ -20,6 +20,14 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="源单号">
<el-input
v-model="query.source_form_code"
size="mini"
clearable
placeholder="源单号"
/>
</el-form-item>
<el-form-item label="单据类型">
<el-select
v-model="query.bill_type"
@@ -141,7 +149,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_type" min-width="120" label="源单类型"/>
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单编码" min-width="155"/>
<el-table-column show-overflow-tooltip prop="source_form_code" label="源单编码" min-width="155"/>
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" min-width="155"/>
<el-table-column show-overflow-tooltip prop="source_form_date" label="源单时间" min-width="140"/>
<el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable">
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
@@ -189,6 +198,7 @@ const defaultForm = {
product_area: '',
source_form_type: '',
source_form_id: '',
source_form_code: '',
source_form_date: '',
create_name: '',
create_time: '',

15
wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue
View File

@@ -46,6 +46,9 @@
<el-form-item label="源单类型" prop="source_form_type">
<el-input v-model="form.source_form_type" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="源单编码" prop="source_form_id">
<el-input v-model="form.source_form_code" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="源单id" prop="source_form_id">
<el-input v-model="form.source_form_id" clearable style="width: 150px" />
</el-form-item>
@@ -184,6 +187,11 @@
<el-input v-model="tableData[scope.$index].source_form_type" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_code" label="源单编码" width="190" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].source_form_code" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" width="190" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].source_form_id" class="input-with-select" />
@@ -393,10 +401,6 @@ export default {
this.crud.notify('仓库不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!itemDtl.pcsn) {
this.crud.notify('物料批次不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!itemDtl.qty) {
this.crud.notify('物料出库数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
@@ -420,6 +424,8 @@ export default {
data.source_form_type = ''
data.source_form_id = ''
data.source_form_code = ''
data.product_area = this.form.product_area
data.stor_code = this.form.stor_code
data.unit_id = row.unit_id
data.form_data = {}
this.dtlCols.forEach(a => {
@@ -462,6 +468,7 @@ export default {
data.material_spec = row.material_spec
data.single_weight = row.single_weight
data.product_area = this.form.product_area
data.stor_code = this.form.stor_code
data.source_form_type = row.form_type
data.source_form_id = row.id
data.source_form_code = row.code

11
wms_pro/qd/src/views/wms/stor_manage/out/index.vue
View File

@@ -20,6 +20,14 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="源单号">
<el-input
v-model="query.source_form_code"
size="mini"
clearable
placeholder="单据号"
/>
</el-form-item>
<el-form-item label="单据类型">
<el-select
v-model="query.bill_type"
@@ -141,7 +149,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_form_type" min-width="120" label="源单类型" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单编码" min-width="155" />
<el-table-column show-overflow-tooltip prop="source_form_code" label="源单编码" min-width="155" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" min-width="155" />
<el-table-column show-overflow-tooltip prop="source_form_date" label="源单时间" min-width="140" />
<el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>