From 0ed94f6aafbf9684f11a2b6df264288e25f18360 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 28 Oct 2022 18:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/rest/PointController.java | 8 ++++ .../org/nl/wms/sch/service/PointService.java | 5 +++ .../sch/service/impl/PointServiceImpl.java | 45 +++++++++++++++++++ .../src/views/wms/sch/point/index.vue | 23 +++++++++- .../src/views/wms/sch/point/point.js | 9 +++- .../src/views/wms/sch/task/index.vue | 2 +- 6 files changed, 89 insertions(+), 3 deletions(-) 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 87afafc62..407eab81a 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 @@ -111,4 +111,12 @@ public class PointController { pointService.changeLock(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + + @Log("仓位同步") + @PostMapping("/sync") + @ApiOperation("仓位同步") + public ResponseEntity sync() { + pointService.sync(); + return new ResponseEntity<>(HttpStatus.OK); + } } 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 d4eec704c..bac5d1fe4 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 @@ -96,4 +96,9 @@ public interface PointService { * @param jsonObject */ void changeLock(JSONObject jsonObject); + + /** + * 仓位同步 + */ + void sync(); } 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 9b7d58a2c..401b1a415 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 @@ -301,6 +301,51 @@ public class PointServiceImpl implements PointService { } } + @Override + @Transactional + public void sync() { + + WQLObject wo = WQLObject.getWQLObject("sch_base_point"); + + // 先删除所有点位类型为仓位的点位 + WQLObject.getWQLObject("sch_base_point").delete(" point_type = '01'"); + + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + JSONObject map = new JSONObject(); + map.put("flag", "2"); + JSONArray arrStruct = WQL.getWO("QSCH_BASE_POINT").addParamMap(map).process().getResultJSONArray(0); + + for (int i = 0; i < arrStruct.size(); i++) { + JSONObject json = arrStruct.getJSONObject(i); + JSONObject structMap = new JSONObject(); + structMap.put("point_id", IdUtil.getSnowflake(1,1).nextId()); + structMap.put("point_code", json.getString("struct_code")); + structMap.put("point_name", json.getString("struct_name")); + structMap.put("region_id", ""); + structMap.put("region_code", ""); + structMap.put("region_name", ""); + structMap.put("point_type", "01"); + structMap.put("point_status", "00"); + structMap.put("lock_type", "1"); + structMap.put("block_num", json.getIntValue("block_num")); + structMap.put("row_num", json.getIntValue("row_num")); + structMap.put("col_num", json.getIntValue("col_num")); + structMap.put("layer_num", json.getIntValue("layer_num")); + structMap.put("source_id", json.getString("struct_id")); + structMap.put("create_id", currentUserId); + structMap.put("create_name", nickName); + structMap.put("create_time", now); + structMap.put("update_optid", currentUserId); + structMap.put("update_optname", nickName); + structMap.put("update_time", now); + wo.insert(structMap); + } + + } + //根据重量返回最大的 级数 public String getLoadSeriesByqty(Double qty) { JSONArray dictArr = WQLObject.getWQLObject("sys_dict_detail").query("dict_id ='108'", "label").getResultJSONArray(0); diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index 4cde6c713..7777e2ed3 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -180,6 +180,17 @@ > 解锁 + + 仓位同步 + import crudRegion from '@/views/wms/sch/region' -import crudPoint, { changeActive } from '@/views/wms/sch/point' +import crudPoint, { changeActive } from '@/views/wms/sch/point/point' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' @@ -357,6 +368,7 @@ export default { data() { return { + sync_flag: false, syncLoading: false, invtypelist: [], pointStatusList: [], @@ -458,6 +470,15 @@ export default { this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() }) + }, + sync() { + this.sync_flag = true + crudPoint.sync().then(res => { + this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.sync_flag = false + }).cache(() => { + this.sync_flag = false + }) } } diff --git a/lms/nladmin-ui/src/views/wms/sch/point/point.js b/lms/nladmin-ui/src/views/wms/sch/point/point.js index 7a7811116..76a2f998e 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/point.js +++ b/lms/nladmin-ui/src/views/wms/sch/point/point.js @@ -68,4 +68,11 @@ export function changeLock(data) { }) } -export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock } +export function sync() { + return request({ + url: 'api/point/sync', + method: 'post' + }) +} + +export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock, sync } diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue index 05e095231..5f8b06d88 100644 --- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue @@ -193,7 +193,7 @@