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 5413332..ee3eb00 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 @@ -118,42 +118,37 @@ public class PointController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } -// @GetMapping("/add") -// @SaIgnore -// public ResponseEntity add() { -// WQLObject sch_base_point = WQLObject.getWQLObject("SCH_BASE_Point"); -// String code = "FMJDJW"; -// String name = "困料货架"; -// for (int i = 1; i <= 4; i++) { -// JSONObject object = new JSONObject(); -// object.put("point_id", IdUtil.getSnowflake(1, 1).nextId()); -// if (i == 1) { -// object.put("point_code", "FMJDJW0101"); -// object.put("point_name", "覆膜机对接位101"); -// } else if (i == 2) { -// object.put("point_code", "FMJDJW0102"); -// object.put("point_name", "覆膜机对接位102"); -// } else if (i == 3) { -// object.put("point_code", "FMJDJW0201"); -// object.put("point_name", "覆膜机对接位201"); -// } else if (i == 4) { -// object.put("point_code", "FMJDJW0202"); -// object.put("point_name", "覆膜机对接位202"); -// } -// object.put("region_id", "1593073159588941824"); -// object.put("region_code", "FMQ"); -// object.put("region_name", "覆膜区"); -// object.put("lock_type", "1"); -// object.put("vehicle_max_qty", "0"); -// object.put("vehicle_qty", "0"); -// object.put("create_id", SecurityUtils.getCurrentUserId()); -// object.put("update_optid", SecurityUtils.getCurrentUserId()); -// object.put("create_name", SecurityUtils.getCurrentNickName()); -// object.put("update_optname", SecurityUtils.getCurrentNickName()); -// object.put("create_time", DateUtil.now()); -// object.put("update_time", DateUtil.now()); -// sch_base_point.insert(object); -// } -// return new ResponseEntity<>(HttpStatus.NO_CONTENT); -// } + @GetMapping("/add") + @SaIgnore + public ResponseEntity add() { + WQLObject sch_base_point = WQLObject.getWQLObject("SCH_BASE_Point"); + + String code = ""; + String name = "1排"; + for (int i = 1; i <= 10; i++) { + if (i < 10) { + code = "BTHC" + "0" + i; + } else { + code = "BTHC" + i; + } + JSONObject object = new JSONObject(); + object.put("point_id", IdUtil.getSnowflake(1, 1).nextId()); + object.put("point_code", code); + object.put("point_name", "半托缓存" + i); + object.put("region_id", "1590223846013800448"); + object.put("region_code", "BZZCQ"); + object.put("region_name", "包装暂存区"); + object.put("lock_type", "1"); + object.put("vehicle_max_qty", "0"); + object.put("vehicle_qty", "0"); + object.put("create_id", SecurityUtils.getCurrentUserId()); + object.put("update_optid", SecurityUtils.getCurrentUserId()); + object.put("create_name", SecurityUtils.getCurrentNickName()); + object.put("update_optname", SecurityUtils.getCurrentNickName()); + object.put("create_time", DateUtil.now()); + object.put("update_time", DateUtil.now()); + sch_base_point.insert(object); + } + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } 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 5ae69da..9979689 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 @@ -168,16 +168,16 @@ public class PointServiceImpl implements PointService { String pointStatus = dto.getPoint_status(); if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals("1")) { // 空位 -// dto.setMaterial_id(""); -// dto.setVehicle_type(""); -// dto.setVehicle_code(""); -// dto.setVehicle_qty(""); -// dto.setPcsn(""); -// dto.setTask_id(null); -// dto.setIvt_qty(BigDecimal.valueOf(0)); -// dto.setInstorage_time(null); -// dto.setStanding_time(BigDecimal.valueOf(0)); - PointUpdateUtil.clearPoint(dto.getPoint_code()); + dto.setMaterial_id(""); + dto.setVehicle_type(""); + dto.setVehicle_code(""); + dto.setVehicle_qty(""); + dto.setPcsn(""); + dto.setTask_id(null); + dto.setIvt_qty(BigDecimal.valueOf(0)); + dto.setInstorage_time(null); + dto.setStanding_time(BigDecimal.valueOf(0)); +// PointUpdateUtil.clearPoint(dto.getPoint_code()); } else if (pointStatus.equals("2")) { // 空载具 dto.setMaterial_id(null); dto.setInstorage_time(now); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 5742fc6..d7c8d98 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