From 8c7b4949dfcf875cc537304d34a7f6960cbb0c10 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期四, 16 十月 2025 14:57:12 +0800
Subject: [PATCH] #
---
/dev/null | 22 ----------------------
src/main/java/com/zy/asrs/entity/WrkMast.java | 18 ------------------
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 19 -------------------
3 files changed, 0 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
deleted file mode 100644
index 15e356c..0000000
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasDevpController extends BaseController {
-
- @Autowired
- private BasDevpService basDevpService;
-
- @RequestMapping(value = "/basDevp/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") Long id) {
- return R.ok(basDevpService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basDevp/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
- excludeTrash(param);
- EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/basDevp/add/auth")
- @ManagerAuth(memo = "绔欑偣娣诲姞")
- public R add(BasDevp basDevp) {
- basDevp.setModiUser(getUserId());
- basDevp.setModiTime(new Date());
- basDevp.setAppeUser(getUserId());
- basDevp.setAppeTime(new Date());
- basDevpService.insert(basDevp);
- return R.ok();
- }
-
- @RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth(memo = "绔欑偣淇敼")
- public R update(BasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
- return R.error();
- }
- basDevp.setModiUser(getUserId());
- basDevp.setModiTime(new Date());
- basDevpService.updateById(basDevp);
- return R.ok("淇敼瀹屾垚");
- }
-
- @RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
- List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (BasDevp entity : list){
- basDevpService.delete(new EntityWrapper<>(entity));
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basDevp/export/auth")
- @ManagerAuth(memo = "绔欑偣瀵煎嚭")
- public R export(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
- Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
- convert(map, wrapper);
- List<BasDevp> list = basDevpService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/basDevpQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
- wrapper.like("dev_no", condition);
- Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasDevp basDevp : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basDevp.getDevNo());
- map.put("value", basDevp.getDevNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/basDevp/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDevpService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
deleted file mode 100644
index 5e81cc1..0000000
--- a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.BasPlcerror;
-import com.zy.asrs.service.BasPlcerrorService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class BasPlcerrorController extends BaseController {
-
- @Autowired
- private BasPlcerrorService basPlcerrorService;
-
- @RequestMapping(value = "/basPlcerror/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(basPlcerrorService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/basPlcerror/list/auth")
- @ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
- EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basPlcerrorService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/basPlcerror/add/auth")
- @ManagerAuth
- public R add(BasPlcerror basPlcerror) {
- basPlcerror.setModiUser(getUserId());
- basPlcerror.setModiTime(new Date());
- basPlcerror.setAppeUser(getUserId());
- basPlcerror.setAppeTime(new Date());
- basPlcerrorService.insert(basPlcerror);
- return R.ok();
- }
-
- @RequestMapping(value = "/basPlcerror/update/auth")
- @ManagerAuth
- public R update(BasPlcerror basPlcerror){
- if (Cools.isEmpty(basPlcerror) || null==basPlcerror.getErrorCode()){
- return R.error();
- }
- basPlcerror.setModiUser(getUserId());
- basPlcerror.setModiTime(new Date());
- basPlcerrorService.updateById(basPlcerror);
- return R.ok();
- }
-
- @RequestMapping(value = "/basPlcerror/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam String param){
- List<BasPlcerror> list = JSONArray.parseArray(param, BasPlcerror.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (BasPlcerror entity : list){
- basPlcerrorService.delete(new EntityWrapper<>(entity));
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/basPlcerror/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("basPlcerror"));
- convert(map, wrapper);
- List<BasPlcerror> list = basPlcerrorService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/basPlcerrorQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
- wrapper.like("error_desc", condition);
- Page<BasPlcerror> page = basPlcerrorService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (BasPlcerror basPlcerror : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", basPlcerror.getErrorCode());
- map.put("value", basPlcerror.getErrorDesc());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/basPlcerror/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<BasPlcerror> wrapper = new EntityWrapper<BasPlcerror>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basPlcerrorService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasPlcerror.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
deleted file mode 100644
index c3ebf6c..0000000
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("asr_bas_devp")
-public class BasDevp implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "dev_no", type = IdType.INPUT)
- @TableField("dev_no")
- private Integer devNo;
-
- /**
- * 璁惧鎻忚堪
- */
- @ApiModelProperty(value= "璁惧鎻忚堪")
- @TableField("dec_desc")
- private String decDesc;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- @TableField("dev_mk")
- private String devMk;
-
- /**
- * 鍙叆
- */
- @ApiModelProperty(value= "鍙叆")
- @TableField("in_enable")
- private String inEnable;
-
- /**
- * 鍙嚭
- */
- @ApiModelProperty(value= "鍙嚭")
- @TableField("out_enable")
- private String outEnable;
-
- /**
- * 鑷姩
- */
- @ApiModelProperty(value= "鑷姩")
- private String autoing;
-
- /**
- * 鏈夌墿
- */
- @ApiModelProperty(value= "鏈夌墿")
- private String loading;
-
- /**
- * 鑳藉叆
- */
- @ApiModelProperty(value= "鑳藉叆")
- private String canining;
-
- /**
- * 鑳藉嚭
- */
- @ApiModelProperty(value= "鑳藉嚭")
- private String canouting;
-
- @ApiModelProperty(value= "")
- private String fronting;
-
- @ApiModelProperty(value= "")
- private String rearing;
-
- @ApiModelProperty(value= "")
- private String uping;
-
- @ApiModelProperty(value= "")
- private String downing;
-
- /**
- * 闇�姹�1
- */
- @ApiModelProperty(value= "闇�姹�1")
- private String inreq1;
-
- /**
- * 闇�姹�2
- */
- @ApiModelProperty(value= "闇�姹�2")
- private String inreq2;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_no1")
- private Integer wrkNo1;
-
- /**
- * 瀹瑰櫒绫诲瀷
- */
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
- @TableField("ctn_type")
- private Integer ctnType;
-
- /**
- * 鏉″舰鐮�
- */
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
-
- @ApiModelProperty(value= "")
- @TableField("in_qty")
- private Integer inQty;
-
- @ApiModelProperty(value= "")
- private Integer row1;
-
- @ApiModelProperty(value= "")
- @TableField("io_time")
- private Date ioTime;
-
- @ApiModelProperty(value= "")
- private String area;
-
- @ApiModelProperty(value= "")
- @TableField("in_ok")
- private String inOk;
-
- @ApiModelProperty(value= "")
- @TableField("out_ok")
- private String outOk;
-
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
- @TableField("loc_type1")
- private Short locType1;
-
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
- @TableField("loc_type2")
- private Short locType2;
-
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
- @TableField("loc_type3")
- private Short locType3;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- @TableField("std_qty")
- private Double stdQty;
-
- @ApiModelProperty(value= "")
- @TableField("min_wt")
- private Double minWt;
-
- @ApiModelProperty(value= "")
- @TableField("max_wt")
- private Double maxWt;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- @TableField("gross_wt")
- private Double grossWt;
-
- @ApiModelProperty(value= "")
- @TableField("cart_pos")
- private Integer cartPos;
-
- /**
- * 鍥涘悜绌挎杞︽墍璇嗗埆鐨勪簩缁寸爜
- */
- @ApiModelProperty(value= "鍥涘悜绌挎杞︽墍璇嗗埆鐨勪簩缁寸爜")
- @TableField("qr_code_value")
- private String qrCodeValue;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("loc_no")
- private String locNo;
-
- /**
- * 杈撻�佺嚎妤煎眰
- */
- @ApiModelProperty(value= "杈撻�佺嚎妤煎眰")
- @TableField("lev")
- private Integer lev;
-
- /**
- * 杈撻�佺嚎瀵瑰簲鎻愬崌鏈哄彿
- */
- @ApiModelProperty(value= "杈撻�佺嚎瀵瑰簲鎻愬崌鏈哄彿")
- @TableField("lift_no")
- private Integer liftNo;
-
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "浣庡簱浣�";
- case 2:
- return "楂樺簱浣�";
- default:
- return String.valueOf(this.locType1);
- }
- }
-
- public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
- case 0:
- return "鏈煡";
- case 1:
- return "绐勫簱浣�";
- case 2:
- return "瀹藉簱浣�";
- default:
- return String.valueOf(this.locType2);
- }
- }
-
- public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
- case 0:
- return "鏈煡";
- case 1:
- return "杞诲簱浣�";
- case 2:
- return "閲嶅簱浣�";
- default:
- return String.valueOf(this.locType3);
- }
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
deleted file mode 100644
index f8f681e..0000000
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("asr_bas_plcerror")
-public class BasPlcerror implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 寮傚父缂栧彿
- */
- @ApiModelProperty(value= "寮傚父缂栧彿")
- @TableId(value = "error_code", type = IdType.INPUT)
- @TableField("error_code")
- private Integer errorCode;
-
- /**
- * 寮傚父鎻忚堪
- */
- @ApiModelProperty(value= "寮傚父鎻忚堪")
- @TableField("error_desc")
- private String errorDesc;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- public BasPlcerror() {}
-
- public BasPlcerror(Integer errorCode, String errorDesc, Date modiTime, Long modiUser, Date appeTime, Long appeUser) {
- this.errorDesc = errorDesc;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- }
-
-// BasPlcerror basPlcerror = new BasPlcerror(
-// null, // 寮傚父缂栧彿[闈炵┖]
-// null, // 寮傚父鎻忚堪
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null // 鍒涘缓鑰�
-// );
-
- public Integer getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(Integer errorCode) {
- this.errorCode = errorCode;
- }
-
- public String getErrorDesc() {
- return errorDesc;
- }
-
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
deleted file mode 100644
index 07107cd..0000000
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("asr_row_lastno")
-public class RowLastno implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 绫诲埆
- */
- @ApiModelProperty(value= "绫诲埆")
- @TableId(value = "whs_type", type = IdType.INPUT)
- @TableField("whs_type")
- private Integer whsType;
-
- /**
- * 褰撳墠宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "褰撳墠宸ヤ綔鍙�")
- @TableField("wrk_mk")
- private String wrkMk;
-
- /**
- * 褰撳墠鎺掑彿
- */
- @ApiModelProperty(value= "褰撳墠鎺掑彿")
- @TableField("current_row")
- private Integer currentRow;
-
- /**
- * 璧峰鎺掑彿
- */
- @ApiModelProperty(value= "璧峰鎺掑彿")
- @TableField("s_row")
- private Integer sRow;
-
- /**
- * 缁堟鎺掑彿
- */
- @ApiModelProperty(value= "缁堟鎺掑彿")
- @TableField("e_row")
- private Integer eRow;
-
- /**
- * 鍫嗗灈鏈烘暟閲�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈烘暟閲�")
- @TableField("crn_qty")
- private Integer crnQty;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- @TableField("limint_loc")
- private Integer limintLoc;
-
- public RowLastno() {}
-
- public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
- this.wrkMk = wrkMk;
- this.currentRow = currentRow;
- this.sRow = sRow;
- this.eRow = eRow;
- this.crnQty = crnQty;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.limintLoc = limintLoc;
- }
-
-// RowLastno rowLastno = new RowLastno(
-// null, // 褰撳墠宸ヤ綔鍙穂闈炵┖]
-// null, // 褰撳墠鎺掑彿
-// null, // 璧峰鎺掑彿
-// null, // 缁堟鎺掑彿
-// null, // 鍫嗗灈鏈烘暟閲�
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null //
-// );
-
- public Integer getWhsType() {
- return whsType;
- }
-
- public void setWhsType(Integer whsType) {
- this.whsType = whsType;
- }
-
- public String getWrkMk() {
- return wrkMk;
- }
-
- public void setWrkMk(String wrkMk) {
- this.wrkMk = wrkMk;
- }
-
- public Integer getCurrentRow() {
- return currentRow;
- }
-
- public void setCurrentRow(Integer currentRow) {
- this.currentRow = currentRow;
- }
-
- public Integer getsRow() {
- return sRow;
- }
-
- public void setsRow(Integer sRow) {
- this.sRow = sRow;
- }
-
- public Integer geteRow() {
- return eRow;
- }
-
- public void seteRow(Integer eRow) {
- this.eRow = eRow;
- }
-
- public Integer getCrnQty() {
- return crnQty;
- }
-
- public void setCrnQty(Integer crnQty) {
- this.crnQty = crnQty;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Integer getLimintLoc() {
- return limintLoc;
- }
-
- public void setLimintLoc(Integer limintLoc) {
- this.limintLoc = limintLoc;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
deleted file mode 100644
index feeb779..0000000
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("asr_sta_desc")
-public class StaDesc implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 璺緞ID
- */
- @ApiModelProperty(value= "璺緞ID")
- @TableId(value = "type_id", type = IdType.AUTO)
- @TableField("type_id")
- private Long typeId;
-
- /**
- * 鍏ュ嚭搴撶被鍨�
- */
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableId(value = "type_no", type = IdType.INPUT)
- @TableField("type_no")
- private Integer typeNo;
-
- /**
- * 浣滀笟绫诲瀷
- */
- @ApiModelProperty(value= "浣滀笟绫诲瀷")
- @TableField("type_desc")
- private String typeDesc;
-
- /**
- * 浣滀笟绔欑偣
- */
- @ApiModelProperty(value= "浣滀笟绔欑偣")
- @TableId(value = "stn_no", type = IdType.INPUT)
- @TableField("stn_no")
- private Integer stnNo;
-
- /**
- * 绔欑偣鍚嶇О
- */
- @ApiModelProperty(value= "绔欑偣鍚嶇О")
- @TableField("stn_desc")
- private String stnDesc;
-
- /**
- * 鍫嗗灈鏈哄彿
- */
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableId(value = "crn_no", type = IdType.INPUT)
- @TableField("crn_no")
- private Integer crnNo;
-
- /**
- * 鍫嗗灈鏈虹珯鐐�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈虹珯鐐�")
- @TableField("crn_stn")
- private Integer crnStn;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- public StaDesc() {}
-
- public StaDesc(String typeDesc,String stnDesc,Integer crnStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.typeDesc = typeDesc;
- this.stnDesc = stnDesc;
- this.crnStn = crnStn;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// StaDesc staDesc = new StaDesc(
-// null, // 浣滀笟绫诲瀷
-// null, // 绔欑偣鍚嶇О
-// null, // 鍫嗗灈鏈虹珯鐐�
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public Long getTypeId() {
- return typeId;
- }
-
- public void setTypeId(Long typeId) {
- this.typeId = typeId;
- }
-
- public Integer getTypeNo() {
- return typeNo;
- }
-
- public void setTypeNo(Integer typeNo) {
- this.typeNo = typeNo;
- }
-
- public String getTypeDesc() {
- return typeDesc;
- }
-
- public void setTypeDesc(String typeDesc) {
- this.typeDesc = typeDesc;
- }
-
- public Integer getStnNo() {
- return stnNo;
- }
-
- public String getStnNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.stnNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public void setStnNo(Integer stnNo) {
- this.stnNo = stnNo;
- }
-
- public String getStnDesc() {
- return stnDesc;
- }
-
- public void setStnDesc(String stnDesc) {
- this.stnDesc = stnDesc;
- }
-
- public Integer getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public Integer getCrnStn() {
- return crnStn;
- }
-
- public String getCrnStn$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.crnStn);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public void setCrnStn(Integer crnStn) {
- this.crnStn = crnStn;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f32251e..3dae97c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -195,24 +195,6 @@
return null;
}
- public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
public String getSourceLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index b84f77c..0202441 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -8,7 +8,6 @@
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.mapper.BasWrkStatusMapper;
-import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.utils.Synchro;
@@ -208,24 +207,6 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
}
return null;
}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
deleted file mode 100644
index 37b4f93..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.BasDevp;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface BasDevpMapper extends BaseMapper<BasDevp> {
-
- List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
-
- List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
-
- BasDevp selectByWrkNo(Integer wrkNo);
-
- BasDevp queryByLocNo(String locNo);
-
- BasDevp queryByQrCode(Integer qrCodeValue);
-
- List<BasDevp> selectLevSite();
-
- //鑾峰彇鎸囧畾妤煎眰鏈夋彁鍗囨満鍙风殑杈撻�佺珯鐐�
- List<BasDevp> selectHasLiftNoByLev(Integer lev);
-
- //鑾峰彇鎸囧畾妤煎眰銆佹寚瀹氭彁鍗囨満鍙峰搴旂殑杈撻�佺珯鐐�
- BasDevp selectByLevAndLiftNo(Integer lev, Integer liftNo);
-}
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
deleted file mode 100644
index 93346b1..0000000
--- a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.BasPlcerror;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasPlcerrorMapper extends BaseMapper<BasPlcerror> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
deleted file mode 100644
index 34f0108..0000000
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface ReportQueryMapper {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java b/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
deleted file mode 100644
index bfb9079..0000000
--- a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.RowLastno;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface RowLastnoMapper extends BaseMapper<RowLastno> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
deleted file mode 100644
index 1518045..0000000
--- a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.StaDesc;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface StaDescMapper extends BaseMapper<StaDesc> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
deleted file mode 100644
index 7db3d1e..0000000
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.BasDevp;
-
-import java.util.List;
-
-public interface BasDevpService extends IService<BasDevp> {
-
- /**
- * 鍏ュ簱绔�
- * @return
- */
- List<Integer> getAvailableInSite();
-
- /**
- * 绌烘澘鍏ュ簱绔�
- * @return
- */
- List<Integer> getAvailableEmptyInSite();
-
- /**
- * 鍑哄簱绔�
- * @return
- */
- List<Integer> getAvailableOutSite(Integer typeNo);
-
- /**
- * 绌烘澘鍑哄簱绔�
- * @return
- */
- List<Integer> getAvailableEmptyOutSite();
-
- /**
- * 鐩爣绔欑偣鐘舵�佹娴�
- * @param devpNo
- */
- BasDevp checkSiteStatus(Integer devpNo);
-
- /**
- * 鐩爣绔欑偣鐘舵�佹娴�
- * @param devpNo
- * @param put 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
- */
- BasDevp checkSiteStatus(Integer devpNo, boolean put);
-
- BasDevp selectByWrkNo(Integer wrkNo);
-
- BasDevp queryByLocNo(String locNo);
-
- BasDevp queryByQrCode(Integer qrCodeValue);
-
- //鑾峰彇鍥涘眰妤肩珯鐐�105,106,107,108
- List<BasDevp> selectLevSite();
-
- //鑾峰彇鎸囧畾妤煎眰鏈夋彁鍗囨満鍙风殑杈撻�佺珯鐐�
- List<BasDevp> selectHasLiftNoByLev(Integer lev);
-
- //鑾峰彇鎸囧畾妤煎眰銆佹寚瀹氭彁鍗囨満鍙峰搴旂殑杈撻�佺珯鐐�
- BasDevp selectByLevAndLiftNo(Integer lev, Integer liftNo);
-
-}
diff --git a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
deleted file mode 100644
index 45c6c91..0000000
--- a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.BasPlcerror;
-
-public interface BasPlcerrorService extends IService<BasPlcerror> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/RowLastnoService.java b/src/main/java/com/zy/asrs/service/RowLastnoService.java
deleted file mode 100644
index dca50fd..0000000
--- a/src/main/java/com/zy/asrs/service/RowLastnoService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.RowLastno;
-
-public interface RowLastnoService extends IService<RowLastno> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/asrs/service/StaDescService.java
deleted file mode 100644
index b0ea462..0000000
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.StaDesc;
-
-public interface StaDescService extends IService<StaDesc> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
deleted file mode 100644
index 044a6a1..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.mapper.BasDevpMapper;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("basDevpService")
-public class BasDevpServiceImpl extends ServiceImpl<BasDevpMapper, BasDevp> implements BasDevpService {
-
- @Autowired
- private WrkMastService wrkMastService;
-
- @Override
- public List<Integer> getAvailableInSite() {
- return this.baseMapper.getAvailableInSite(1);
- }
-
- @Override
- public List<Integer> getAvailableEmptyInSite() {
- return this.baseMapper.getAvailableInSite(10);
- }
-
- @Override
- public List<Integer> getAvailableOutSite(Integer typeNo) {
- return this.baseMapper.getAvailableOutSite(typeNo);
- }
-
- @Override
- public List<Integer> getAvailableEmptyOutSite() {
- return this.baseMapper.getAvailableOutSite(110);
- }
-
- @Override
- public BasDevp checkSiteStatus(Integer devpNo) {
- return checkSiteStatus(devpNo, false);
- }
-
- @Override
- public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
- BasDevp station = selectById(devpNo);
- if (station == null){
- throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
- }
- if (put) {
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
- }
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
- }
- if(station.getWrkNo()!=null && station.getWrkNo()>0) {
- throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
- }
- }
- return station;
- }
-
- @Override
- public BasDevp selectByWrkNo(Integer wrkNo) {
- return this.baseMapper.selectByWrkNo(wrkNo);
- }
-
- @Override
- public BasDevp queryByLocNo(String locNo) {
- return this.baseMapper.queryByLocNo(locNo);
- }
-
- @Override
- public BasDevp queryByQrCode(Integer qrCodeValue) {
- return this.baseMapper.queryByQrCode(qrCodeValue);
- }
-
- @Override
- public List<BasDevp> selectLevSite() {
- return this.baseMapper.selectLevSite();
- }
-
- @Override
- public List<BasDevp> selectHasLiftNoByLev(Integer lev) {
- return this.baseMapper.selectHasLiftNoByLev(lev);
- }
-
- @Override
- public BasDevp selectByLevAndLiftNo(Integer lev, Integer liftNo) {
- return this.baseMapper.selectByLevAndLiftNo(lev, liftNo);
- }
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
deleted file mode 100644
index 0d48f6f..0000000
--- a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.BasPlcerror;
-import com.zy.asrs.mapper.BasPlcerrorMapper;
-import com.zy.asrs.service.BasPlcerrorService;
-import org.springframework.stereotype.Service;
-
-@Service("basPlcerrorService")
-public class BasPlcerrorServiceImpl extends ServiceImpl<BasPlcerrorMapper, BasPlcerror> implements BasPlcerrorService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
deleted file mode 100644
index 1a32cff..0000000
--- a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.RowLastno;
-import com.zy.asrs.mapper.RowLastnoMapper;
-import com.zy.asrs.service.RowLastnoService;
-import org.springframework.stereotype.Service;
-
-@Service("rowLastnoService")
-public class RowLastnoServiceImpl extends ServiceImpl<RowLastnoMapper, RowLastno> implements RowLastnoService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
deleted file mode 100644
index 87a3f20..0000000
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.mapper.StaDescMapper;
-import com.zy.asrs.service.StaDescService;
-import org.springframework.stereotype.Service;
-
-@Service("staDescService")
-public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService {
-
-}
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
deleted file mode 100644
index a48b937..0000000
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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.mapper.BasDevpMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp">
- <id column="dev_no" property="devNo" />
- <result column="dec_desc" property="decDesc" />
- <result column="dev_mk" property="devMk" />
- <result column="in_enable" property="inEnable" />
- <result column="out_enable" property="outEnable" />
- <result column="autoing" property="autoing" />
- <result column="loading" property="loading" />
- <result column="canining" property="canining" />
- <result column="canouting" property="canouting" />
- <result column="fronting" property="fronting" />
- <result column="rearing" property="rearing" />
- <result column="uping" property="uping" />
- <result column="downing" property="downing" />
- <result column="inreq1" property="inreq1" />
- <result column="inreq2" property="inreq2" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_no1" property="wrkNo1" />
- <result column="ctn_type" property="ctnType" />
- <result column="barcode" property="barcode" />
- <result column="in_qty" property="inQty" />
- <result column="row1" property="row1" />
- <result column="io_time" property="ioTime" />
- <result column="area" property="area" />
- <result column="in_ok" property="inOk" />
- <result column="out_ok" property="outOk" />
- <result column="loc_type1" property="locType1" />
- <result column="loc_type2" property="locType2" />
- <result column="loc_type3" property="locType3" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="std_qty" property="stdQty" />
- <result column="min_wt" property="minWt" />
- <result column="max_wt" property="maxWt" />
- <result column="gross_wt" property="grossWt" />
- <result column="cart_pos" property="cartPos" />
- <result column="qr_code_value" property="qrCodeValue" />
- <result column="loc_no" property="locNo" />
- <result column="lev" property="lev" />
- <result column="lift_no" property="liftNo" />
-
- </resultMap>
-
- <select id="getAvailableInSite" resultType="java.lang.Integer">
- select
- abd.dev_no
- from asr_bas_devp abd
- left join asr_sta_desc asd on abd.dev_no = asd.stn_no
- where 1=1
- and asd.type_no = #{typeNo}
- and abd.in_enable = 'Y'
- group by abd.dev_no
- </select>
-
- <select id="getAvailableOutSite" resultType="java.lang.Integer">
- select
- abd.dev_no
- from asr_bas_devp abd
- left join asr_sta_desc asd on abd.dev_no = asd.stn_no
- where 1=1
- and asd.type_no = #{typeNo}
- and abd.out_enable = 'Y'
- group by abd.dev_no
- </select>
-
- <select id="selectByWrkNo" resultMap="BaseResultMap">
- select top 1 *
- from asr_bas_devp
- where 1=1
- and wrk_no = #{wrkNo}
- </select>
-
- <select id="queryByLocNo" resultMap="BaseResultMap">
- select top 1 *
- from asr_bas_devp
- where 1=1
- and loc_no = #{locNo}
- </select>
-
- <select id="queryByQrCode" resultMap="BaseResultMap">
- select top 1 *
- from asr_bas_devp
- where 1=1
- and qr_code_value = #{qrCodeValue}
- </select>
-
- <select id="selectLevSite" resultMap="BaseResultMap">
- select *
- from asr_bas_devp
- where 1=1
- and dev_no in ('105','106','107','108')
- </select>
-
- <select id="selectHasLiftNoByLev" resultMap="BaseResultMap">
- select *
- from asr_bas_devp
- where 1=1
- and lev = #{lev}
- and lift_no is not null
- </select>
-
- <select id="selectByLevAndLiftNo" resultMap="BaseResultMap">
- select *
- from asr_bas_devp
- where 1=1
- and lev = #{lev}
- and lift_no = #{liftNo}
- </select>
-</mapper>
diff --git a/src/main/resources/mapper/BasPlcerrorMapper.xml b/src/main/resources/mapper/BasPlcerrorMapper.xml
deleted file mode 100644
index 58c22d4..0000000
--- a/src/main/resources/mapper/BasPlcerrorMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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.mapper.BasPlcerrorMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerror">
- <result column="error_code" property="errorCode" />
- <result column="error_desc" property="errorDesc" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/RowLastnoMapper.xml b/src/main/resources/mapper/RowLastnoMapper.xml
deleted file mode 100644
index 45639f6..0000000
--- a/src/main/resources/mapper/RowLastnoMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.mapper.RowLastnoMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RowLastno">
- <id column="whs_type" property="whsType" />
- <result column="wrk_mk" property="wrkMk" />
- <result column="current_row" property="currentRow" />
- <result column="s_row" property="sRow" />
- <result column="e_row" property="eRow" />
- <result column="crn_qty" property="crnQty" />
- <result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="limint_loc" property="limintLoc" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/StaDescMapper.xml b/src/main/resources/mapper/StaDescMapper.xml
deleted file mode 100644
index b3bde73..0000000
--- a/src/main/resources/mapper/StaDescMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.mapper.StaDescMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.StaDesc">
- <id column="type_id" property="typeId" />
- <result column="type_no" property="typeNo" />
- <result column="type_desc" property="typeDesc" />
- <result column="stn_no" property="stnNo" />
- <result column="stn_desc" property="stnDesc" />
- <result column="crn_no" property="crnNo" />
- <result column="crn_stn" property="crnStn" />
- <result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
-
- </resultMap>
-
-</mapper>
--
Gitblit v1.9.1