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;
/**
* 源单类型
*/