From 7cd7f3aeb97518b1f50699b0204135c6f53aef5e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 13:53:38 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/resources/mapper/core/LocMapper.xml | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/ZoneController.java | 101 +++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/ZoneService.java | 8
zy-asrs-wcs/src/main/java/locCtg.sql | 9
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocController.java | 101 +++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocMapper.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocCtgMapper.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocSts.java | 206 +++++++
zy-asrs-wcs/src/main/java/zone.sql | 9
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocCtgService.java | 8
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocStsMapper.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/ZoneMapper.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocCtgServiceImpl.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocCtg.java | 206 +++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocCtgController.java | 101 +++
zy-asrs-wcs/src/main/java/loc.sql | 9
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java | 348 +++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocStsService.java | 8
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocStsServiceImpl.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocServiceImpl.java | 12
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocService.java | 8
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocStsController.java | 101 +++
zy-asrs-wcs/src/main/resources/mapper/core/LocCtgMapper.xml | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/ZoneServiceImpl.java | 12
zy-asrs-wcs/src/main/resources/mapper/core/ZoneMapper.xml | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Zone.java | 206 +++++++
zy-asrs-wcs/src/main/resources/mapper/core/LocStsMapper.xml | 5
zy-asrs-wcs/src/main/java/locSts.sql | 9
28 files changed, 1,554 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocController.java
new file mode 100644
index 0000000..4e9622f
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.core.entity.Loc;
+import com.zy.asrs.wcs.core.service.LocService;
+import com.zy.asrs.wcs.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class LocController extends BaseController {
+
+ @Autowired
+ private LocService locService;
+
+ @PreAuthorize("hasAuthority('core:loc:list')")
+ @PostMapping("/loc/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
+ return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:list')")
+ @PostMapping("/loc/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locService.list());
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:list')")
+ @GetMapping("/loc/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:save')")
+ @OperationLog("娣诲姞搴撲綅")
+ @PostMapping("/loc/save")
+ public R save(@RequestBody Loc loc) {
+ if (!locService.save(loc)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:update')")
+ @OperationLog("淇敼搴撲綅")
+ @PostMapping("/loc/update")
+ public R update(@RequestBody Loc loc) {
+ if (!locService.updateById(loc)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:remove')")
+ @OperationLog("鍒犻櫎搴撲綅")
+ @PostMapping("/loc/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:list')")
+ @PostMapping("/loc/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Loc::getLocNo, condition);
+ }
+ locService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getLocNo()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('core:loc:list')")
+ @PostMapping("/loc/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locService.list(), Loc.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocCtgController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocCtgController.java
new file mode 100644
index 0000000..8eb158c
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocCtgController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.core.entity.LocCtg;
+import com.zy.asrs.wcs.core.service.LocCtgService;
+import com.zy.asrs.wcs.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class LocCtgController extends BaseController {
+
+ @Autowired
+ private LocCtgService locCtgService;
+
+ @PreAuthorize("hasAuthority('core:locCtg:list')")
+ @PostMapping("/locCtg/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocCtg, BaseParam> pageParam = new PageParam<>(baseParam, LocCtg.class);
+ return R.ok().add(locCtgService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:list')")
+ @PostMapping("/locCtg/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locCtgService.list());
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:list')")
+ @GetMapping("/locCtg/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locCtgService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:save')")
+ @OperationLog("娣诲姞搴撲綅绫诲瀷")
+ @PostMapping("/locCtg/save")
+ public R save(@RequestBody LocCtg locCtg) {
+ if (!locCtgService.save(locCtg)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:update')")
+ @OperationLog("淇敼搴撲綅绫诲瀷")
+ @PostMapping("/locCtg/update")
+ public R update(@RequestBody LocCtg locCtg) {
+ if (!locCtgService.updateById(locCtg)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:remove')")
+ @OperationLog("鍒犻櫎搴撲綅绫诲瀷")
+ @PostMapping("/locCtg/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locCtgService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:list')")
+ @PostMapping("/locCtg/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocCtg> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocCtg::getName, condition);
+ }
+ locCtgService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('core:locCtg:list')")
+ @PostMapping("/locCtg/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locCtgService.list(), LocCtg.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocStsController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocStsController.java
new file mode 100644
index 0000000..ab56517
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/LocStsController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.core.entity.LocSts;
+import com.zy.asrs.wcs.core.service.LocStsService;
+import com.zy.asrs.wcs.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class LocStsController extends BaseController {
+
+ @Autowired
+ private LocStsService locStsService;
+
+ @PreAuthorize("hasAuthority('core:locSts:list')")
+ @PostMapping("/locSts/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocSts, BaseParam> pageParam = new PageParam<>(baseParam, LocSts.class);
+ return R.ok().add(locStsService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:list')")
+ @PostMapping("/locSts/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(locStsService.list());
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:list')")
+ @GetMapping("/locSts/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(locStsService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:save')")
+ @OperationLog("娣诲姞搴撲綅鐘舵��")
+ @PostMapping("/locSts/save")
+ public R save(@RequestBody LocSts locSts) {
+ if (!locStsService.save(locSts)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:update')")
+ @OperationLog("淇敼搴撲綅鐘舵��")
+ @PostMapping("/locSts/update")
+ public R update(@RequestBody LocSts locSts) {
+ if (!locStsService.updateById(locSts)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:remove')")
+ @OperationLog("鍒犻櫎搴撲綅鐘舵��")
+ @PostMapping("/locSts/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!locStsService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:list')")
+ @PostMapping("/locSts/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<LocSts> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(LocSts::getName, condition);
+ }
+ locStsService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('core:locSts:list')")
+ @PostMapping("/locSts/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(locStsService.list(), LocSts.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/ZoneController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/ZoneController.java
new file mode 100644
index 0000000..ab2bd36
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/ZoneController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.core.entity.Zone;
+import com.zy.asrs.wcs.core.service.ZoneService;
+import com.zy.asrs.wcs.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class ZoneController extends BaseController {
+
+ @Autowired
+ private ZoneService zoneService;
+
+ @PreAuthorize("hasAuthority('core:zone:list')")
+ @PostMapping("/zone/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Zone, BaseParam> pageParam = new PageParam<>(baseParam, Zone.class);
+ return R.ok().add(zoneService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:list')")
+ @PostMapping("/zone/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(zoneService.list());
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:list')")
+ @GetMapping("/zone/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(zoneService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:save')")
+ @OperationLog("娣诲姞搴撳尯")
+ @PostMapping("/zone/save")
+ public R save(@RequestBody Zone zone) {
+ if (!zoneService.save(zone)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:update')")
+ @OperationLog("淇敼搴撳尯")
+ @PostMapping("/zone/update")
+ public R update(@RequestBody Zone zone) {
+ if (!zoneService.updateById(zone)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:remove')")
+ @OperationLog("鍒犻櫎搴撳尯")
+ @PostMapping("/zone/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!zoneService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:list')")
+ @PostMapping("/zone/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Zone> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Zone::getName, condition);
+ }
+ zoneService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('core:zone:list')")
+ @PostMapping("/zone/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(zoneService.list(), Zone.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java
new file mode 100644
index 0000000..a35b813
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Loc.java
@@ -0,0 +1,348 @@
+package com.zy.asrs.wcs.core.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wcs.core.service.LocCtgService;
+import com.zy.asrs.wcs.core.service.LocStsService;
+import com.zy.asrs.wcs.core.service.ZoneService;
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wcs_loc")
+public class Loc implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 搴撳尯
+ */
+ @ApiModelProperty(value= "搴撳尯")
+ private Long zoneId;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ private String locNo;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 搴撲綅鐘舵��
+ */
+ @ApiModelProperty(value= "搴撲綅鐘舵��")
+ private Long locSts;
+
+ /**
+ * 搴撲綅绫诲瀷
+ */
+ @ApiModelProperty(value= "搴撲綅绫诲瀷")
+ private Long locCtg;
+
+ /**
+ * 搴撲綅鐮�
+ */
+ @ApiModelProperty(value= "搴撲綅鐮�")
+ private String code;
+
+ /**
+ * 鏂瑰悜 1: 姝e悜 0: 鍙嶅悜
+ */
+ @ApiModelProperty(value= "鏂瑰悜 1: 姝e悜 0: 鍙嶅悜 ")
+ private Integer direct;
+
+ /**
+ * 鍋忕Щ閲�
+ */
+ @ApiModelProperty(value= "鍋忕Щ閲�")
+ private Double offset;
+
+ /**
+ * 鎺�
+ */
+ @ApiModelProperty(value= "鎺�")
+ private Integer row;
+
+ /**
+ * 鍒�
+ */
+ @ApiModelProperty(value= "鍒�")
+ private Integer bay;
+
+ /**
+ * 灞�
+ */
+ @ApiModelProperty(value= "灞�")
+ private Integer lev;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String zpallet;
+
+ /**
+ * 铏氭嫙搴撲綅 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "铏氭嫙搴撲綅 1: 鏄� 0: 鍚� ")
+ private Integer virtual;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝e父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public Loc() {}
+
+ public Loc(String uuid,Long zoneId,String locNo,String name,Long locSts,Long locCtg,String code,Integer direct,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Integer virtual,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.uuid = uuid;
+ this.zoneId = zoneId;
+ this.locNo = locNo;
+ this.name = name;
+ this.locSts = locSts;
+ this.locCtg = locCtg;
+ this.code = code;
+ this.direct = direct;
+ this.offset = offset;
+ this.row = row;
+ this.bay = bay;
+ this.lev = lev;
+ this.zpallet = zpallet;
+ this.virtual = virtual;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// Loc loc = new Loc(
+// null, // 缂栧彿
+// null, // 搴撳尯
+// null, // 搴撲綅鍙�
+// null, // 鍚嶇О
+// null, // 搴撲綅鐘舵��
+// null, // 搴撲綅绫诲瀷
+// null, // 搴撲綅鐮�
+// null, // 鏂瑰悜
+// null, // 鍋忕Щ閲�
+// null, // 鎺�
+// null, // 鍒�
+// null, // 灞�
+// null, // 鎵樼洏鐮�
+// null, // 铏氭嫙搴撲綅
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getZoneId$(){
+ ZoneService service = SpringUtils.getBean(ZoneService.class);
+ Zone zone = service.getById(this.zoneId);
+ if (!Cools.isEmpty(zone)){
+ return String.valueOf(zone.getName());
+ }
+ return null;
+ }
+
+ public String getLocSts$(){
+ LocStsService service = SpringUtils.getBean(LocStsService.class);
+ LocSts locSts = service.getById(this.locSts);
+ if (!Cools.isEmpty(locSts)){
+ return String.valueOf(locSts.getName());
+ }
+ return null;
+ }
+
+ public String getLocCtg$(){
+ LocCtgService service = SpringUtils.getBean(LocCtgService.class);
+ LocCtg locCtg = service.getById(this.locCtg);
+ if (!Cools.isEmpty(locCtg)){
+ return String.valueOf(locCtg.getName());
+ }
+ return null;
+ }
+
+ public String getDirect$(){
+ if (null == this.direct){ return null; }
+ switch (this.direct){
+ case 1:
+ return "姝e悜";
+ case 0:
+ return "鍙嶅悜";
+ default:
+ return String.valueOf(this.direct);
+ }
+ }
+
+ public String getVirtual$(){
+ if (null == this.virtual){ return null; }
+ switch (this.virtual){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.virtual);
+ }
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝e父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocCtg.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocCtg.java
new file mode 100644
index 0000000..5758726
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocCtg.java
@@ -0,0 +1,206 @@
+package com.zy.asrs.wcs.core.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wcs_loc_ctg")
+public class LocCtg implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝e父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public LocCtg() {}
+
+ public LocCtg(String uuid,String name,String flag,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.uuid = uuid;
+ this.name = name;
+ this.flag = flag;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// LocCtg locCtg = new LocCtg(
+// null, // 缂栧彿
+// null, // 鍚嶇О
+// null, // 鏍囪瘑
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝e父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocSts.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocSts.java
new file mode 100644
index 0000000..a559de0
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/LocSts.java
@@ -0,0 +1,206 @@
+package com.zy.asrs.wcs.core.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wcs_loc_sts")
+public class LocSts implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝e父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public LocSts() {}
+
+ public LocSts(String uuid,String name,String flag,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.uuid = uuid;
+ this.name = name;
+ this.flag = flag;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// LocSts locSts = new LocSts(
+// null, // 缂栧彿
+// null, // 鍚嶇О
+// null, // 鏍囪瘑
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝e父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Zone.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Zone.java
new file mode 100644
index 0000000..d508cab
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Zone.java
@@ -0,0 +1,206 @@
+package com.zy.asrs.wcs.core.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wcs.system.entity.Host;
+import com.zy.asrs.wcs.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wcs_zone")
+public class Zone implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 鍖哄煙鍚�
+ */
+ @ApiModelProperty(value= "鍖哄煙鍚�")
+ private String name;
+
+ /**
+ * 瀹归噺
+ */
+ @ApiModelProperty(value= "瀹归噺")
+ private Integer capacity;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝e父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public Zone() {}
+
+ public Zone(String uuid,String name,Integer capacity,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.uuid = uuid;
+ this.name = name;
+ this.capacity = capacity;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// Zone zone = new Zone(
+// null, // 缂栧彿
+// null, // 鍖哄煙鍚�
+// null, // 瀹归噺
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝e父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocCtgMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocCtgMapper.java
new file mode 100644
index 0000000..4e4b7cf
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocCtgMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.mapper;
+
+import com.zy.asrs.wcs.core.entity.LocCtg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocCtgMapper extends BaseMapper<LocCtg> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocMapper.java
new file mode 100644
index 0000000..50117c8
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.mapper;
+
+import com.zy.asrs.wcs.core.entity.Loc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocMapper extends BaseMapper<Loc> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocStsMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocStsMapper.java
new file mode 100644
index 0000000..e44a108
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/LocStsMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.mapper;
+
+import com.zy.asrs.wcs.core.entity.LocSts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface LocStsMapper extends BaseMapper<LocSts> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/ZoneMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/ZoneMapper.java
new file mode 100644
index 0000000..890a1fe
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/ZoneMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.mapper;
+
+import com.zy.asrs.wcs.core.entity.Zone;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ZoneMapper extends BaseMapper<Zone> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocCtgService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocCtgService.java
new file mode 100644
index 0000000..5d2e0af
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocCtgService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.core.entity.LocCtg;
+
+public interface LocCtgService extends IService<LocCtg> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocService.java
new file mode 100644
index 0000000..247ae18
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.core.entity.Loc;
+
+public interface LocService extends IService<Loc> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocStsService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocStsService.java
new file mode 100644
index 0000000..534db76
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/LocStsService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.core.entity.LocSts;
+
+public interface LocStsService extends IService<LocSts> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/ZoneService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/ZoneService.java
new file mode 100644
index 0000000..b0ec6dd
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/ZoneService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.core.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.core.entity.Zone;
+
+public interface ZoneService extends IService<Zone> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocCtgServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocCtgServiceImpl.java
new file mode 100644
index 0000000..7d6a0bc
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocCtgServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.service.impl;
+
+import com.zy.asrs.wcs.core.mapper.LocCtgMapper;
+import com.zy.asrs.wcs.core.entity.LocCtg;
+import com.zy.asrs.wcs.core.service.LocCtgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locCtgService")
+public class LocCtgServiceImpl extends ServiceImpl<LocCtgMapper, LocCtg> implements LocCtgService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocServiceImpl.java
new file mode 100644
index 0000000..653804e
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.service.impl;
+
+import com.zy.asrs.wcs.core.mapper.LocMapper;
+import com.zy.asrs.wcs.core.entity.Loc;
+import com.zy.asrs.wcs.core.service.LocService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locService")
+public class LocServiceImpl extends ServiceImpl<LocMapper, Loc> implements LocService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocStsServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocStsServiceImpl.java
new file mode 100644
index 0000000..3bf08df
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/LocStsServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.service.impl;
+
+import com.zy.asrs.wcs.core.mapper.LocStsMapper;
+import com.zy.asrs.wcs.core.entity.LocSts;
+import com.zy.asrs.wcs.core.service.LocStsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("locStsService")
+public class LocStsServiceImpl extends ServiceImpl<LocStsMapper, LocSts> implements LocStsService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/ZoneServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/ZoneServiceImpl.java
new file mode 100644
index 0000000..b20781e
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/ZoneServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.core.service.impl;
+
+import com.zy.asrs.wcs.core.mapper.ZoneMapper;
+import com.zy.asrs.wcs.core.entity.Zone;
+import com.zy.asrs.wcs.core.service.ZoneService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("zoneService")
+public class ZoneServiceImpl extends ServiceImpl<ZoneMapper, Zone> implements ZoneService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/loc.sql b/zy-asrs-wcs/src/main/java/loc.sql
new file mode 100644
index 0000000..0b6f0a6
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/loc.sql
@@ -0,0 +1,9 @@
+-- save loc record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '搴撲綅绠$悊', '0', '/core/loc', '/core/loc', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ搴撲綅', '', '1', 'core:loc:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞搴撲綅', '', '1', 'core:loc:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼搴撲綅', '', '1', 'core:loc:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎搴撲綅', '', '1', 'core:loc:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wcs/src/main/java/locCtg.sql b/zy-asrs-wcs/src/main/java/locCtg.sql
new file mode 100644
index 0000000..c2122ee
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/locCtg.sql
@@ -0,0 +1,9 @@
+-- save locCtg record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '搴撲綅绫诲瀷绠$悊', '0', '/core/locCtg', '/core/locCtg', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ搴撲綅绫诲瀷', '', '1', 'core:locCtg:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞搴撲綅绫诲瀷', '', '1', 'core:locCtg:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼搴撲綅绫诲瀷', '', '1', 'core:locCtg:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎搴撲綅绫诲瀷', '', '1', 'core:locCtg:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wcs/src/main/java/locSts.sql b/zy-asrs-wcs/src/main/java/locSts.sql
new file mode 100644
index 0000000..f2c59fe
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/locSts.sql
@@ -0,0 +1,9 @@
+-- save locSts record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '搴撲綅鐘舵�佺鐞�', '0', '/core/locSts', '/core/locSts', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ搴撲綅鐘舵��', '', '1', 'core:locSts:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞搴撲綅鐘舵��', '', '1', 'core:locSts:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼搴撲綅鐘舵��', '', '1', 'core:locSts:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎搴撲綅鐘舵��', '', '1', 'core:locSts:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wcs/src/main/java/zone.sql b/zy-asrs-wcs/src/main/java/zone.sql
new file mode 100644
index 0000000..ed3fa92
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/zone.sql
@@ -0,0 +1,9 @@
+-- save zone record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '搴撳尯绠$悊', '0', '/core/zone', '/core/zone', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ搴撳尯', '', '1', 'core:zone:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞搴撳尯', '', '1', 'core:zone:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼搴撳尯', '', '1', 'core:zone:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎搴撳尯', '', '1', 'core:zone:remove', '3', '1', '1');
+
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/LocCtgMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/LocCtgMapper.xml
new file mode 100644
index 0000000..ba4f2d8
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/LocCtgMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.LocCtgMapper">
+
+</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/LocMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/LocMapper.xml
new file mode 100644
index 0000000..09d1b7f
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/LocMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.LocMapper">
+
+</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/LocStsMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/LocStsMapper.xml
new file mode 100644
index 0000000..c921e04
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/LocStsMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.LocStsMapper">
+
+</mapper>
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/ZoneMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/ZoneMapper.xml
new file mode 100644
index 0000000..bc40e60
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/ZoneMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.core.mapper.ZoneMapper">
+
+</mapper>
--
Gitblit v1.9.1