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

养生A区与库存区的库存分类管理

Browse Source
This commit is contained in:
lyd
2022-10-20 16:02:48 +08:00
parent 59201e427c
commit db08427522
16 changed files with 1690 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/rest/CppointController.java
View File

@@ -82,4 +82,20 @@ public class CppointController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/getCppRegionInquery")
@Log("入库查询")
@ApiOperation("入库查询")
//@SaCheckPermission("@el.check('regionio:list')")
public ResponseEntity<Object> cppRegionInquery(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(cppointService.cppRegionInquery(whereJson,page),HttpStatus.OK);
}
@GetMapping("/getCppRegionOutquery")
@Log("出库查询")
@ApiOperation("出库查询")
//@SaCheckPermission("@el.check('regionio:list')")
public ResponseEntity<Object> cppRegionOutquery(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(cppointService.cppRegionOutquery(whereJson,page),HttpStatus.OK);
}
}

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/CppointService.java
View File

@@ -68,4 +68,20 @@ public interface CppointService {
* @param i
*/
void changeUsed(JSONArray jsonArray, int i);
/**
*
* @param whereJson
* @param page
* @return
*/
Map<String,Object> cppRegionInquery(Map whereJson, Pageable page);
/**
*
* @param whereJson
* @param page
* @return
*/
Map<String,Object> cppRegionOutquery(Map whereJson, Pageable page);
}

59
lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/impl/CppointServiceImpl.java
View File

