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

mdf:外协桶表查询修改

Browse Source
This commit is contained in:
zhangzhiqiang
2023-01-16 10:20:13 +08:00
parent 80bf2c14e7
commit 5ff994bf00
5 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/rest/StatisticalReportController.java
View File

@@ -123,4 +123,11 @@ public class StatisticalReportController {
statisticalReportService.download(response, whereJson);
}
@GetMapping("/bucketQuery")
@Log("线下桶记录查询")
@ApiOperation("线下桶记录查询")
public ResponseEntity<Object> bucketQuery(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(statisticalReportService.bucketQuery(whereJson, page), HttpStatus.OK);
}
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/StatisticalReportService.java
View File

@@ -65,4 +65,12 @@ public interface StatisticalReportService {
* @param whereJson
*/
void download(HttpServletResponse response,Map whereJson);
/**
*
* @param whereJson
* @param page
* @return
*/
Map<String, Object> bucketQuery(Map whereJson, Pageable page);
}

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

@@ -649,4 +649,15 @@ public class StatisticalReportServiceImpl implements StatisticalReportService {
FileUtil.downloadExcel(excelData, response);
}
}
@Override
public Map<String, Object> bucketQuery(Map whereJson, Pageable page) {
// 仓位属性表【ST_IVT_StructAttr】
Object storagevehicleCode = whereJson.get("storagevehicle_code");
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("storagevehicle_code",storagevehicleCode);
paramMap.put("flag","6");
JSONObject jsonObject = WQL.getWO("statistical_report_query_02").addParamMap(paramMap).pageQuery(WqlUtil.getHttpContext(page), "bucketunique");
return jsonObject;
}
}

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

@@ -20,6 +20,7 @@
输入.end_date TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.material_code TYPEAS s_string
输入.storagevehicle_code TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.io_type TYPEAS s_string
输入.buss_type TYPEAS s_string
@@ -262,4 +263,29 @@
ENDPAGEQUERY
ENDIF
IF 输入.flag = "6"
PAGEQUERY
SELECT
procedureoffline.storagevehicle_code,
procedureoffline.bucketunique,
mb.material_code,
mb.material_id,
mb.material_name,
mb.material_model,
mb.material_spec,
procedureoffline.pcsn,
procedureoffline.qty,
procedureoffline.qty_unit_name
FROM
pdm_bi_procedureoffline procedureoffline
LEFT JOIN md_me_materialbase mb ON mb.material_id = procedureoffline.material_id
WHERE
1 = 1
OPTION 输入.storagevehicle_code <> ""
procedureoffline.storagevehicle_code = 输入.storagevehicle_code
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF