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

代码更新

Browse Source
This commit is contained in:
lyd
2022-11-29 20:15:33 +08:00
parent f447ee6964
commit b417c5eac9
3 changed files with 43 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lms/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java
View File

@@ -118,42 +118,37 @@ public class PointController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
} }
// @GetMapping("/add") @GetMapping("/add")
// @SaIgnore @SaIgnore
// public ResponseEntity<Object> add() { public ResponseEntity<Object> add() {
// WQLObject sch_base_point = WQLObject.getWQLObject("SCH_BASE_Point"); WQLObject sch_base_point = WQLObject.getWQLObject("SCH_BASE_Point");
// String code = "FMJDJW";
// String name = "困料货架"; String code = "";
// for (int i = 1; i <= 4; i++) { String name = "1排";
// JSONObject object = new JSONObject(); for (int i = 1; i <= 10; i++) {
// object.put("point_id", IdUtil.getSnowflake(1, 1).nextId()); if (i < 10) {
// if (i == 1) { code = "BTHC" + "0" + i;
// object.put("point_code", "FMJDJW0101"); } else {
// object.put("point_name", "覆膜机对接位101"); code = "BTHC" + i;
// } else if (i == 2) { }
// object.put("point_code", "FMJDJW0102"); JSONObject object = new JSONObject();
// object.put("point_name", "覆膜机对接位102"); object.put("point_id", IdUtil.getSnowflake(1, 1).nextId());
// } else if (i == 3) { object.put("point_code", code);
// object.put("point_code", "FMJDJW0201"); object.put("point_name", "半托缓存" + i);
// object.put("point_name", "覆膜机对接位201"); object.put("region_id", "1590223846013800448");
// } else if (i == 4) { object.put("region_code", "BZZCQ");
// object.put("point_code", "FMJDJW0202"); object.put("region_name", "包装暂存区");
// object.put("point_name", "覆膜机对接位202"); object.put("lock_type", "1");
// } object.put("vehicle_max_qty", "0");
// object.put("region_id", "1593073159588941824"); object.put("vehicle_qty", "0");
// object.put("region_code", "FMQ"); object.put("create_id", SecurityUtils.getCurrentUserId());
// object.put("region_name", "覆膜区"); object.put("update_optid", SecurityUtils.getCurrentUserId());
// object.put("lock_type", "1"); object.put("create_name", SecurityUtils.getCurrentNickName());
// object.put("vehicle_max_qty", "0"); object.put("update_optname", SecurityUtils.getCurrentNickName());
// object.put("vehicle_qty", "0"); object.put("create_time", DateUtil.now());
// object.put("create_id", SecurityUtils.getCurrentUserId()); object.put("update_time", DateUtil.now());
// object.put("update_optid", SecurityUtils.getCurrentUserId()); sch_base_point.insert(object);
// object.put("create_name", SecurityUtils.getCurrentNickName()); }
// object.put("update_optname", SecurityUtils.getCurrentNickName()); return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// object.put("create_time", DateUtil.now()); }
// object.put("update_time", DateUtil.now());
// sch_base_point.insert(object);
// }
// return new ResponseEntity<>(HttpStatus.NO_CONTENT);
// }
} }

20
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -168,16 +168,16 @@ public class PointServiceImpl implements PointService {
String pointStatus = dto.getPoint_status(); String pointStatus = dto.getPoint_status();
if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals("1")) { // 空位 if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals("1")) { // 空位
// dto.setMaterial_id(""); dto.setMaterial_id("");
// dto.setVehicle_type(""); dto.setVehicle_type("");
// dto.setVehicle_code(""); dto.setVehicle_code("");
// dto.setVehicle_qty(""); dto.setVehicle_qty("");
// dto.setPcsn(""); dto.setPcsn("");
// dto.setTask_id(null); dto.setTask_id(null);
// dto.setIvt_qty(BigDecimal.valueOf(0)); dto.setIvt_qty(BigDecimal.valueOf(0));
// dto.setInstorage_time(null); dto.setInstorage_time(null);
// dto.setStanding_time(BigDecimal.valueOf(0)); dto.setStanding_time(BigDecimal.valueOf(0));
PointUpdateUtil.clearPoint(dto.getPoint_code()); // PointUpdateUtil.clearPoint(dto.getPoint_code());
} else if (pointStatus.equals("2")) { // 空载具 } else if (pointStatus.equals("2")) { // 空载具
dto.setMaterial_id(null); dto.setMaterial_id(null);
dto.setInstorage_time(now); dto.setInstorage_time(now);

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
View File

Binary file not shown.