@@ -8,6 +8,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.wms.sch.cppoint.service.CppointService;
import org.nl.wms.sch.cppoint.service.dto.CppointDto;
import org.nl.wms.sch.service.RegionService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +37,8 @@ import cn.hutool.core.util.ObjectUtil;
@Slf4j
public class CppointServiceImpl implements CppointService {
private final RegionService regionService;
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
JSONObject map = new JSONObject();
@@ -46,13 +49,28 @@ public class CppointServiceImpl implements CppointService {
map.put("layer_num", whereJson.get("layer_num"));
map.put("row_num", whereJson.get("row_num"));
map.put("col_num", whereJson.get("col_num"));
map.put("is_lock", whereJson.get("is_lock"));
map.put("is_used", whereJson.get("is_used"));
map.put("lock_type", whereJson.get("lock_type"));
map.put("point_status", whereJson.get("point_status"));
map.put("vehicle_type", whereJson.get("vehicle_type"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("SCH_BASE_CPPOINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc");
JSONArray content = json.getJSONArray("content");
JSONArray res = new JSONArray();
for (int i = 0; i < content.size(); i++) {
JSONObject cppEntry = content.getJSONObject(i);
String point_status_explain = regionService.findById(cppEntry.getLong("region_id")).getPoint_status_explain();
String[] split = point_status_explain.split("，");
JSONObject statusMap = new JSONObject();
for (int j = 0; j < split.length; j++) {
String[] status = split[j].split("-");
statusMap.put(status[0], status[1]);
}
cppEntry.put("point_status_name", statusMap.getString(cppEntry.getString("point_status")));
res.add(cppEntry);
}
json.put("content", res);
return json;
}
@@ -177,4 +195,43 @@ public class CppointServiceImpl implements CppointService {
}
}
/**
* @param whereJson
* @param page
* @return
*/
@Override
public Map<String, Object> cppRegionInquery(Map whereJson, Pageable page) {
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("io_type", "0");
if (!ObjectUtil.isNull(whereJson.get("bill_code"))) {
map.put("bill_code", "%" + whereJson.get("bill_code") + "%");
}
map.put("bill_status", whereJson.get("bill_status"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("SCH_BASE_CPPOINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time asc");
return json;
}
/**
* @param whereJson
* @param page
* @return
*/
@Override
public Map<String, Object> cppRegionOutquery(Map whereJson, Pageable page) {
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("io_type", "1");
if (!ObjectUtil.isNull(whereJson.get("bill_code"))) {
map.put("bill_code", "%" + whereJson.get("bill_code") + "%");
}
map.put("bill_status", whereJson.get("bill_status"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("SCH_BASE_CPPOINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time asc");
return json;
}
}

50
lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/wql/SCH_BASE_CPPOINT.wql
View File

@@ -18,12 +18,15 @@
输入.layer_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.col_num TYPEAS s_string
输入.is_lock TYPEAS s_string
输入.lock_type TYPEAS s_string
输入.is_used TYPEAS s_string
输入.point_status TYPEAS s_string
输入.vehicle_type TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.bill_status TYPEAS s_string
输入.io_type TYPEAS s_string
[临时表]
@@ -50,11 +53,19 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
cppoint.*
cppoint.*,
str.stockrecord_id,
str.pcsn,
str.material_id,
str.ivt_qty,
str.qty_unit_id,
str.instorage_time,
str.standing_time
FROM
sch_base_CpPoint cppoint
sch_base_point cppoint
LEFT JOIN st_ivt_structivt str ON str.point_id = cppoint.point_id
WHERE
1 = 1
cppoint.region_code IN ('CPQYA01')
OPTION 输入.point_code <> ""
point_code LIKE 输入.point_code
ENDOPTION
@@ -73,8 +84,8 @@
OPTION 输入.col_num <> ""
col_num = 输入.col_num
ENDOPTION
OPTION 输入.is_lock <> ""
is_lock = 输入.is_lock
OPTION 输入.lock_type <> ""
YsaPoint.lock_type = 输入.lock_type
ENDOPTION
OPTION 输入.is_used <> ""
is_used = 输入.is_used
@@ -87,4 +98,31 @@
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "2"
PAGEQUERY
SELECT
regionio.*
FROM
`st_ivt_regionio` regionio
WHERE
regionio.io_type = 输入.io_type
AND start_region_id IN
(
SELECT region.region_id FROM sch_base_region region WHERE region.region_code IN ('CPQYA01')
)
OPTION 输入.bill_code <> ""
regionio.bill_code = 输入.bill_code
ENDOPTION
OPTION 输入.bill_status <> ""
regionio.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
regionio.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
regionio.create_time <= 输入.end_time
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

17
lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/rest/YsapointController.java
View File

@@ -89,4 +89,21 @@ public class YsapointController {
ysapointService.changeUsed(jsonArray, 0);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@GetMapping("/getYsqRegionInquery")
@Log("养生区入库查询")
@ApiOperation("入库查询")
//@SaCheckPermission("@el.check('regionio:list')")
public ResponseEntity<Object> ysqRegionInquery(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(ysapointService.ysqRegionInquery(whereJson,page),HttpStatus.OK);
}
@GetMapping("/getYsqRegionOutquery")
@Log("养生区出库查询")
@ApiOperation("出库查询")
//@SaCheckPermission("@el.check('regionio:list')")
public ResponseEntity<Object> ysqRegionOutquery(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(ysapointService.ysqRegionOutquery(whereJson,page),HttpStatus.OK);
}
}

16
lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/YsapointService.java
View File

@@ -76,4 +76,20 @@ public interface YsapointService {
* @return
*/
void changeUsed(JSONArray jsonArray, Integer flag);
/**
*
* @param whereJson
* @param page
* @return
*/
Map<String,Object> ysqRegionInquery(Map whereJson, Pageable page);
/**
*
* @param whereJson
* @param page
* @return
*/
Map<String,Object> ysqRegionOutquery(Map whereJson, Pageable page);
}

61
lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/impl/YsapointServiceImpl.java
View File

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.wms.sch.service.RegionService;
import org.nl.wms.sch.ysa.service.YsapointService;
import org.nl.wms.sch.ysa.service.dto.YsapointDto;
import org.springframework.stereotype.Service;
@@ -35,6 +37,8 @@ import cn.hutool.core.util.ObjectUtil;
@Slf4j
public class YsapointServiceImpl implements YsapointService {
private final RegionService regionService;
@Override
public Map<String,Object> queryAll(Map whereJson, Pageable page){
JSONObject map = new JSONObject();
@@ -49,13 +53,28 @@ public class YsapointServiceImpl implements YsapointService {
map.put("row_num", options[1]);
map.put("col_num", options[2]);
}
map.put("is_lock", whereJson.get("is_lock"));
map.put("is_used", whereJson.get("is_used"));
map.put("point_status", whereJson.get("point_status"));
map.put("vehicle_type", whereJson.get("vehicle_type"));
map.put("lock_type", whereJson.get("lock_type"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("SCH_BASE_YSAPOINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc");
JSONArray content = json.getJSONArray("content");
JSONArray res = new JSONArray();
for (int i = 0; i < content.size(); i++) {
JSONObject ysaEntry = content.getJSONObject(i);
String point_status_explain = regionService.findById(ysaEntry.getLong("region_id")).getPoint_status_explain();
String[] split = point_status_explain.split("，");
JSONObject statusMap = new JSONObject();
for (int j = 0; j < split.length; j++) {
String[] status = split[j].split("-");
statusMap.put(status[0], status[1]);
}
ysaEntry.put("point_status_name", statusMap.getString(ysaEntry.getString("point_status")));
res.add(ysaEntry);
}
json.put("content", res);
return json;
}
@@ -236,4 +255,44 @@ public class YsapointServiceImpl implements YsapointService {
wo.update(object);
}
}
/**
* @param whereJson
* @param page
* @return
*/
@Override
public Map<String, Object> ysqRegionInquery(Map whereJson, Pageable page) {
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("io_type", "0");
if (!ObjectUtil.isNull(whereJson.get("bill_code"))) {
map.put("bill_code", "%" + whereJson.get("bill_code") + "%");
}
map.put("bill_status", whereJson.get("bill_status"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("SCH_BASE_YSAPOINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time asc");
return json;
}
/**
* @param whereJson
* @param page
* @return
*/
@Override
public Map<String, Object> ysqRegionOutquery(Map whereJson, Pageable page) {
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("io_type", "1");
if (!ObjectUtil.isNull(whereJson.get("bill_code"))) {
map.put("bill_code", "%" + whereJson.get("bill_code") + "%");
}
map.put("bill_status", whereJson.get("bill_status"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("SCH_BASE_YSAPOINT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time asc");
return json;
}
}

73
lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/wql/SCH_BASE_YSAPOINT.wql
View File

@@ -15,13 +15,16 @@
#################################################
输入.flag TYPEAS s_string
输入.point_code TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.bill_status TYPEAS s_string
输入.block_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.col_num TYPEAS s_string
输入.is_lock TYPEAS s_string
输入.io_type TYPEAS s_string
输入.is_used TYPEAS s_string
输入.point_status TYPEAS s_string
输入.vehicle_type TYPEAS s_string
输入.lock_type TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
@@ -50,41 +53,77 @@
IF 输入.flag = "1"
PAGEQUERY
SELECT
YsaPoint.*
YsaPoint.*,
str.stockrecord_id,
str.pcsn,
str.material_id,
str.ivt_qty,
str.qty_unit_id,
str.instorage_time,
str.standing_time
FROM
sch_base_YsaPoint YsaPoint
sch_base_point YsaPoint
LEFT JOIN st_ivt_structivt str ON str.point_id = YsaPoint.point_id
WHERE
1 = 1
YsaPoint.region_code IN ('YSQA01', 'YSAQKTPQ01')
OPTION 输入.point_code <> ""
point_code LIKE 输入.point_code
YsaPoint.point_code LIKE 输入.point_code
ENDOPTION
OPTION 输入.point_status <> ""
point_status = 输入.point_status
YsaPoint.point_status = 输入.point_status
ENDOPTION
OPTION 输入.lock_type <> ""
YsaPoint.lock_type = 输入.lock_type
ENDOPTION
OPTION 输入.vehicle_type <> ""
vehicle_type = 输入.vehicle_type
YsaPoint.vehicle_type = 输入.vehicle_type
ENDOPTION
OPTION 输入.block_num <> ""
block_num = 输入.block_num
YsaPoint.block_num = 输入.block_num
ENDOPTION
OPTION 输入.row_num <> ""
row_num = 输入.row_num
YsaPoint.row_num = 输入.row_num
ENDOPTION
OPTION 输入.col_num <> ""
col_num = 输入.col_num
ENDOPTION
OPTION 输入.is_lock <> ""
is_lock = 输入.is_lock
YsaPoint.col_num = 输入.col_num
ENDOPTION
OPTION 输入.is_used <> ""
is_used = 输入.is_used
YsaPoint.is_used = 输入.is_used
ENDOPTION
OPTION 输入.begin_time <> ""
instorage_time >= 输入.begin_time
str.instorage_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
instorage_time <= 输入.end_time
str.instorage_time <= 输入.end_time
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
ENDIF
IF 输入.flag = "2"
PAGEQUERY
SELECT
regionio.*
FROM
`st_ivt_regionio` regionio
WHERE
regionio.io_type = 输入.io_type
AND start_region_id IN
(
SELECT region.region_id FROM sch_base_region region WHERE region.region_code IN ('YSQA01', 'YSAQKTPQ01')
)
OPTION 输入.bill_code <> ""
regionio.bill_code = 输入.bill_code
ENDOPTION
OPTION 输入.bill_status <> ""
regionio.bill_status = 输入.bill_status
ENDOPTION
OPTION 输入.begin_time <> ""
regionio.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
regionio.create_time <= 输入.end_time
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF