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

add:外协发货详情添加物料参数

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-06 17:43:24 +08:00
parent 077393cd37
commit 37ccceed6b
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/StatisticalReportServiceImpl.java
View File

@@ -655,8 +655,18 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
public Map<String, Object> bucketQuery(Map whereJson, Pageable page) {
// 仓位属性表【ST_IVT_StructAttr】
Object storagevehicleCode = whereJson.get("storagevehicle_code");
Object materialCode = whereJson.get("material_code");
//转id
if (materialCode == null || storagevehicleCode==null){
return null;
}
JSONObject meMaterialbase = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + materialCode + "'").uniqueResult(0);
if (meMaterialbase == null){
throw new BadRequestException("物料编号："+materialCode+" 查询不到对应物料信息");
}
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("storagevehicle_code",storagevehicleCode);
paramMap.put("material_id",meMaterialbase.getString("material_id"));
paramMap.put("flag","6");
JSONObject jsonObject = WQL.getWO("statistical_report_query_02").addParamMap(paramMap).pageQuery(WqlUtil.getHttpContext(page), "bucketunique");
return jsonObject;

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql
View File

@@ -289,6 +289,9 @@
OPTION 输入.storagevehicle_code <> ""
procedureoffline.storagevehicle_code = 输入.storagevehicle_code
ENDOPTION
OPTION 输入.material_id <> ""
procedureoffline.material_id = 输入.material_id
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF