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

修改自动开单（新料、改配）加库存等级查询、排序

Browse Source
This commit is contained in:
zds
2022-06-30 12:26:21 +08:00
parent ae3b341488
commit 805db30284
6 changed files with 151 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/rest/ReturnOutBillController.java
View File

@@ -47,4 +47,10 @@ public class ReturnOutBillController {
public ResponseEntity<Object> queryBillDtl(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(returnOutBillService.queryBillDtl(whereJson,page), HttpStatus.OK);
}
@GetMapping("/queryWashDtl")
@Log("查询软废库存")
@ApiOperation("查询软废库存")
public ResponseEntity<Object> queryWashDtl(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(returnOutBillService.queryWashDtl(whereJson,page), HttpStatus.OK);
}
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/ReturnOutBillService.java
View File

@@ -30,4 +30,12 @@ public interface ReturnOutBillService {
* @return Map<String, Object>
*/
Map<String, Object> queryBillDtl(Map whereJson, Pageable page);
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> queryWashDtl(Map whereJson, Pageable page);
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/ReturnOutBillServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
import org.nl.wms.basedata.master.service.ClassstandardService;
import org.nl.wms.st.core.service.ReturnOutBillService;
import org.nl.wql.WQL;
@@ -161,4 +162,19 @@ public class ReturnOutBillServiceImpl implements ReturnOutBillService {
return jo;
}
@Override
public Map<String, Object> queryWashDtl(Map whereJson, Pageable page) {
HashMap<String, String> map = new HashMap<>(whereJson);
if (StrUtil.isNotEmpty(map.get("search"))) {
map.put("search", "%" + map.get("search") + "%");
}
if (StrUtil.isNotEmpty(map.get("pcsn"))) {
map.put("pcsn", "%" + map.get("pcsn") + "%");
}
map.put("flag", "4");
map.put("material_ids", MaterOptTypeEnum.RF.getClass_idStr());
JSONObject jo = WQL.getWO("QST_IVT_RETURNOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_id desc");
return jo;
}
}

54
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RETURNOUTBILL.wql
View File

@@ -23,9 +23,11 @@
输入.mater_type TYPEAS f_string
输入.query_type TYPEAS s_string
输入.searchid TYPEAS s_string
输入.is_active TYPEAS s_string
输入.bucketunique TYPEAS s_string
输入.pcsn TYPEAS s_string
输入.storagevehicle_code TYPEAS s_string
输入.material_ids TYPEAS f_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -216,3 +218,55 @@
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "4"
PAGEQUERY
SELECT
structivt.*,
mb.material_name,
mb.material_code,
'' AS remark
FROM
(
SELECT
SUM( ivt.canuse_qty ) AS plan_qty,
SUM( ivt.ivt_qty ) AS sum_qty,
ivt.qty_unit_id,
ivt.qty_unit_name,
ivt.material_id,
ivt.pcsn,
ivt.is_active,
ivt.ivt_level,
ivt.quality_scode
FROM
st_ivt_structivt ivt
GROUP BY
ivt.material_id,
ivt.pcsn,
ivt.is_active,
ivt.ivt_level,
ivt.quality_scode,
ivt.qty_unit_id,
ivt.qty_unit_name
) structivt
LEFT JOIN md_me_materialbase mb ON mb.material_id = structivt.material_id
WHERE
1 = 1
AND structivt.plan_qty > 0
OPTION 输入.search <> ""
(mb.material_code like 输入.search
OR
mb.material_name like 输入.search)
ENDOPTION
OPTION 输入.pcsn <> ""
structivt.pcsn like 输入.pcsn
ENDOPTION
OPTION 输入.is_active <> ""
structivt.is_active = 输入.is_active
ENDOPTION
OPTION 输入.material_ids <> ""
mb.material_type_id in 输入.material_ids
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF