From 842442d55b18b15a059e136f36251e049d07c3de Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Thu, 20 Oct 2022 18:59:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/cppoint/rest/CppointController.java | 32 ---- .../sch/cppoint/service/CppointService.java | 22 --- .../service/impl/CppointServiceImpl.java | 57 ------- .../wms/sch/cppoint/wql/SCH_BASE_CPPOINT.wql | 27 ---- .../org/nl/wms/sch/rest/PointController.java | 9 ++ .../org/nl/wms/sch/service/PointService.java | 6 + .../sch/service/impl/PointServiceImpl.java | 18 +++ .../wms/sch/ysa/rest/YsapointController.java | 39 ----- .../wms/sch/ysa/service/YsapointService.java | 28 ---- .../ysa/service/impl/YsapointServiceImpl.java | 120 +-------------- .../nl/wms/sch/ysa/wql/SCH_BASE_YSAPOINT.wql | 28 ---- .../wms/st/bill/rest/RegionIoController.java | 63 ++++++++ .../wms/st/bill/service/RegionIoService.java | 64 ++++++++ .../wms/st/bill/service/dto/RegionIoDto.java | 101 +++++++++++++ .../service/impl/RegionIoServiceImpl.java | 140 ++++++++++++++++++ .../nl/wms/st/bill/wql/ST_IVT_REGIONIO.wql | 73 +++++++++ lms/nladmin-ui/src/api/wms/sch/point.js | 11 +- lms/nladmin-ui/src/api/wms/sch/region.js | 1 + lms/nladmin-ui/src/api/wms/st/bill.js | 27 ++++ .../src/views/wms/sch/cppoint/cppInRegion.vue | 11 +- .../views/wms/sch/cppoint/cppInventory.vue | 36 +---- .../views/wms/sch/cppoint/cppOutRegion.vue | 11 +- .../src/views/wms/sch/cppoint/cppoint.js | 16 +- .../src/views/wms/sch/point/index.vue | 52 +++++-- .../src/views/wms/sch/ysa/inventory.vue | 81 ++++------ .../src/views/wms/sch/ysa/ysapoint.js | 24 +-- .../src/views/wms/sch/ysa/ysqInRegion.vue | 5 +- .../src/views/wms/sch/ysa/ysqOutRegion.vue | 11 +- 28 files changed, 619 insertions(+), 494 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/bill/rest/RegionIoController.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/RegionIoService.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/dto/RegionIoDto.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/bill/wql/ST_IVT_REGIONIO.wql create mode 100644 lms/nladmin-ui/src/api/wms/st/bill.js diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/rest/CppointController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/rest/CppointController.java index 275e118..ff1e3f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/rest/CppointController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/rest/CppointController.java @@ -66,36 +66,4 @@ public class CppointController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("启动") - @PostMapping("/changeUsedOn") - @ApiOperation("启动") - public ResponseEntity changeUsedOn(@RequestBody JSONArray jsonArray) { - cppointService.changeUsed(jsonArray, 1); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("禁用") - @PostMapping("/changeUsedOff") - @ApiOperation("禁用") - public ResponseEntity changeUsedOff(@RequestBody JSONArray jsonArray) { - cppointService.changeUsed(jsonArray, 0); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @GetMapping("/getCppRegionInquery") - @Log("入库查询") - @ApiOperation("入库查询") - //@SaCheckPermission("@el.check('regionio:list')") - public ResponseEntity 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 cppRegionOutquery(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(cppointService.cppRegionOutquery(whereJson,page),HttpStatus.OK); - } - } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/CppointService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/CppointService.java index edd89ff..782bfe0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/CppointService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/CppointService.java @@ -62,26 +62,4 @@ public interface CppointService { */ void deleteAll(Long[] ids); - /** - * 改变是否启用 - * @param jsonArray - * @param i - */ - void changeUsed(JSONArray jsonArray, int i); - - /** - * - * @param whereJson - * @param page - * @return - */ - Map cppRegionInquery(Map whereJson, Pageable page); - - /** - * - * @param whereJson - * @param page - * @return - */ - Map cppRegionOutquery(Map whereJson, Pageable page); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/impl/CppointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/impl/CppointServiceImpl.java index 0ca3035..fb705c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/impl/CppointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/service/impl/CppointServiceImpl.java @@ -177,61 +177,4 @@ public class CppointServiceImpl implements CppointService { } } - /** - * 改变是否启用 - * - * @param jsonArray - * @param flag - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void changeUsed(JSONArray jsonArray, int flag) { - WQLObject wo = WQLObject.getWQLObject("sch_base_CpPoint"); - for ( int i = 0; i < jsonArray.size(); i++ ) { - JSONObject object = jsonArray.getJSONObject(i); - if (flag == 1) object.put("is_used", 1); - else object.put("is_used", 0); - wo.update(object); - } - } - - /** - * @param whereJson - * @param page - * @return - */ - @Override - public Map 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 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; - } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/wql/SCH_BASE_CPPOINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/wql/SCH_BASE_CPPOINT.wql index a908241..62cf538 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/wql/SCH_BASE_CPPOINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/cppoint/wql/SCH_BASE_CPPOINT.wql @@ -99,30 +99,3 @@ 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 \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index eba650a..631da66 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -2,6 +2,7 @@ package org.nl.wms.sch.rest; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -95,4 +96,12 @@ public class PointController { public ResponseEntity getRegion(){ return new ResponseEntity<>(pointService.getRegion(),HttpStatus.OK); } + + @Log("启动与禁用") + @PostMapping("/changeUsed") + @ApiOperation("启动与禁用") + public ResponseEntity changeUsedOn(@RequestBody JSONObject jsonObject) { + pointService.changeUsed(jsonObject); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java index fd67e88..79aedfa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java @@ -84,4 +84,10 @@ public interface PointService { * 获取区域 */ JSONArray getRegion(); + + /** + * 改变启用状态 + * @param jsonObject + */ + void changeUsed(JSONObject jsonObject); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 6bec7af..1c5c664 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -257,6 +257,24 @@ public class PointServiceImpl implements PointService { return resultJSONArray; } + /** + * 改变启用状态 + * + * @param jsonObject + */ + @Override + public void changeUsed(JSONObject jsonObject) { + WQLObject wo = WQLObject.getWQLObject("sch_base_Point"); + JSONArray data = jsonObject.getJSONArray("data"); + String used = jsonObject.getString("used"); + for ( int i = 0; i < data.size(); i++ ) { + JSONObject object = data.getJSONObject(i); + if (used.equals("1")) object.put("is_used", 1); + else object.put("is_used", 0); + wo.update(object); + } + } + //根据重量返回最大的 级数 public String getLoadSeriesByqty(Double qty) { JSONArray dictArr = WQLObject.getWQLObject("sys_dict_detail").query("dict_id ='108'", "label").getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/rest/YsapointController.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/rest/YsapointController.java index 8c2f1e5..12433d0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/rest/YsapointController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/rest/YsapointController.java @@ -67,43 +67,4 @@ public class YsapointController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("获取快列排") - @GetMapping("/blockRowCol/tree") - @ApiOperation("获取快列排") - public ResponseEntity arrangementTree() { - return new ResponseEntity<>(ysapointService.getArrangementTree(), HttpStatus.OK); - } - - @Log("启动") - @PostMapping("/changeUsedOn") - @ApiOperation("启动") - public ResponseEntity changeUsedOn(@RequestBody JSONArray jsonArray) { - ysapointService.changeUsed(jsonArray, 1); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("禁用") - @PostMapping("/changeUsedOff") - @ApiOperation("禁用") - public ResponseEntity changeUsedOff(@RequestBody JSONArray jsonArray) { - ysapointService.changeUsed(jsonArray, 0); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @GetMapping("/getYsqRegionInquery") - @Log("养生区入库查询") - @ApiOperation("入库查询") - //@SaCheckPermission("@el.check('regionio:list')") - public ResponseEntity 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 ysqRegionOutquery(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(ysapointService.ysqRegionOutquery(whereJson,page),HttpStatus.OK); - } - } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/YsapointService.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/YsapointService.java index 75d20f0..d4912e8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/YsapointService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/YsapointService.java @@ -64,32 +64,4 @@ public interface YsapointService { */ void deleteAll(Long[] ids); - /** - * 获取块列排树 - * @return - */ - JSONArray getArrangementTree(); - - /** - * 改变启用状态 - * @param jsonArray - * @return - */ - void changeUsed(JSONArray jsonArray, Integer flag); - - /** - * - * @param whereJson - * @param page - * @return - */ - Map ysqRegionInquery(Map whereJson, Pageable page); - - /** - * - * @param whereJson - * @param page - * @return - */ - Map ysqRegionOutquery(Map whereJson, Pageable page); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/impl/YsapointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/impl/YsapointServiceImpl.java index be02404..1ae5a3b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/impl/YsapointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/service/impl/YsapointServiceImpl.java @@ -46,13 +46,9 @@ public class YsapointServiceImpl implements YsapointService { if (!ObjectUtil.isNull(whereJson.get("point_code"))) { map.put("point_code", "%" + whereJson.get("point_code") + "%"); } - if (!ObjectUtil.isNull(whereJson.get("locationsOptions"))) { - String locationsOptions = whereJson.get("locationsOptions").toString(); - String[] options = locationsOptions.split("/"); - map.put("block_num", options[0]); - map.put("row_num", options[1]); - map.put("col_num", options[2]); - } + map.put("block_num", whereJson.get("block_num")); + map.put("row_num", whereJson.get("row_num")); + map.put("col_num", whereJson.get("col_num")); map.put("is_used", whereJson.get("is_used")); map.put("point_status", whereJson.get("point_status")); map.put("vehicle_type", whereJson.get("vehicle_type")); @@ -185,114 +181,4 @@ public class YsapointServiceImpl implements YsapointService { } } - /** - * 获取块列排树 - * - * @return - */ - @Override - public JSONArray getArrangementTree() { - /** - * [{ - * label:块 - * value: - * children:[{ - * label:排 - * value - * children:[{ - * label:列 - * value - * children:[{ - * - * }] - * }] - * }] - * }] - */ - JSONArray result = new JSONArray(); - // 获取所有的块 - for (int i = 1; i <= 8; i++) { - JSONObject block = new JSONObject(); - block.put("label", i); - block.put("value", i); - JSONArray rows = new JSONArray(); - for (int j = 1; j <= 13; j++) { - if ( j == 13 && ( i == 7 || i == 8 ) ) break; - JSONObject row = new JSONObject(); - row.put("label", j); - row.put("value", j); - JSONArray cols = new JSONArray(); - for (int k = 1; k <= 13; k++) { - if ( i < 7 && k > 9) break; - JSONObject col = new JSONObject(); - col.put("label", k); - col.put("value", k); - cols.add(col); - } - row.put("children", cols); - rows.add(row); - } - block.put("children", rows); - result.add(block); - } - return result; - } - - /** - * 改变启用状态 - * - * @param jsonArray - * @return - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void changeUsed(JSONArray jsonArray, Integer flag) { - WQLObject wo = WQLObject.getWQLObject("sch_base_YsaPoint"); - for ( int i = 0; i < jsonArray.size(); i++ ) { - JSONObject object = jsonArray.getJSONObject(i); - if (flag == 1) object.put("is_used", 1); - else object.put("is_used", 0); - wo.update(object); - } - } - - /** - * @param whereJson - * @param page - * @return - */ - @Override - public Map 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 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; - } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/wql/SCH_BASE_YSAPOINT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/wql/SCH_BASE_YSAPOINT.wql index da2d03c..9884183 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/wql/SCH_BASE_YSAPOINT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/ysa/wql/SCH_BASE_YSAPOINT.wql @@ -99,31 +99,3 @@ 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 ('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 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/rest/RegionIoController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/rest/RegionIoController.java new file mode 100644 index 0000000..88c4dd6 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/rest/RegionIoController.java @@ -0,0 +1,63 @@ +package org.nl.wms.st.bill.rest; + +import org.nl.wms.st.bill.service.RegionIoService; +import org.nl.wms.st.inbill.service.dto.RegionioDto; +import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; +import org.nl.modules.logging.annotation.Log; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; +import java.util.Map; +import lombok.extern.slf4j.Slf4j; + +/** + * @author lyd + * @date 2022-10-20 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "区域出入库管理") +@RequestMapping("/api/regionio") +@Slf4j +public class RegionIoController { + + private final RegionIoService regionioService; + + @GetMapping + @Log("查询1") + @ApiOperation("查询1") + //@SaCheckPermission("@el.check('regionio:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(regionioService.queryAll(whereJson,page),HttpStatus.OK); + } + + @PostMapping + @Log("新增1") + @ApiOperation("新增1") + //@SaCheckPermission("@el.check('regionio:add')") + public ResponseEntity create(@Validated @RequestBody RegionioDto dto){ + regionioService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改1") + @ApiOperation("修改1") + //@SaCheckPermission("@el.check('regionio:edit')") + public ResponseEntity update(@Validated @RequestBody RegionioDto dto){ + regionioService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除1") + @ApiOperation("删除1") + //@SaCheckPermission("@el.check('regionio:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + regionioService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/RegionIoService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/RegionIoService.java new file mode 100644 index 0000000..b9fe737 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/RegionIoService.java @@ -0,0 +1,64 @@ +package org.nl.wms.st.bill.service; + +import org.nl.wms.st.inbill.service.dto.RegionioDto; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** + * @description 服务接口 + * @author lyd + * @date 2022-10-20 + **/ +public interface RegionIoService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + /** + * 查询所有数据不分页 + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * @param qty_unit_id ID + * @return Regionio + */ + RegionioDto findById(Long qty_unit_id); + + /** + * 根据编码查询 + * @param code code + * @return Regionio + */ + RegionioDto findByCode(String code); + + + /** + * 创建 + * @param dto / + */ + void create(RegionioDto dto); + + /** + * 编辑 + * @param dto / + */ + void update(RegionioDto dto); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Long[] ids); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/dto/RegionIoDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/dto/RegionIoDto.java new file mode 100644 index 0000000..7df5710 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/dto/RegionIoDto.java @@ -0,0 +1,101 @@ +package org.nl.wms.st.bill.service.dto; + +import lombok.Data; +import java.math.BigDecimal; +import java.io.Serializable; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +/** + * @description / + * @author lyd + * @date 2022-10-20 + **/ +@Data +public class RegionIoDto implements Serializable { + + /** 出入单标识 */ + /** 防止精度丢失 */ + @JsonSerialize(using= ToStringSerializer.class) + private Long iostorinv_id; + + /** 单据编号 */ + private String bill_code; + + /** 出入类型 */ + private String io_type; + + /** 物料标识 */ + private Long material_id; + + /** 批次 */ + private String pcsn; + + /** 载具编码 */ + private String vehicle_code; + + /** 数量 */ + private BigDecimal qty; + + /** 数量单位标识 */ + /** 防止精度丢失 */ + @JsonSerialize(using= ToStringSerializer.class) + private Long qty_unit_id; + + /** 单据状态 */ + private String bill_status; + + /** 起始点位编码 */ + private String start_point_code; + + /** 终点点位编码 */ + private String end_point_code; + + /** 起始区域 */ + private String start_region_id; + + /** 终点区域 */ + private String end_region_id; + + /** 客户标识 */ + private Long cust_id; + + /** 生成方式 */ + private String create_mode; + + /** 任务标识 */ + private Long task_id; + + /** 备注 */ + private String remark; + + /** 创建人 */ + private Long create_id; + + /** 创建人姓名 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改人 */ + private Long update_optid; + + /** 修改人姓名 */ + private String update_optname; + + /** 修改时间 */ + private String update_time; + + /** 确认人 */ + private Long confirm_optid; + + /** 确认人姓名 */ + private String confirm_optname; + + /** 确认时间 */ + private String confirm_time; + + /** 是否删除 */ + private String is_delete; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java new file mode 100644 index 0000000..78ccaf6 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java @@ -0,0 +1,140 @@ +package org.nl.wms.st.bill.service.impl; + +import com.alibaba.fastjson.JSON; +import lombok.RequiredArgsConstructor; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.WQL; +import org.nl.wms.st.bill.service.RegionIoService; +import org.nl.wms.st.inbill.service.dto.RegionioDto; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import org.springframework.data.domain.Pageable; +import java.util.List; +import java.util.Map; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.modules.common.utils.SecurityUtils; +import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.modules.wql.util.WqlUtil; +import lombok.extern.slf4j.Slf4j; +import cn.hutool.core.util.ObjectUtil; + +/** + * @description 服务实现 + * @author lyd + * @date 2022-10-20 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class RegionIoServiceImpl implements RegionIoService { + + @Override + public Map queryAll(Map whereJson, Pageable page){ + JSONObject map = new JSONObject(); + map.put("flag", "1"); + map.put("io_type", whereJson.get("io_type")); + map.put("io_region", "(" + whereJson.get("io_region") + ")"); + 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("ST_IVT_REGIONIO").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time asc"); + return json; + } + + @Override + public List queryAll(Map whereJson){ + WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(RegionioDto.class); + return null; + } + + @Override + public RegionioDto findById(Long qty_unit_id) { + WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); + JSONObject json = wo.query("qty_unit_id = '" + qty_unit_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( RegionioDto.class); + } + return null; + } + + @Override + public RegionioDto findByCode(String code) { + WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( RegionioDto.class); + } + return null; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(RegionioDto dto) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + dto.setQty_unit_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setCreate_id(currentUserId); + dto.setCreate_name(nickName); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(nickName); + dto.setUpdate_time(now); + dto.setCreate_time(now); + + WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(RegionioDto dto) { + RegionioDto entity = this.findById(dto.getQty_unit_id()); + if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + + String now = DateUtil.now(); + dto.setUpdate_time(now); + dto.setUpdate_optid(currentUserId); + dto.setUpdate_optname(nickName); + + WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.update(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(Long[] ids) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + WQLObject wo = WQLObject.getWQLObject("st_ivt_regionio"); + for (Long qty_unit_id: ids) { + JSONObject param = new JSONObject(); + param.put("qty_unit_id", String.valueOf(qty_unit_id)); + param.put("is_delete", "1"); + param.put("update_optid", currentUserId); + param.put("update_optname", nickName); + param.put("update_time", now); + wo.update(param); + } + } + +} + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/wql/ST_IVT_REGIONIO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/wql/ST_IVT_REGIONIO.wql new file mode 100644 index 0000000..d21a0e5 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/wql/ST_IVT_REGIONIO.wql @@ -0,0 +1,73 @@ +[交易说明] + 交易名： 库存查询 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.io_region TYPEAS f_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 + + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + IF 输入.flag = "1" + 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 输入.io_region + ) + 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 \ No newline at end of file diff --git a/lms/nladmin-ui/src/api/wms/sch/point.js b/lms/nladmin-ui/src/api/wms/sch/point.js index 93fe423..47c5317 100644 --- a/lms/nladmin-ui/src/api/wms/sch/point.js +++ b/lms/nladmin-ui/src/api/wms/sch/point.js @@ -52,4 +52,13 @@ export function getRegion() { }) } -export default { add, edit, del, changeActive, findPoints, getPoint, getRegion } + +export function changeUsed(data) { + return request({ + url: 'api/point/changeUsed', + method: 'post', + data: data + }) +} + +export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed } diff --git a/lms/nladmin-ui/src/api/wms/sch/region.js b/lms/nladmin-ui/src/api/wms/sch/region.js index a5d84fb..6cfc1e9 100644 --- a/lms/nladmin-ui/src/api/wms/sch/region.js +++ b/lms/nladmin-ui/src/api/wms/sch/region.js @@ -48,4 +48,5 @@ export function getPointTypeSelectById(id) { }) } + export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById } diff --git a/lms/nladmin-ui/src/api/wms/st/bill.js b/lms/nladmin-ui/src/api/wms/st/bill.js new file mode 100644 index 0000000..e5b88f8 --- /dev/null +++ b/lms/nladmin-ui/src/api/wms/st/bill.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/regionio', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/regionio/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/regionio', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/sch/cppoint/cppInRegion.vue b/lms/nladmin-ui/src/views/wms/sch/cppoint/cppInRegion.vue index 0da18c4..facd451 100644 --- a/lms/nladmin-ui/src/views/wms/sch/cppoint/cppInRegion.vue +++ b/lms/nladmin-ui/src/views/wms/sch/cppoint/cppInRegion.vue @@ -134,6 +134,7 @@