From 2ff08d144935938b91af4e725577882976ef4627 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 01 八月 2024 08:52:39 +0800
Subject: [PATCH] #
---
/dev/null | 58 -----------
zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java | 8 -
zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java | 48 ---------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java | 4
zy-asrs-common/pom.xml | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java | 128 +++++++++++++++++++++++++
pom.xml | 4
9 files changed, 137 insertions(+), 121 deletions(-)
diff --git a/pom.xml b/pom.xml
index 40ef06b..3827d25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,12 +57,12 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.1</version>
+ <version>3.5.7</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
- <version>3.4.1</version>
+ <version>3.5.7</version>
</dependency>
<!-- swagger -->
<dependency>
diff --git a/zy-asrs-common/pom.xml b/zy-asrs-common/pom.xml
index fd8e498..eeaf885 100644
--- a/zy-asrs-common/pom.xml
+++ b/zy-asrs-common/pom.xml
@@ -39,12 +39,12 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.1</version>
+ <version>3.5.7</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
- <version>3.4.1</version>
+ <version>3.5.7</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/DetlDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/DetlDto.java
deleted file mode 100644
index d852ca0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/DetlDto.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.framework.common.Cools;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Created by vincent on 2022/3/25
- */
-@Data
-public class DetlDto {
-
- private String orderNo;
-
- private String matnr;
-
- private String batch;
-
- private Double anfme;
-
- private String posnr;
-
- private String memo;
-
- public DetlDto() {
- }
-
- public DetlDto(String matnr, Double anfme) {
- this.matnr = matnr;
- this.anfme = anfme;
- }
-
- public DetlDto(String matnr, String batch) {
- this.matnr = matnr;
- this.batch = batch;
- }
-
- public DetlDto(String matnr, String batch, Double anfme) {
- this.matnr = matnr;
- this.batch = batch;
- this.anfme = anfme;
- }
-
- public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
- this.orderNo = orderNo;
- this.matnr = matnr;
- this.batch = batch;
- this.anfme = anfme;
- }
- public DetlDto(String matnr, String batch, Double anfme , String memo) {
- this.memo= memo;
- this.matnr = matnr;
- this.batch = batch;
- this.anfme = anfme;
- }
-
- public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
- for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr())) {
- return true;
- }
- } else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
- for (DetlDto dto : detlDtos) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
- return true;
- }
- }
- return false;
- }
-
- public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
- if (Cools.isEmpty(matnr)) {
- return null;
- }
- for (DetlDto detlDto : detlDtos) {
- if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
- return detlDto;
- }
- }
- return null;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java
deleted file mode 100644
index 9a47fbf..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDetlDto.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.zy.asrs.common.wms.entity.LocDetl;
-
-/**
- * Created by vincent on 2020/6/17
- */
-public class LocDetlDto {
-
- private LocDetl locDetl;
-
- private Double count;
-
- public LocDetlDto() {
- }
-
- public LocDetlDto(LocDetl locDetl, Double count) {
- this.locDetl = locDetl;
- this.count = count;
- }
-
- public LocDetl getLocDetl() {
- return locDetl;
- }
-
- public void setLocDetl(LocDetl locDetl) {
- this.locDetl = locDetl;
- }
-
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
- this.count = count;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDto.java
deleted file mode 100644
index 100df12..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocDto.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.zy.asrs.framework.common.Cools;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2022/3/28
- */
-@Data
-public class LocDto {
-
- private String locNo;
-
- private String matnr;
-
- private String maktx;
-
- private String batch;
-
- private String orderNo;
-
- private Double anfme;
-
- private boolean lack = false;
-
- private List<Integer> staNos;
-
- private Integer staNo;
-
- public LocDto() {
- }
-
- public LocDto(String locNo, String matnr, String batch, Double anfme) {
- this.locNo = locNo;
- this.matnr = matnr;
- this.batch = batch;
- this.anfme = anfme;
- }
-
- public LocDto(String locNo, String matnr, String batch, String orderNo, Double anfme) {
- this.locNo = locNo;
- this.matnr = matnr;
- this.batch = batch;
- this.orderNo = orderNo;
- this.anfme = anfme;
- }
-
- public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
- this.locNo = locNo;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.orderNo = orderNo;
- this.anfme = anfme;
- }
-
- public String getTitle() {
- return this.matnr + "锛�" + this.maktx + "锛�";
- }
-
- public void setStaNos(List<Integer> staNos) {
- this.staNos = staNos;
- if (!Cools.isEmpty(staNos)) {
- this.staNo = staNos.get(0);
- }
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocRangeDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocRangeDto.java
deleted file mode 100644
index 02f2b31..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocRangeDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import lombok.Data;
-
-@Data
-public class LocRangeDto {
-
- //璧峰鎺�
- private Integer startRow;
-
- //缁撴潫鎺�
- private Integer targetRow;
-
- //璧峰鍒�
- private Integer startBay;
-
- //缁撴潫鍒�
- private Integer targetBay;
-
- //璧峰灞�
- private Integer startLev;
-
- //缁撴潫灞�
- private Integer targetLev;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocTypeDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocTypeDto.java
deleted file mode 100644
index 16464f9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/LocTypeDto.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.asrs.common.wms.entity.BasDevp;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Created by vincent on 2020/10/19
- */
-@Slf4j
-@Data
-public class LocTypeDto {
-
- // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
- private Short locType1;
-
- // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
- private Short locType2;
-
- // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
- private Short locType3;
-
- //搴撲綅鎼滅储鑼冨洿
- private LocRangeDto locRangeDto;
-
- public LocTypeDto() {
- }
-
- public LocTypeDto(BasDevp basDevp) {
- if (basDevp.getLocType1() == null || basDevp.getLocType1() == 0) {
- throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
- }
- if (basDevp.getLocType1() == 1) {
- this.locType1 = 1; // 浣庡簱浣�
- } else {
- this.locType1 = 2; // 楂樺簱浣�
- }
- log.info(JSON.toJSONString(this));
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java
deleted file mode 100644
index 07e8acb..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OrderDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.zy.asrs.framework.common.Cools;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2022/8/18
- */
-@Data
-public class OrderDto {
-
- private String orderNo;
-
- private String matnr;
-
- private Double anfme;
-
- public OrderDto(String orderNo, String matnr, Double anfme) {
- this.orderNo = orderNo;
- this.matnr = matnr;
- this.anfme = anfme;
- }
-
- public static boolean has(List<OrderDto> list, OrderDto dto) {
- if (Cools.isEmpty(list)) {
- return false;
- }
- for (OrderDto orderDto : list) {
- if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
- return true;
- }
- }
- return false;
- }
-
- public static OrderDto find(List<OrderDto> list, OrderDto dto) {
- if (Cools.isEmpty(list)) {
- return null;
- }
- for (OrderDto orderDto : list) {
- if (dto.getOrderNo().equals(orderDto.getOrderNo()) && dto.getMatnr().equals(orderDto.getMatnr())) {
- return orderDto;
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java
deleted file mode 100644
index 45f415f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/OutLocDto.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/6/17
- */
-@Data
-public class OutLocDto {
-
- private String locNo;
-
- private Long hostId;
-
- private List<LocDetlDto> locDetlDtos = new ArrayList<>();
-
- public OutLocDto() {
- }
-
- public OutLocDto(String locNo, LocDetlDto locDetlDto, Long hostId) {
- this.locNo = locNo;
- this.locDetlDtos.add(locDetlDto);
- this.hostId = hostId;
- }
-
- public boolean isAll(){
- List<LocDetlDto> locDetlDtosCp = new ArrayList<>(this.locDetlDtos);
- // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
- LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, this.locNo).eq(LocDetl::getHostId, this.hostId));
- if (locDetls == null || locDetls.isEmpty()){
- throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
- }
- int sameNumber = 0;
- for (LocDetl locDetl : locDetls) {
- Iterator<LocDetlDto> iterator = locDetlDtosCp.iterator();
- while (iterator.hasNext()) {
- LocDetlDto next = iterator.next();
- if (!next.getLocDetl().getMatnr().equals(locDetl.getMatnr())) {
- continue;
- }
- if (!Cools.eq(next.getLocDetl().getBatch(), locDetl.getBatch())) {
- continue;
- }
- if (next.getCount() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- }
- if (next.getCount().equals(locDetl.getAnfme())) {
- sameNumber++;
- iterator.remove();
- break;
- }
- }
- }
- return sameNumber == locDetls.size();
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/QueryStockPreDo.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/QueryStockPreDo.java
deleted file mode 100644
index 6641201..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/QueryStockPreDo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2022/8/18
- */
-@Data
-public class QueryStockPreDo {
-
- private Integer no;
-
- private Integer bay;
-
- private Double count;
-
- private String orderBy;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/ReportStockDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/ReportStockDto.java
deleted file mode 100644
index aaa6479..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/ReportStockDto.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import lombok.Data;
-
-@Data
-public class ReportStockDto {
-
- //鐗╂枡鍙�
- private String matnr;
-
- //鎵瑰彿
- private String batch;
-
- //鎬婚噺
- private Double anfme;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java
deleted file mode 100644
index 0ba8265..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.framework.common.SpringUtils;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2021/3/25
- */
-@Data
-public class SafeStoDo {
-
- private Long id;
-
- private String locNo;
-
- private String matnr;
-
- private String maktx;
-
- private Double safeQua;
-
- private Long hostId;
-
- public String getLocNo$() {
- if (this.locNo == null) {
- return "鍏ㄩ儴";
- }
- return this.locNo;
- }
-
- public Double getAmount() {
- Double sum = 0.0;
- LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
- LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getMatnr, this.matnr).eq(LocDetl::getHostId, this.hostId);
- if (this.locNo != null) {
- wrapper.eq(LocDetl::getLocNo, this.locNo);
- }
- List<LocDetl> list = locDetlService.list(wrapper);
- for (LocDetl locDetl : list) {
- sum += locDetl.getAnfme();
- }
- return sum;
- }
-
- public Integer getStatus() {
- Integer status = 1;
- Double amount = getAmount();
- double percent = amount / safeQua;
- if (percent >= 1) {
- status = 1;//婊′粨
- } else if (percent >= 0.75) {
- status = 2;//瀹夊叏
- }else {
- status = 3;//鍗遍櫓
- }
- return status;
- }
-
- public String getProgress() {
- Double amount = getAmount();
- double percent = (amount / safeQua) * 100;
- return String.valueOf(percent) + "%";
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDto.java
deleted file mode 100644
index 92b45d4..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/SafeStoDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2021/5/3
- */
-@Data
-public class SafeStoDto {
-
- private Long id;
-
- private String locNo;
-
- private String nodeName;
-
- private Long matId;
-
- private String matnr;
-
- private Double safeQua;
-
- private String memo;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/StartupDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/StartupDto.java
deleted file mode 100644
index d68a515..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/StartupDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/6/11
- */
-@Data
-public class StartupDto {
-
- private Integer sourceStaNo;
-
- private Integer staNo;
-
- private Integer crnNo;
-
- private String locNo;
-
- private Integer workNo;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java
deleted file mode 100644
index 9cc4fae..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/TaskDto.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/3/28
- */
-@Data
-public class TaskDto {
-
- private String locNo;
-
- private Integer staNo;
-
- private Long hostId;
-
- private List<LocDto> locDtos;
-
- {
- locDtos = new ArrayList<>();
- }
-
- public TaskDto(String locNo, Integer staNo, Long hostId) {
- this.locNo = locNo;
- this.staNo = staNo;
- this.hostId = hostId;
- }
-
- public TaskDto(String locNo, Integer staNo, LocDto locDto, Long hostId) {
- this.locNo = locNo;
- this.staNo = staNo;
- this.locDtos.add(locDto);
- this.hostId = hostId;
- }
-
- public TaskDto(String locNo, Integer staNo, List<LocDto> locDtos, Long hostId) {
- this.locNo = locNo;
- this.staNo = staNo;
- this.locDtos = locDtos;
- this.hostId = hostId;
- }
-
- public static boolean has(List<TaskDto> list, TaskDto dto) {
- if (Cools.isEmpty(list)) {
- return false;
- }
- for (TaskDto taskDto : list) {
- if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getStaNo().equals(dto.getStaNo())) {
- return true;
- }
- }
- return false;
- }
-
- public static TaskDto find(List<TaskDto> list, TaskDto dto) {
- if (Cools.isEmpty(list)) {
- return null;
- }
- for (TaskDto taskDto : list) {
- if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getStaNo().equals(dto.getStaNo())) {
- return taskDto;
- }
- }
- return null;
- }
-
- public boolean isAll(){
- // 姹囨�讳笉鑰冭檻搴忓垪鐮�
- List<DetlDto> detlDtos = new ArrayList<>();
- for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
- if (DetlDto.has(detlDtos, dto)) {
- DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
- } else {
- detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme()));
- }
- }
-
- // 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
- LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, this.locNo).eq(LocDetl::getHostId, hostId));
- if (locDetls == null || locDetls.isEmpty()){
- throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
- }
- int sameNumber = 0;
- for (LocDetl locDetl : locDetls) {
- Iterator<DetlDto> iterator = detlDtos.iterator();
- while (iterator.hasNext()) {
- DetlDto dto = iterator.next();
- if (!dto.getMatnr().equals(locDetl.getMatnr())) {
- continue;
- }
- if (Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
- continue;
- }
- if (!Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(locDetl.getBatch())) {
- continue;
- }
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(locDetl.getBatch())) {
- if (!dto.getBatch().equals(locDetl.getBatch())) {
- continue;
- }
- }
- if (dto.getAnfme() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- }
- if (dto.getAnfme().equals(locDetl.getAnfme())) {
- sameNumber++;
- iterator.remove();
- break;
- }
- }
- }
- return sameNumber == locDetls.size();
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkDto.java
deleted file mode 100644
index e353eb5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/5/13
- */
-@Data
-public class WrkDto {
-
- private Integer wrkNo;
-
- private List<WrkDetl> wrkDetls = new ArrayList<>();
-
- public WrkDto() {
- }
-
- public WrkDto(Integer wrkNo, WrkDetl wrkDetl) {
- this.wrkNo = wrkNo;
- this.wrkDetls .add(wrkDetl);
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkTraceVo.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkTraceVo.java
deleted file mode 100644
index de68dd0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/dto/WrkTraceVo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.asrs.common.domain.dto;
-
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/7/22
- */
-@Data
-public class WrkTraceVo {
-
- private Integer wrkNo;
-
- private String ioTimeStr;
-
- private WrkMast wrkMast;
-
- private List<WrkDetl> wrkDetls = new ArrayList<>();
-
- private List<DetlDto> detlDtos = new ArrayList<>();
-
- public WrkTraceVo(Integer wrkNo, String ioTimeStr, WrkMast wrkMast, WrkDetl wrkDetl) {
- this.wrkNo = wrkNo;
- this.ioTimeStr = ioTimeStr;
- this.wrkMast = wrkMast;
- this.wrkDetls.add(wrkDetl);
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
deleted file mode 100644
index 21db862..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.asrs.common.domain.entity;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.zy.asrs.common.wms.entity.Mat;
-import lombok.Data;
-
-/**
- * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
- * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
- * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
- */
-@Data
-@ExcelIgnoreUnannotated
-public class MatExcel extends Mat {
-
- @ExcelProperty(index = 0, value = "涓�绾у垎绫�")
- private String priClass;
-
- @ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
- private String secClass;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java
deleted file mode 100644
index 774b212..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatPrint.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zy.asrs.common.domain.entity;
-
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/6/8
- */
-@Data
-public class MatPrint {
-
- /**
- * 鐗╂枡缂栫爜
- */
- private String matnr;
-
- /**
- * SKC
- */
- private String barcode;
-
- /**
- * 鐗╂枡鍚嶇О
- */
- private String maktx;
-
- /**
- * 鐗╂枡鍗曚綅
- */
- private String unit;
-
- /**
- * 鐗╂枡瑙勬牸
- */
- private String specs;
-
- /**
- * 澶囨敞
- */
- private String memo;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MobileAdjustResult.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MobileAdjustResult.java
deleted file mode 100644
index 6175d5a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MobileAdjustResult.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.common.domain.entity;
-
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2022/4/13
- */
-@Data
-public class MobileAdjustResult {
-
- private Integer staNo;
-
- private Integer wrkNo;
-
- private List<WrkDetl> wrkDetls;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java
deleted file mode 100644
index 357137d..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.zy.asrs.common.domain.entity;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * Created by vincent on 2021/7/20
- */
-@Data
-@ExcelIgnoreUnannotated
-public class SafeStoExport {
-
- @ExcelProperty(index = 0, value = "璐т綅")
- private String node_name;
-
- @ExcelProperty(index = 1, value = "鍟嗗搧缂栧彿")
- private String matnr;
-
- @ExcelProperty(index = 2, value = "鍟嗗搧鍚嶇О")
- private String maktx;
-
- @ExcelProperty(index = 3, value = "瀹夊叏搴撳瓨閲�")
- private Double safe_qua;
-
- @ExcelProperty(index = 4, value = "褰撳墠搴撳瓨閲�")
- private Double amount;
-
- @ExcelProperty(index = 5, value = "鍗犵敤鐧惧垎姣�")
- private String progress;
-
- @ExcelProperty(index = 6, value = "璀︽姤绛夌骇")
- private String status;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/Shelves.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/Shelves.java
deleted file mode 100644
index d5822b5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/Shelves.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.zy.asrs.common.domain.entity;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.asrs.framework.common.Arith;
-import com.zy.asrs.framework.exception.CoolException;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * <strong>绔嬪簱璐ф灦瀹炰綋绫�</strong>
- * Created by vincent on 2020/6/11
- */
-public class Shelves {
-
- // 璐ф灦鎺掓暟閲�
- public final int size;
-
- // 璐ф灦缁勬暟閲�
- public final int group;
-
- // 鍋忕Щ閲廩default:0]
- public final int offset;
-
- // 璐ф灦瀹炰緥鑺傜偣闆嗗悎
- public List<List<Integer>> nodes;
-
- public Shelves(int size, int group) {
- this(size, group, 0);
- }
-
- /**
- * @param size 璐ф灦鍗曟帓鎬绘暟
- * @param group 璐ф灦缁勬暟閲�
- * @param offset 搴忓垪鍙峰亸绉婚噺
- */
- public Shelves(int size, int group, int offset) {
- this.size = size;
- this.group = group;
- this.offset = offset;
- init();
- }
-
- /**
- * 鍒濆鍖栨柟娉曘�愮鏈夈��
- */
- private void init(){
- if (group == 0 || size%group != 0) {
- throw new RuntimeException("shelves init fail!");
- }
- nodes = new ArrayList<>();
- for (int g = 1; g <= this.group; g++){
- int unit = size/group;
- List<Integer> node = new ArrayList<>();
- for (int i = (g-1)*unit+1+offset ; i <= g*unit+offset; i++){
- node.add(i);
- }
- nodes.add(node);
- }
- }
-
- /**
- * 寮�濮嬭绠� =======>>>
- *
- * 璐ф灦鍛戒腑瑙勫垯濡備笅锛�
- * 瀹夎浣嶇疆锛� [1] [2] | [3] [4] -------- [5] [6] | [7] [8]
- * 鍛戒腑椤哄簭锛� 1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 7 -> 1 ...
- *
- * 1.璇ヨ鍒欓�備笉闄愬埗璐ф灦鏁伴噺锛屾�绘暟涓庣粍鍒湪鏋勯�犲櫒涓缃�
- * 2.濡傛湁搴忓垪鍙疯捣濮嬮棶棰橈紝鐢ㄥ亸绉婚噺瑙勯伩鍗冲彲
- *
- * @param curSeq 褰撳墠璐ф灦鍙�
- * @return 瑙勫垯鍛戒腑璐ф灦鍙�
- */
- public int start(int curSeq){
- Iterator<List<Integer>> iterator = nodes.iterator();
- while (iterator.hasNext()){
- List<Integer> node = iterator.next();
- if (node.contains(curSeq)) {
- int idx = node.indexOf(curSeq);
- // 鏄惁涓烘湯灏捐揣鏋�
- if (iterator.hasNext()) {
- return iterator.next().get(idx);
- } else {
- List<Integer> first = nodes.get(0);
- int val = first.get(idx);
- int res = size / group + 1 + offset - val;
- // 鍙嶅悜鍛戒腑璐ф灦鏃朵笉鍐嶆槸瀵圭珛涓嬫爣锛堢浉瀵逛簬宸烽亾锛�
- if (res < val) {
- // 杞鎵�鏈夎揣鏋跺悗閲嶆柊寮�濮嬪畾浣�
- if (val - res - offset == 1) {
- return first.get(0);
- }
- res = res + 1;
- }
- return res + offset;
- }
- }
- }
- return -1;
- }
-
- public Integer get(Integer curRow) {
- for (List<Integer> node : nodes){
- if (node.contains(curRow)) {
- return nodes.indexOf(node) + 1;
- }
- }
- throw new CoolException("璐ф帓妫�绱㈢郴缁熸姤閿欙紝 node:" + JSON.toJSONString(nodes) + ", curRow:" + curRow);
- }
-
- public static void main(String[] args) throws InterruptedException {
-
- double remainder = Arith.divides(1,16 - 1, 16);
- System.out.println(remainder);
- System.out.println((int) remainder);
-// Shelves shelves = new Shelves(8,2);
-// System.out.println(shelves.nodes.toString());
-// int start = 1;
-// while (true) {
-// System.out.println(start);
-// start = shelves.start(start);
-// Thread.sleep(500L);
-// }
- }
-
-}
-
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
deleted file mode 100644
index 3c328bb..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/StaDesc.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.zy.asrs.common.domain.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.zy.asrs.common.wms.entity.BasDevp;
-import com.zy.asrs.common.wms.entity.BasWrkIotype;
-import com.zy.asrs.common.wms.service.BasDevpService;
-import com.zy.asrs.common.wms.service.BasWrkIotypeService;
-import org.springframework.format.annotation.DateTimeFormat;
-
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-
-@Data
-@TableName("common_sta_desc")
-public class StaDesc implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 璺緞ID
- */
- @ApiModelProperty(value= "璺緞ID")
- @TableId(value = "type_id", type = IdType.AUTO)
- private Long typeId;
-
- /**
- * 鍏ュ嚭搴撶被鍨�
- */
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableField("type_no")
- private Integer typeNo;
-
- /**
- * 浣滀笟绫诲瀷
- */
- @ApiModelProperty(value= "浣滀笟绫诲瀷")
- private String typeDesc;
-
- /**
- * 浣滀笟绔欑偣
- */
- @ApiModelProperty(value= "浣滀笟绔欑偣")
- @TableField("stn_no")
- private Integer stnNo;
-
- /**
- * 绔欑偣鍚嶇О
- */
- @ApiModelProperty(value= "绔欑偣鍚嶇О")
- private String stnDesc;
-
- /**
- * 鍫嗗灈鏈哄彿
- */
- @ApiModelProperty(value= "璁惧鍙�")
- @TableField("device_no")
- private Integer deviceNo;
-
- /**
- * 鍫嗗灈鏈虹珯鐐�
- */
- @ApiModelProperty(value= "璁惧绔欑偣")
- private Integer deviceStn;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public StaDesc() {}
-
- public StaDesc(Integer typeNo,String typeDesc,Integer stnNo,String stnDesc,Integer deviceNo,Integer deviceStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Long hostId) {
- this.typeNo = typeNo;
- this.typeDesc = typeDesc;
- this.stnNo = stnNo;
- this.stnDesc = stnDesc;
- this.deviceNo = deviceNo;
- this.deviceStn = deviceStn;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.hostId = hostId;
- }
-
-// StaDesc staDesc = new StaDesc(
-// null, // 鍏ュ嚭搴撶被鍨媅闈炵┖]
-// null, // 浣滀笟绫诲瀷
-// null, // 浣滀笟绔欑偣[闈炵┖]
-// null, // 绔欑偣鍚嶇О
-// null, // 鍫嗗灈鏈哄彿[闈炵┖]
-// null, // 鍫嗗灈鏈虹珯鐐�
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getTypeNo$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.getById(this.typeNo);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getStnNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.getById(this.stnNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getDeviceStn$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.getById(this.deviceStn);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/ApiType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/ApiType.java
deleted file mode 100644
index 9d5b271..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/ApiType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zy.asrs.common.domain.enums;
-
-public enum ApiType {
-
- ORDER_COMPLETE("order_complete", "璁㈠崟瀹屾垚"),
- ORDER_CANCEL("order_cancel", "璁㈠崟鍙栨秷"),
- REPORT_STOCK("report_stock", "搴撳瓨涓婃姤"),
- ;
- public String type;
- public String desc;
-
- ApiType(String type, String desc) {
- this.type = type;
- this.desc = desc;
- }
-
- public static ApiType get(String id) {
- if (null == id) {
- return null;
- }
- for (ApiType type : ApiType.values()) {
- if (type.type.equals(id)) {
- return type;
- }
- }
- return null;
- }
-
- public static ApiType get(ApiType type) {
- if (null == type) {
- return null;
- }
- for (ApiType type1 : ApiType.values()) {
- if (type1 == type) {
- return type1;
- }
- }
- return null;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java
deleted file mode 100644
index d812c34..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/IoWorkType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.domain.enums;
-
-public enum IoWorkType {
-
- ALL_IN,
- PICK_IN,
- ALL_OUT,
- PICK_OUT,
- CHECK_OUT,
- ;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/OrderSettleType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/OrderSettleType.java
deleted file mode 100644
index ac66f93..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/OrderSettleType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.zy.asrs.common.domain.enums;
-
-public enum OrderSettleType {
-
- INIT(0, "鍒濆鍖�"),
- PENDING(1, "寰呭鐞�"),
- WORKING(2, "浣滀笟涓�"),
- CANCEL(3, "宸插彇娑�"),
- COMPLETE(4, "宸插畬鎴�"),
- PREPARE_CANCEL(5, "鍑嗗鍙栨秷"),
- REPORT_COMPLETE(6, "涓婃姤瀹屾垚")
- ;
-
- public Integer id;
- public String desc;
-
- OrderSettleType(Integer id, String desc) {
- this.id = id;
- this.desc = desc;
- }
-
- public static OrderSettleType get(Integer id) {
- if (null == id) {
- return null;
- }
- for (OrderSettleType type : OrderSettleType.values()) {
- if (type.id.equals(id)) {
- return type;
- }
- }
- return null;
- }
-
- public static OrderSettleType get(OrderSettleType type) {
- if (null == type) {
- return null;
- }
- for (OrderSettleType type1 : OrderSettleType.values()) {
- if (type1 == type) {
- return type1;
- }
- }
- return null;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java
deleted file mode 100644
index 59cf9d5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/enums/WorkNoType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.zy.asrs.common.domain.enums;
-
-import com.zy.asrs.framework.exception.CoolException;
-
-/**
- * 宸ヤ綔鍙锋帓搴忚鍒�
- */
-public enum WorkNoType {
-
- PAKIN(0),
- PICK(1),
- PAKOUT(2),
- OTHER(3),
- ;
-
- public Integer type;
-
- WorkNoType(Integer type) {
- this.type = type;
- }
-
- public static Integer getWorkNoType(Integer ioType) {
- switch (ioType) {
- case 1:
- return PAKIN.type;
- case 10:
- return PAKIN.type;
- case 11:
- return PICK.type;
- case 53:
- case 54:
- case 57:
- return PICK.type;
- case 101:
- return PAKOUT.type;
- case 103:
- case 104:
- case 107:
- return PICK.type;
- case 110:
- return PAKOUT.type;
- default:
- break;
- }
- throw new CoolException(ioType + "鐨勪换鍔＄被鍨嬫棤娉曠敓鎴愬伐浣滃彿");
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java
deleted file mode 100644
index 3ba847a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/FullStoreParam.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2020/6/11
- */
-@Data
-public class FullStoreParam {
-
- // 鎵樼洏鏉＄爜
- private String barcode;
-
- // 绔欑偣缂栧彿
- private Integer devpNo;
-
- // 鐗╂枡鍒楄〃鏁版嵁
- private List<MatCodeStore> list;
-
- //搴撲綅鎼滅储鑼冨洿
- private LocRangeDto locRangeDto;
-
- // 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
- private Short locType1;
-
- @Data
- public static class MatCodeStore {
-
- // 鐗╂枡缂栧彿
- private String matnr;
-
- // 鎵瑰彿
- private String batch;
-
- // 鐗╂枡鏁伴噺
- private Double anfme;
-
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocDetlAdjustParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocDetlAdjustParam.java
deleted file mode 100644
index 2969907..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocDetlAdjustParam.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.zy.asrs.framework.common.Cools;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/6/18
- */
-@Data
-public class LocDetlAdjustParam {
-
- // 搴撲綅鍙�
- private String locNo;
-
- // 璋冩暣搴撳瓨鏄庣粏闆嗗悎
- private List<LocDetlAdjust> list;
-
- @Data
- public static class LocDetlAdjust {
-
- // 鍟嗗搧缂栧彿
- private String matnr;
-
- // 搴忓垪鐮�
- private String batch;
-
- // 鍙樻洿鏁伴噺
- private Double count;
-
- public LocDetlAdjust(String matnr, String batch, Double count) {
- this.matnr = matnr;
- this.batch = batch;
- this.count = count;
- }
- }
-
- public void integrate() {
- if (Cools.isEmpty(list)) {
- return;
- }
- List<LocDetlAdjust> copyList = new ArrayList<>();
- for (LocDetlAdjust adjust : list) {
- boolean exit = false;
- for (LocDetlAdjust copy : copyList) {
- if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
- copy.setCount(copy.getCount() + adjust.getCount());
- exit = true;
- break;
- }
- }
- if (!exit) {
- copyList.add(new LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount()));
- }
- }
- list = copyList;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocMastInitParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocMastInitParam.java
deleted file mode 100644
index 08e5505..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/LocMastInitParam.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.exception.CoolException;
-
-/**
- * Created by vincent on 2020/6/13
- */
-public class LocMastInitParam {
-
- // 璧峰鎺�
- private Integer startRow;
-
- // 缁堟鎺�
- private Integer endRow;
-
- // 璧峰鍒�
- private Integer startBay;
-
- // 缁堟鍒�
- private Integer endBay;
-
- // 璧峰灞�
- private Integer startLev;
-
- // 缁堟灞�
- private Integer endLev;
-
- // 鍫嗗灈鏈烘暟閲�
- private Integer crnAmount;
-
- // 楂樹綆绫诲瀷锛� 1锛氫綆搴撲綅 2锛氶珮搴撲綅
- private Short locType1;
-
- // 瀹界獎绫诲瀷锛� 1锛氱獎搴撲綅 2锛氬搴撲綅
- private Short locType2;
-
- // 杞婚噸绫诲瀷锛� 1锛氳交搴撲綅 2锛氶噸搴撲綅
- private Short locType3;
-
- public Integer getStartRow() {
- if (null == startRow) {
- throw new CoolException(BaseRes.PARAM);
- }
- return startRow;
- }
-
- public void setStartRow(Integer startRow) {
- this.startRow = startRow;
- }
-
- public Integer getEndRow() {
- if (null == endRow) {
- throw new CoolException(BaseRes.PARAM);
- }
- return endRow;
- }
-
- public void setEndRow(Integer endRow) {
- this.endRow = endRow;
- }
-
- public Integer getStartBay() {
- if (null == startBay) {
- throw new CoolException(BaseRes.PARAM);
- }
- return startBay;
- }
-
- public void setStartBay(Integer startBay) {
- this.startBay = startBay;
- }
-
- public Integer getEndBay() {
- if (null == endBay) {
- throw new CoolException(BaseRes.PARAM);
- }
- return endBay;
- }
-
- public void setEndBay(Integer endBay) {
- this.endBay = endBay;
- }
-
- public Integer getStartLev() {
- if (null == startLev) {
- throw new CoolException(BaseRes.PARAM);
- }
- return startLev;
- }
-
- public void setStartLev(Integer startLev) {
- this.startLev = startLev;
- }
-
- public Integer getEndLev() {
- if (null == endLev) {
- throw new CoolException(BaseRes.PARAM);
- }
- return endLev;
- }
-
- public void setEndLev(Integer endLev) {
- this.endLev = endLev;
- }
-
- public Integer getCrnAmount() {
- if (crnAmount == null) {
- throw new CoolException(BaseRes.PARAM);
- }
- return crnAmount;
- }
-
- public void setCrnAmount(Integer crnAmount) {
- this.crnAmount = crnAmount;
- }
-
- public Short getLocType1() {
- return locType1;
- }
-
- public void setLocType1(Short locType1) {
- this.locType1 = locType1;
- }
-
- public Short getLocType2() {
- return locType2;
- }
-
- public void setLocType2(Short locType2) {
- this.locType2 = locType2;
- }
-
- public Short getLocType3() {
- return locType3;
- }
-
- public void setLocType3(Short locType3) {
- this.locType3 = locType3;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/MobileAdjustParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/MobileAdjustParam.java
deleted file mode 100644
index 11610a4..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/MobileAdjustParam.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2022/4/13
- */
-@Data
-public class MobileAdjustParam {
-
- private Integer staNo;
-
- private Integer wrkNo;
-
- private List<WrkDetl> wrkDetls;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakinParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakinParam.java
deleted file mode 100644
index 874eaa6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakinParam.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.zy.asrs.common.domain.dto.DetlDto;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2022/4/8
- */
-@Data
-public class OpenOrderPakinParam {
-
- private String orderNo;
-
- private String orderType;
-
- private String orderTime;
-
- private Long hostId;
-
- private List<DetlDto> orderDetails;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakoutParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakoutParam.java
deleted file mode 100644
index add6ac6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OpenOrderPakoutParam.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.framework.common.DateUtils;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/4/8
- */
-@Data
-public class OpenOrderPakoutParam {
-
- private String orderNo;
-
- private String orderType;
-
- private String orderTime;
-
- private List<DetlDto> orderDetails;
-
- private String lgort;
-
- private Long hostId;
-
- public static void main(String[] args) {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- param.setOrderNo("LXT12321321");
- param.setOrderType("浜よ揣鍗�");
- param.setOrderTime(DateUtils.convert(new Date()));
- List<DetlDto> orderDetails = new ArrayList<>();
- param.setOrderDetails(orderDetails);
- DetlDto detlDto = new DetlDto("15099-10000", 3.0);
- orderDetails.add(detlDto);
- System.out.println(JSON.toJSONString(param));
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OrderDomainParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OrderDomainParam.java
deleted file mode 100644
index 562c27e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/OrderDomainParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2022/3/24
- */
-@Data
-public class OrderDomainParam {
-
- private Long orderId;
-
- private Long docType;
-
- private String orderNo;
-
- private List<OrderDetl> orderDetlList;
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/SearchLocParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/SearchLocParam.java
deleted file mode 100644
index 2c911b9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/SearchLocParam.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zy.asrs.common.domain.param;
-
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import lombok.Data;
-
-/**
- * Created by vincent on 2020/10/30
- */
-@Data
-public class SearchLocParam {
-
- private Integer ioType;
-
- private Integer sourceStaNo;
-
- private String barcode;
-
- // 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
- private Short locType1;
-
- private Long hostId;
-
- //搴撲綅鎼滅储鑼冨洿
- private LocRangeDto locRangeDto;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiList.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiList.java
deleted file mode 100644
index 60499c5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiList.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.zy.asrs.common.openapi.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.domain.enums.ApiType;
-import org.springframework.format.annotation.DateTimeFormat;
-
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("openapi_api_list")
-public class ApiList implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 涓婃姤URL
- */
- @ApiModelProperty(value= "涓婃姤URL")
- private String url;
-
- /**
- * 涓婃姤绫诲瀷
- */
- @ApiModelProperty(value= "涓婃姤绫诲瀷")
- private String type;
-
- /**
- * 鏄惁寮�鍚� 0: 鍏抽棴 1: 寮�鍚�
- */
- @ApiModelProperty(value= "鏄惁寮�鍚� 0: 鍏抽棴 1: 寮�鍚� ")
- private Integer status;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- public ApiList() {}
-
- public ApiList(String url,String type,Integer status,Long hostId,Date createTime) {
- this.url = url;
- this.type = type;
- this.status = status;
- this.hostId = hostId;
- this.createTime = createTime;
- }
-
-// ApiList apiList = new ApiList(
-// null, // 涓婃姤URL
-// null, // 涓婃姤绫诲瀷
-// null, // 鏄惁寮�鍚�
-// null, // 鎺堟潈鍟嗘埛
-// null // 鍒涘缓鏃堕棿
-// );
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 0:
- return "鍏抽棴";
- case 1:
- return "寮�鍚�";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getType$() {
- if (this.type == null) {
- return "";
- }
- return ApiType.get(this.type).desc;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiLog.java
deleted file mode 100644
index aa0c709..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/ApiLog.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package com.zy.asrs.common.openapi.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("openapi_api_log")
-public class ApiLog 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 namespace;
-
- /**
- * 鎺ュ彛鍦板潃
- */
- @ApiModelProperty(value= "鎺ュ彛鍦板潃")
- private String url;
-
- /**
- * 骞冲彴瀵嗛挜
- */
- @ApiModelProperty(value= "骞冲彴瀵嗛挜")
- private String appkey;
-
- /**
- * 鏃堕棿鎴�
- */
- @ApiModelProperty(value= "鏃堕棿鎴�")
- private String timestamp;
-
- /**
- * 瀹㈡埛绔疘P
- */
- @ApiModelProperty(value= "瀹㈡埛绔疘P")
- private String clientIp;
-
- /**
- * 璇锋眰鍐呭
- */
- @ApiModelProperty(value= "璇锋眰鍐呭")
- private String request;
-
- /**
- * 鍝嶅簲鍐呭
- */
- @ApiModelProperty(value= "鍝嶅簲鍐呭")
- private String response;
-
- /**
- * 寮傚父鍐呭
- */
- @ApiModelProperty(value= "寮傚父鍐呭")
- private String err;
-
- /**
- * 缁撴灉 1: 鎴愬姛 0: 澶辫触
- */
- @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
- private Integer result;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public ApiLog() {}
-
- public ApiLog(String uuid,String namespace,String url,String appkey,String timestamp,String clientIp,String request,String response,String err,Integer result,Integer status,Date createTime,Date updateTime,String memo) {
- this.uuid = uuid;
- this.namespace = namespace;
- this.url = url;
- this.appkey = appkey;
- this.timestamp = timestamp;
- this.clientIp = clientIp;
- this.request = request;
- this.response = response;
- this.err = err;
- this.result = result;
- this.status = status;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// ApiLog apiLog = new ApiLog(
-// null, // 鏃ュ織缂栧彿
-// null, // 鍚嶇О绌洪棿
-// null, // 鎺ュ彛鍦板潃
-// null, // 骞冲彴瀵嗛挜
-// null, // 鏃堕棿鎴�
-// null, // 瀹㈡埛绔疘P
-// null, // 璇锋眰鍐呭
-// null, // 鍝嶅簲鍐呭
-// null, // 寮傚父鍐呭
-// null, // 缁撴灉
-// null, // 鐘舵��
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getResult$(){
- if (null == this.result){ return null; }
- switch (this.result){
- case 1:
- return "鎴愬姛";
- case 0:
- return "澶辫触";
- default:
- return String.valueOf(this.result);
- }
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/HostKey.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/HostKey.java
deleted file mode 100644
index 455a33f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/HostKey.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.zy.asrs.common.openapi.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("openapi_host_key")
-public class HostKey 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 signKey;
-
- /**
- * 鎺ュ彛璇锋眰瀵嗛挜
- */
- @ApiModelProperty(value = "鎺ュ彛璇锋眰瀵嗛挜")
- private String appKey;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- /**
- * 绛惧悕寮�鍚姸鎬亄0:鍏抽棴,1:寮�鍚瘆
- */
- @ApiModelProperty(value= "绛惧悕寮�鍚姸鎬�")
- private Integer signStatus;
-
- public HostKey() {}
-
- public HostKey(Long id, String signKey, String appKey, Date createTime, Long hostId) {
- this.id = id;
- this.signKey = signKey;
- this.appKey = appKey;
- this.createTime = createTime;
- this.hostId = hostId;
- }
-
- // HostKey hostKey = new HostKey(
-// null, // 瀵嗛挜
-// null, // 鍒涘缓鏃堕棿
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java
deleted file mode 100644
index d40fa6f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/dto/OrderListDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.openapi.entity.dto;
-
-import com.zy.asrs.common.wms.entity.Order;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class OrderListDto {
-
- private Order order;
-
- private List<OrderDetl> orderDetls;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
deleted file mode 100644
index 13642e6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2020/6/28
- */
-@Data
-public class CombParam {
-
- // 鍗曟嵁缂栧彿
- private String orderNo;
-
- // 鎵樼洏鏉＄爜
- private String barcode;
-
- // 搴撲綅缂栧彿
- private String locno;
-
- //缁勬墭鐗╂枡
- private List<CombMat> combMats;
-
- @Data
- public static class CombMat {
-
- //鏂欐兂鐮�
- private String containerCode;
-
- //閿�鍞鍗曞彿
- private String csocode;
-
- //閿�鍞鍗曡鍙�
- private String isoseq;
-
- // 鐗╂枡缂栧彿
- private String matnr;
-
- // 搴忓垪鐮�
- private String batch;
-
- // 鐗╂枡鏁伴噺
- private Double anfme;
-
- // 鍟嗗搧鍚嶇О
- private String maktx;
-
- // 瑙勬牸
- private String specs;
-
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
deleted file mode 100644
index 8de9b25..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CreateMatParam.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CreateMatParam {
-
- private List<MatParam> mats;
-
- private String sign;
-
- private Long hostId;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderMatParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderMatParam.java
deleted file mode 100644
index 3ecb3ea..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderMatParam.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import lombok.Data;
-
-@Data
-public class GenerateOrderMatParam {
-
- //鐗╂枡缂栧彿
- private String matnr;
-
- //鎵瑰彿
- private String batch;
-
- //鏁伴噺
- private Double anfme;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakInParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakInParam.java
deleted file mode 100644
index 2c0e52f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakInParam.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class GenerateOrderPakInParam {
-
- private String orderNo;
-
- private Integer orderType;
-
- private List<GenerateOrderMatParam> mats;
-
- private String sign;
-
- private Long hostId;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java
deleted file mode 100644
index 61cd550..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import com.zy.asrs.common.domain.dto.DetlDto;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class GenerateOrderPakOutParam {
-
- private String orderNo;
-
- private String orderType;
-
- private String orderTime;
-
- private List<GenerateOrderMatParam> mats;
-
- private Long hostId;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
deleted file mode 100644
index 0f2cb0f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/MatParam.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import lombok.Data;
-
-@Data
-public class MatParam {
-
- //涓�绾у垎绫�
- private String firstTag;
-
- //浜岀骇鍒嗙被
- private String secondTag;
-
- //鐗╂枡缂栧彿
- private String matnr;
-
- //鐗╂枡鍚嶇О
- private String maktx;
-
- //鐗╂枡鍒悕
- private String name;
-
- //瑙勬牸
- private String specs;
-
- //鍨嬪彿
- private String model;
-
- //棰滆壊
- private String color;
-
- //鍝佺墝
- private String brand;
-
- //鍗曚綅
- private String unit;
-
- //鍗曚环
- private Double price;
-
- //sku
- private String sku;
-
- //鍗曚綅閲�
- private Double units;
-
- //鏉＄爜
- private String barcode;
-
- //浜у湴
- private String origin;
-
- //鍘傚
- private String manu;
-
- //鐢熶骇鏃ユ湡
- private String manuDate;
-
- //鍝侀」鏁�
- private String itemNum;
-
- //閲嶉噺
- private Double weight;
-
- //闀垮害
- private Double length;
-
- //浣撶Н
- private Double volume;
-
- //涓夋柟缂栫爜
- private String threeCode;
-
- //渚涘簲鍟�
- private String supp;
-
- //渚涘簲鍟嗙紪鐮�
- private String suppCode;
-
- //淇濊川鏈�
- private String deadTime;
-
- //鐘舵��
- private Integer status;
-
- //澶囨敞
- private String memo;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java
deleted file mode 100644
index eff2b47..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/OrderListParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.zy.asrs.common.openapi.entity.param;
-
-import lombok.Data;
-
-@Data
-public class OrderListParam {
-
- /**
- * 璁㈠崟绫诲瀷
- */
- private Integer orderType;
-
- /**
- * 璁㈠崟鍙�
- */
- private String orderNo;
-
- /**
- * 璁㈠崟鐘舵��
- */
- private Integer status;
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiListMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiListMapper.java
deleted file mode 100644
index e319b2a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiListMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.openapi.mapper;
-
-import com.zy.asrs.common.openapi.entity.ApiList;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface ApiListMapper extends BaseMapper<ApiList> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiLogMapper.java
deleted file mode 100644
index 2fdbe5c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/ApiLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.openapi.mapper;
-
-import com.zy.asrs.common.openapi.entity.ApiLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface ApiLogMapper extends BaseMapper<ApiLog> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/HostKeyMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/HostKeyMapper.java
deleted file mode 100644
index 0a557ab..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/mapper/HostKeyMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.openapi.mapper;
-
-import com.zy.asrs.common.openapi.entity.HostKey;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface HostKeyMapper extends BaseMapper<HostKey> {
-
- List<HostKey> getList();
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiListService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiListService.java
deleted file mode 100644
index a2f617f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiListService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.openapi.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.openapi.entity.ApiList;
-
-public interface ApiListService extends IService<ApiList> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiLogService.java
deleted file mode 100644
index 3f603ce..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiLogService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.common.openapi.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.openapi.entity.ApiLog;
-
-public interface ApiLogService extends IService<ApiLog> {
-
- void saveLog(String namespace, String url, String appkey, String ip, String request, String response, boolean success);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
deleted file mode 100644
index 137af10..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/ApiService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zy.asrs.common.openapi.service;
-
-import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
-import com.zy.asrs.common.openapi.entity.param.CreateMatParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
-import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakOutParam;
-import com.zy.asrs.common.openapi.entity.param.OrderListParam;
-import com.zy.asrs.common.wms.entity.DocType;
-import com.zy.asrs.common.wms.entity.OrderSettle;
-
-import java.util.List;
-
-public interface ApiService {
-
- /**
- * 鐢熸垚鍏ュ簱璁㈠崟
- */
- void generateOrderPakIn(GenerateOrderPakInParam param);
-
- /**
- * 鐢熸垚鍑哄簱璁㈠崟
- */
- void generateOrderPakOut(GenerateOrderPakOutParam param);
-
- List<DocType> getOrderType();
-
- List<OrderSettle> getOrderStatus();
-
- List<OrderListDto> getOrderList(OrderListParam param, Long hostId);
-
- int createMat(CreateMatParam param);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/HostKeyService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/HostKeyService.java
deleted file mode 100644
index de11504..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/HostKeyService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.openapi.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.openapi.entity.HostKey;
-
-import java.util.List;
-
-public interface HostKeyService extends IService<HostKey> {
-
- List<HostKey> getList();
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiListServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiListServiceImpl.java
deleted file mode 100644
index 9d6feb3..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiListServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.openapi.service.impl;
-
-import com.zy.asrs.common.openapi.mapper.ApiListMapper;
-import com.zy.asrs.common.openapi.entity.ApiList;
-import com.zy.asrs.common.openapi.service.ApiListService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("apiListService")
-public class ApiListServiceImpl extends ServiceImpl<ApiListMapper, ApiList> implements ApiListService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiLogServiceImpl.java
deleted file mode 100644
index 4be1fcb..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiLogServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.common.openapi.service.impl;
-
-import com.zy.asrs.common.openapi.mapper.ApiLogMapper;
-import com.zy.asrs.common.openapi.entity.ApiLog;
-import com.zy.asrs.common.openapi.service.ApiLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.SnowflakeIdWorker;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-@Service("apiLogService")
-public class ApiLogServiceImpl extends ServiceImpl<ApiLogMapper, ApiLog> implements ApiLogService {
-
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
-
- @Override
- public void saveLog(String namespace, String url, String appkey, String ip, String request, String response, boolean success) {
- Date now = new Date();
- ApiLog apiLog = new ApiLog(
- String.valueOf(snowflakeIdWorker.nextId()), // 鏃ュ織缂栧彿
- namespace, // 鍚嶇О绌洪棿
- url, // 鎺ュ彛鍦板潃
- appkey, // 骞冲彴瀵嗛挜
- String.valueOf(now.getTime()), // 鏃堕棿鎴�
- ip, // 瀹㈡埛绔疘P
- request, // 璇锋眰鍐呭
- response,
- null, // 寮傚父鍐呭
- success?1:0 , // 缁撴灉
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- if (!this.save(apiLog)) {
- log.error("鎺ュ彛璋冪敤鏃ュ織淇濆瓨澶辫触锛�");
- }
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
deleted file mode 100644
index a481329..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/ApiServiceImpl.java
+++ /dev/null
@@ -1,334 +0,0 @@
-package com.zy.asrs.common.openapi.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
-import com.zy.asrs.common.openapi.entity.param.*;
-import com.zy.asrs.common.openapi.service.ApiService;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.framework.common.SnowflakeIdWorker;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Service("apiService")
-public class ApiServiceImpl implements ApiService {
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private MatService matService;
- @Autowired
- private OrderSettleService orderSettleService;
- @Autowired
- private TagService tagService;
-
- @Override
- public void generateOrderPakIn(GenerateOrderPakInParam param) {
- Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
- if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, param.getOrderType()));
- if (docType == null) {
- throw new CoolException("璁㈠崟绫诲瀷涓嶅瓨鍦�");
- }
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 澶囨敞
- param.getHostId()
- );
- if (!orderService.save(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- List<GenerateOrderMatParam> mats = param.getMats();
- for (GenerateOrderMatParam matParam : mats) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
- if (Cools.isEmpty(mat)) {
- throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(matParam.getBatch());
- orderDetl.setAnfme(matParam.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- }
-
- @Override
- public void generateOrderPakOut(GenerateOrderPakOutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
- // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
- }
- orderService.removeById(order.getId());
- }
- DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, param.getOrderType()));
- if (docType == null) {
- throw new CoolException("璁㈠崟绫诲瀷涓嶅瓨鍦�");
- }
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 澶囨敞
- param.getHostId() //浠撳簱ID
- );
- if (!orderService.save(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- List<GenerateOrderMatParam> mats = param.getMats();
- for (GenerateOrderMatParam matParam : mats) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matParam.getMatnr()).eq(Mat::getHostId, param.getHostId()));
- if (Cools.isEmpty(mat)) {
- throw new CoolException(matParam.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(matParam.getBatch());
- orderDetl.setAnfme(matParam.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- orderDetl.setHostId(param.getHostId());
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- }
-
- @Override
- public List<DocType> getOrderType() {
- List<DocType> list = docTypeService.list();
- return list;
- }
-
- @Override
- public List<OrderSettle> getOrderStatus() {
- return orderSettleService.list();
- }
-
- @Override
- public List<OrderListDto> getOrderList(OrderListParam param, Long hostId) {
- ArrayList<OrderListDto> listDtos = new ArrayList<>();
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId);
- if (!Cools.isEmpty(param)) {
- if (!Cools.isEmpty(param.getOrderType())) {
- wrapper.eq(Order::getDocType, param.getOrderType());
- }
- if (!Cools.isEmpty(param.getOrderNo())) {
- wrapper.eq(Order::getOrderNo, param.getOrderNo());
- }
- if (!Cools.isEmpty(param.getStatus())) {
- wrapper.eq(Order::getStatus, param.getStatus());
- }
- }
- List<Order> list = orderService.list(wrapper);
- for (Order order : list) {
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getHostId, hostId).eq(OrderDetl::getOrderId, order.getId()));
- OrderListDto dto = new OrderListDto();
- dto.setOrder(order);
- dto.setOrderDetls(orderDetls);
- listDtos.add(dto);
- }
- return listDtos;
- }
-
- @Override
- @Transactional
- public int createMat(CreateMatParam param) {
- int count = 0;
- Long hostId = param.getHostId();
- for (MatParam matParam : param.getMats()) {
- //鑾峰彇鍒嗙被
- Tag tag = tagService.getTag(matParam.getFirstTag(), matParam.getSecondTag(), hostId);
-
- matService.remove(new LambdaQueryWrapper<Mat>()
- .eq(Mat::getMatnr, matParam.getMatnr())
- .eq(Mat::getHostId, hostId));
- Mat mat = new Mat();
- mat.setMatnr(matParam.getMatnr());//鐗╂枡鍙�
- mat.setHostId(hostId);//浠撳簱ID
- mat.setTagId(tag.getId());//鍒嗙被ID
- if (!Cools.isEmpty(matParam.getMaktx())) {
- mat.setMaktx(matParam.getMaktx());
- }
- if (!Cools.isEmpty(matParam.getMaktx())) {
- mat.setMaktx(matParam.getMaktx());
- }
- if (!Cools.isEmpty(matParam.getName())) {
- mat.setName(matParam.getName());
- }
- if (!Cools.isEmpty(matParam.getSpecs())) {
- mat.setSpecs(matParam.getSpecs());
- }
- if (!Cools.isEmpty(matParam.getModel())) {
- mat.setModel(matParam.getModel());
- }
- if (!Cools.isEmpty(matParam.getColor())) {
- mat.setColor(matParam.getColor());
- }
- if (!Cools.isEmpty(matParam.getBrand())) {
- mat.setBrand(matParam.getBrand());
- }
- if (!Cools.isEmpty(matParam.getUnit())) {
- mat.setUnit(matParam.getUnit());
- }
- if (!Cools.isEmpty(matParam.getPrice())) {
- mat.setPrice(matParam.getPrice());
- }
- if (!Cools.isEmpty(matParam.getSku())) {
- mat.setSku(matParam.getSku());
- }
- if (!Cools.isEmpty(matParam.getUnits())) {
- mat.setUnits(matParam.getUnits());
- }
- if (!Cools.isEmpty(matParam.getBarcode())) {
- mat.setBarcode(matParam.getBarcode());
- }
- if (!Cools.isEmpty(matParam.getOrigin())) {
- mat.setOrigin(matParam.getOrigin());
- }
- if (!Cools.isEmpty(matParam.getManu())) {
- mat.setManu(matParam.getManu());
- }
- if (!Cools.isEmpty(matParam.getManuDate())) {
- mat.setManuDate(matParam.getManuDate());
- }
- if (!Cools.isEmpty(matParam.getItemNum())) {
- mat.setItemNum(matParam.getItemNum());
- }
- if (!Cools.isEmpty(matParam.getWeight())) {
- mat.setWeight(matParam.getWeight());
- }
- if (!Cools.isEmpty(matParam.getLength())) {
- mat.setLength(matParam.getLength());
- }
- if (!Cools.isEmpty(matParam.getVolume())) {
- mat.setVolume(matParam.getVolume());
- }
- if (!Cools.isEmpty(matParam.getThreeCode())) {
- mat.setThreeCode(matParam.getThreeCode());
- }
- if (!Cools.isEmpty(matParam.getSupp())) {
- mat.setSupp(matParam.getSupp());
- }
- if (!Cools.isEmpty(matParam.getSuppCode())) {
- mat.setSuppCode(matParam.getSuppCode());
- }
- if (!Cools.isEmpty(matParam.getDeadTime())) {
- mat.setDeadTime(matParam.getDeadTime());
- }
- if (!Cools.isEmpty(matParam.getMemo())) {
- mat.setMemo(matParam.getMemo());
- }
- if (!Cools.isEmpty(matParam.getStatus())) {
- mat.setStatus(matParam.getStatus());
- }else {
- mat.setStatus(1);
- }
-
- if (matService.save(mat)) {
- count++;
- }
- }
- return count;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/HostKeyServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/HostKeyServiceImpl.java
deleted file mode 100644
index 1b9cb96..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/service/impl/HostKeyServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.asrs.common.openapi.service.impl;
-
-import com.zy.asrs.common.openapi.mapper.HostKeyMapper;
-import com.zy.asrs.common.openapi.entity.HostKey;
-import com.zy.asrs.common.openapi.service.HostKeyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("hostKeyService")
-public class HostKeyServiceImpl extends ServiceImpl<HostKeyMapper, HostKey> implements HostKeyService {
-
- @Override
- public List<HostKey> getList() {
- List<HostKey> list = this.baseMapper.getList();
- for (HostKey hostKey : list) {//瀵箂ignKey杩涜鑴辨晱澶勭悊
- if (Cools.isEmpty(hostKey.getSignKey())) {
- continue;
- }
- String signKey = hostKey.getSignKey();
- StringBuilder builder = new StringBuilder(signKey);
- for (int i = 5; i < 27; i++) {
- builder.setCharAt(i, '*');
- }
- builder.delete(5, 22);
- hostKey.setSignKey(builder.toString());
- }
- return list;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/properties/SystemProperties.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/properties/SystemProperties.java
deleted file mode 100644
index c1d6507..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/properties/SystemProperties.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.zy.asrs.common.properties;
-
-
-import com.zy.asrs.framework.common.AesUtils;
-import com.zy.asrs.framework.common.DateUtils;
-
-import java.io.*;
-import java.util.Date;
-
-/**
- * Created by vincent on 2020/8/1
- */
-public class SystemProperties {
-
- // 婵�娲荤爜鍔犲瘑鐩� -- 16浣�
- public static final String SALT = "123456789qwertyu";
-
- // 绯荤粺婵�娲荤姸鎬� (榛樿鏈縺娲�)
- public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
-
- public static String getActivationCode(String fileName){
- StringBuilder activationCode = new StringBuilder();
- try {
- FileReader f = new FileReader(fileName);
- BufferedReader buf = new BufferedReader(f);
- String s;
- while ((s = buf.readLine()) != null) {
- activationCode.append(s);
- }
- f.close();
- buf.close();
- } catch (FileNotFoundException ignore) {
-
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException("璇诲彇WMS绯荤粺婵�娲荤爜澶辫触锛侊紒锛乗n璇诲彇璺緞 " + fileName);
- }
- return activationCode.toString();
- }
-
- public static boolean saveActivationCode(String filePath, String code){
- try {
- // 闃叉鏂囦欢寤虹珛鎴栬鍙栧け璐ワ紝鐢╟atch鎹曟崏閿欒骞舵墦鍗帮紝涔熷彲浠hrow
- File file = new File(filePath);// 鐩稿璺緞锛屽鏋滄病鏈夊垯瑕佸缓绔嬩竴涓柊鐨刼utput銆倀xt鏂囦欢
- if (file.exists()) {
- file.delete();
- }
- boolean newFile = file.createNewFile();// 鍒涘缓鏂版枃浠�
- if (newFile) {
- String sets = "attrib +H \"" + file.getAbsolutePath() + "\"";
- Runtime.getRuntime().exec(sets);
- BufferedWriter out = new BufferedWriter(new FileWriter(file, true));
- out.write(code); // \r\n鍗充负鎹㈣
- out.flush(); // 鎶婄紦瀛樺尯鍐呭鍘嬪叆鏂囦欢
- out.close(); // 鏈�鍚庤寰楀叧闂枃浠�
- }
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("鍐欏叆WMS绯荤粺婵�娲荤爜澶辫触锛侊紒锛乗n璺緞 " + filePath);
- }
- return true;
- }
-
-
- // 鐢熸垚婵�娲荤爜
- public static void main(String[] args) {
- String timeStr = "2021-08-01 17:48:35";
- Date exprTime = DateUtils.convert(timeStr);
- String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
- System.out.println("婵�娲荤爜锛�"+code);
- System.out.println("鏈夋晥鏈熻嚦锛�"+timeStr);
-// saveActivationCode(SysOsType.Windows.getActivationCodePath(), code);
-// String activationCode = getActivationCode(OSinfo.getOSname().getActivationCodePath());
-// String decrypt = AesUtils.decrypt(activationCode, "123456789qwertyu");
-// Date convert = DateUtils.convert(decrypt, DateUtils.yyyyMMddHHmmss);
-// System.out.println(DateUtils.convert(convert));
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
deleted file mode 100644
index 3c676be..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/StaDescService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.sys.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.domain.entity.StaDesc;
-
-import java.util.List;
-
-public interface StaDescService extends IService<StaDesc> {
-
- List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
deleted file mode 100644
index de4844b..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/StaDescServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zy.asrs.common.sys.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.mapper.StaDescMapper;
-import com.zy.asrs.common.domain.entity.StaDesc;
-import com.zy.asrs.common.sys.service.StaDescService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("staDescService")
-public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService {
-
- @Override
- public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo, Long hostId) {
- ArrayList<Integer> list = new ArrayList<>();
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(StaDesc::getTypeNo, typeNo);
- wrapper.eq(StaDesc::getHostId, hostId);
- for (StaDesc staDesc : this.list(wrapper)) {
- list.add(staDesc.getStnNo());
- }
- return list;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
deleted file mode 100644
index 231555a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.zy.asrs.common.utils;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.entity.MatExcel;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.mapper.TagMapper;
-import com.zy.asrs.common.wms.service.MatService;
-import com.zy.asrs.common.wms.service.TagService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by vincent on 2019-11-25
- */
-@Slf4j
-public class MatExcelListener extends AnalysisEventListener<MatExcel> {
-
- private int total = 0;
- private Long userId;
- private Long hostId;
-
- public MatExcelListener() {
- }
-
- public MatExcelListener(Long userId, Long hostId) {
- this.userId = userId;
- this.hostId = hostId;
- }
-
- /**
- * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
- */
- private static final int BATCH_COUNT = 50;
-
- private final List<MatExcel> list = new ArrayList<>();
-
- /**
- * 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
- */
- @Override
- public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
- }
-
- /**
- * 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
- */
- @Override
- public void invoke(MatExcel excel, AnalysisContext ctx) {
- TagService tagService = SpringUtils.getBean(TagService.class);
- TagMapper tagMapper = SpringUtils.getBean(TagMapper.class);
- MatService matService = SpringUtils.getBean(MatService.class);
- Date now = new Date();
- Long tagId;
- // 鍒嗙被
- // 涓�绾у垎绫�
- if (!Cools.isEmpty(excel.getPriClass()) && !Cools.isEmpty(excel.getSecClass())) {
- Tag priTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 2));
- if (priTag == null) {
- Tag top = tagService.getTop(hostId);
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(top.getId());
- priTag = new Tag(
- null, // 缂栧彿
- excel.getPriClass(), // 鍚嶇О
- top.getId(), // 鐖剁骇
- top.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 2, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("淇濆瓨涓�绾у垎绫诲け璐�");
- }
- }
- // 浜岀骇鍒嗙被
- Tag secTag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getName, excel.getPriClass()).eq(Tag::getLevel, 3));
- if (secTag == null) {
- NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.executePath(priTag.getId());
- secTag = new Tag(
- null, // 缂栧彿
- excel.getSecClass(), // 鍚嶇О
- priTag.getId(), // 鐖剁骇
- priTag.getName(), // 鐖剁骇鍚嶇О
- nodeUtils.path.toString(), // 鍏宠仈璺緞
- nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
- 0, // 绫诲瀷
- null, // 璐熻矗浜�
- null, // 鍥剧墖
- null, // 绠�瑕佹弿杩�
- null, // 鏁伴噺
- 3, // 绛夌骇
- null, // 鎺掑簭
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- null // 澶囨敞
- );
- if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("淇濆瓨浜岀骇鍒嗙被澶辫触");
- }
- }
- tagId = secTag.getId();
- } else {
- tagId = tagService.getTop(hostId).getId();
- }
- // 鍟嗗搧
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()));
- if (mat == null) {
- mat = excel;
- mat.setTagId(tagId);
- if (!matService.save(mat)) {
- throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
- }
- total++;
- }
- }
-
- /**
- * 鎵�鏈夋暟鎹В鏋愬畬鎴愪簡璋冪敤
- * 閫傚悎浜嬪姟
- */
- @Override
- public void doAfterAllAnalysed(AnalysisContext ctx) {
- log.info("鏂板{}鏉＄墿鏂欎俊鎭紒", total);
- }
-
- public int getTotal() {
- return total;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java
deleted file mode 100644
index 035155c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/NodeUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zy.asrs.common.utils;
-
-import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.TagService;
-import com.zy.asrs.framework.common.SpringUtils;
-
-/**
- * Created by vincent on 2021/1/19
- */
-public class NodeUtils {
-
- public StringBuilder path = new StringBuilder();
-
- public StringBuilder pathName = new StringBuilder();
-
- public void executePath(Tag tag) {
- TagService bean = SpringUtils.getBean(TagService.class);
- Tag parent = bean.getById(tag.getParentId());
- if (null != parent) {
- path.insert(0, parent.getId()).insert(0,",");
- pathName.insert(0, parent.getName()).insert(0,",");
- if (parent.getParentId() != null) {
- executePath(parent);
- } else {
- path.deleteCharAt(0);
- pathName.deleteCharAt(0);
- }
- }
- }
-
- public void executePath(Long parentId) {
- TagService bean = SpringUtils.getBean(TagService.class);
- Tag parent = bean.getById(parentId);
- if (null != parent) {
- path.insert(0, parent.getId()).insert(0,",");
- pathName.insert(0, parent.getName()).insert(0,",");
- if (parent.getParentId() != null) {
- executePath(parent);
- } else {
- path.deleteCharAt(0);
- pathName.deleteCharAt(0);
- }
- }
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
deleted file mode 100644
index 43a8b3f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/TreeUtils.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.zy.asrs.common.utils;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.TagService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-/**
- * 鏍戝舰鍥惧伐鍏�
- * Created by vincent on 2020/10/16
- */
-@Component
-public class TreeUtils {
-
- @Autowired
- private TagService tagService;
-
- /******************************** 褰掔被鏍� *********************************/
-
- /**
- * 鑾峰彇鏍戝浘鏁版嵁缁撴瀯
- */
- @Cacheable(cacheNames = "tagTree", key = "#id")
- public ArrayList<Map> getTree(Long id, Long hostId) {
- ArrayList<Map> result = new ArrayList<>();
- Tag tag = tagService.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getId, id).eq(Tag::getHostId, hostId));
- // 涓昏妭鐐�
- Map<String, Object> map = new HashMap<>();
- map.put("title", tag.getName());
- map.put("id", tag.getId());
- map.put("spread", true);
- List<Map> childrens = new ArrayList<>();
- map.put("children", childrens);
- dealTag(tag, childrens);
- result.add(map);
- // 寮�濮嬪鐞嗗瓧鑺傜偣
-// deal(tag, childrens);
- return result;
- }
-
- /**
- * 閫掑綊鑾峰彇瀛愯妭鐐规暟鎹�
- */
- public void dealTag(Tag parent, List<Map> list) {
- List<Tag> tags = tagService.list(
- new LambdaQueryWrapper<Tag>()
- .eq(Tag::getParentId, parent.getId())
- .eq(Tag::getStatus, 1));
- for (Tag tag : tags) {
- Map<String, Object> map = new HashMap<>();
- map.put("title", tag.getName());
- map.put("id", tag.getId());
- map.put("spread", true);
- List<Map> childrens = new ArrayList<>();
- map.put("children", childrens);
- dealTag(tag, childrens);
- list.add(map);
- }
- }
-
- /**
- * 閫掑綊鑾峰彇鑺傜偣浠ュ強瀛愯妭鐐规暟鎹�
- */
- public void getTagIdList(Long id, List<Long> nodes) {
- if (!nodes.contains(id)) {
- nodes.add(id);
- }
- List<Tag> tags = tagService.list(new LambdaQueryWrapper<Tag>().eq(Tag::getParentId, id).eq(Tag::getStatus, 1));
- for (Tag tag : tags) {
- if (!nodes.contains(tag.getId())) {
- nodes.add(tag.getId());
- }
- getTagIdList(tag.getId(), nodes);
- }
- }
-
-
- // -------------------------------------------------------------------------------------------------------
-
- /**
- * 鏉′欢绛涢��
- */
- @SuppressWarnings("unchecked")
- public void remove(String condition, List<Map> list) {
- Iterator<Map> iterator = list.iterator();
- while (iterator.hasNext()) {
- Map map = iterator.next();
- if (map.get("children") != null) {
- List<Map> children = (List<Map>) map.get("children");
- if (children.size() > 0) {
- remove(condition, children);
- } else {
- if (!String.valueOf(map.get("title")).contains(condition)) {
- iterator.remove();
- }
- }
- }
- }
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Utils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Utils.java
deleted file mode 100644
index a0f7a1e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Utils.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.zy.asrs.common.utils;
-
-import com.zy.asrs.common.wms.service.LocDirectionService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-
-import java.security.SecureRandom;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/8/27
- */
-public class Utils {
-
- private static final DecimalFormat fmt = new DecimalFormat("##0.00");
-
- public static String zerofill(String msg, Integer count){
- if (msg.length() == count){
- return msg;
- } else if (msg.length() > count){
- return msg.substring(0, 16);
- } else {
- StringBuilder msgBuilder = new StringBuilder(msg);
- for (int i = 0; i<count-msg.length(); i++){
- msgBuilder.insert(0,"0");
- }
- return msgBuilder.toString();
- }
- }
-
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
- */
- public static int getRow(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(0, 2));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 鍒�
- */
- public static int getBay(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(2, 5));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
- /**
- * 閫氳繃搴撲綅鍙疯幏鍙� 灞�
- */
- public static int getLev(String locNo) {
- if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(5, 7));
- }
- throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
- }
-
- /**
- * 鐢熸垚闅忔満瀛楃涓�
- */
- public static String generateString(int length) {
- String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; // 鍙�夌殑瀛楃闆嗗悎
- SecureRandom random = new SecureRandom();
- StringBuilder sb = new StringBuilder(length);
- for (int i = 0; i < length; i++) {
- int index = random.nextInt(characters.length());
- char randomChar = characters.charAt(index);
- sb.append(randomChar);
- }
- return sb.toString();
- }
-
- /**
- * 鑾峰彇搴撲綅缁�
- */
- public static List<String> getGroupLoc(String locNo, Long hostId) {
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- LocDirectionService locDirectionService = SpringUtils.getBean(LocDirectionService.class);
- List<ArrayList<Integer>> naturalList = locDirectionService.getNaturalList(hostId);
- for (ArrayList<Integer> list : naturalList) {
- if (list.contains(row)) {
- for (Integer row0 : list) {
- result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
- }
- return result;
- }
- }
-
- return result;
- }
-
- /**
- * 鑾峰彇澶栦晶鏂瑰悜鐨勫簱浣嶇粍
- */
- public static List<String> getGroupOuterLoc(String locNo, Long hostId) {
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- LocDirectionService locDirectionService = SpringUtils.getBean(LocDirectionService.class);
- List<ArrayList<Integer>> outerList = locDirectionService.getOuterList(hostId);
- for (ArrayList<Integer> list : outerList) {
- if (list.contains(row)) {
- for (Integer row0 : list) {
- if (row0 == row) {
- break;
- }
- result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
- }
- return result;
- }
- }
-
- return result;
- }
-
- /**
- * 鑾峰彇鍐呬晶鏂瑰悜鐨勫簱浣嶇粍
- */
- public static List<String> getGroupInnerLoc(String locNo, Long hostId) {
- int row = getRow(locNo);
- List<String> result = new ArrayList<>();
- LocDirectionService locDirectionService = SpringUtils.getBean(LocDirectionService.class);
- List<ArrayList<Integer>> innerList = locDirectionService.getInnerList(hostId);
- for (ArrayList<Integer> list : innerList) {
- if (list.contains(row)) {
- for (Integer row0 : list) {
- if (row0 == row) {
- break;
- }
- result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
- }
- return result;
- }
- }
-
- return result;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/VersionUtils.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/VersionUtils.java
deleted file mode 100644
index 51704a5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/VersionUtils.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.common.utils;
-
-import com.zy.asrs.common.domain.dto.LocTypeDto;
-import com.zy.asrs.common.wms.entity.LocMast;
-
-public class VersionUtils {
-
- /**
- * 搴撲綅绫诲瀷妫�娴�
- **/
- public static boolean checkLocType(LocMast loc, LocTypeDto dto){
- //搴撲綅绫诲瀷蹇呴』鍜屼紶鍏ョ殑搴撲綅淇″彿涓�鑷�
- if (loc.getLocType1().equals(dto.getLocType1())) {
- return true;
- }
- return false;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
index 80c67e9..adc8247 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
@@ -7,15 +7,11 @@
import com.zy.asrs.common.domain.entity.Parameter;
import com.zy.asrs.common.domain.enums.HtmlNavIconType;
import com.zy.asrs.common.domain.enums.LoginSystemType;
-import com.zy.asrs.common.properties.OSinfo;
-import com.zy.asrs.common.properties.SystemProperties;
import com.zy.asrs.common.sys.entity.*;
import com.zy.asrs.common.sys.service.*;
import com.zy.asrs.common.utils.RandomValidateCodeUtil;
import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.AesUtils;
import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -339,27 +335,6 @@
return R.ok(resources);
}
- @GetMapping(value = "/system/activation/auth")
- public R activation() {
- if (SystemProperties.SYSTEM_ACTIVATION) {
- String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
- String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
- if (null == timeStr) {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return R.error();
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() < exprTime.getTime()) {
- return R.ok().add(DateUtils.convert(exprTime));
- } else {
- SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
- return R.error();
- }
- } else {
- return R.error();
- }
- }
-
@RequestMapping("/loginInformation")
public R getLoginPageInformation() {
Config loginLogo = configService.selectByCode("loginLogo");
@@ -372,29 +347,6 @@
map.put("loginCopyrightImg1", loginCopyrightImg1.getStatus() == 1 ? loginCopyrightImg1.getValue() : "");
return R.ok().add(map);
- }
-
- @PostMapping(value = "/system/secret/auth")
- @ManagerAuth
- public R systemSecret(@RequestParam(value = "secret") String secret) {
- if (Cools.isEmpty(secret)) {
- return R.error("璇疯緭鍏ユ縺娲荤爜");
- }
- // 楠岃瘉婵�娲荤爜
- String timeStr = AesUtils.decrypt(secret, SystemProperties.SALT);
- if (null == timeStr) {
- return R.error("婵�娲荤爜閿欒");
- }
- Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
- if (new Date().getTime() >= exprTime.getTime()) {
- return R.error("婵�娲荤爜宸插け鏁�");
- }
- boolean result = SystemProperties.saveActivationCode(OSinfo.getOSname().getActivationCodePath(), secret);
- if (!result) {
- return R.error("婵�娲诲け璐�");
- }
- SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
- return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime));
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
index 7a7572a..086e229 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java
@@ -7,8 +7,6 @@
import com.zy.asrs.common.sys.entity.UserLogin;
import com.zy.asrs.common.sys.service.UserLoginService;
import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.service.TagService;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.controller.AbstractBaseController;
@@ -34,8 +32,6 @@
private UserService userService;
@Autowired
private UserLoginService userLoginService;
- @Autowired
- private TagService tagService;
protected Long getHostId(){
if (getUserId() == 9527) {
@@ -119,10 +115,6 @@
}
// page.setCondition(map);
return page;
- }
-
- protected Tag getOriginTag(){
- return tagService.getTop(getHostId());
}
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocDirectionController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocDirectionController.java
deleted file mode 100644
index ea2febe..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocDirectionController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.zy.asrs.common.wms.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.LocDirection;
-import com.zy.asrs.common.wms.service.LocDirectionService;
-import com.zy.asrs.framework.annotations.ManagerAuth;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.framework.domain.KeyValueVo;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class LocDirectionController extends BaseController {
-
- @Autowired
- private LocDirectionService locDirectionService;
-
- @RequestMapping(value = "/locDirection/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(locDirectionService.getById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/locDirection/page/auth")
- @ManagerAuth
- public R page(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "10") Integer limit,
- @RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange,
- @RequestParam Map<String, Object> param) {
- LambdaQueryWrapper<LocDirection> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocDirection::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocDirection::getId, condition);
- }
- return R.ok(locDirectionService.page(new Page<>(curr, limit), wrapper));
- }
-
-
- @RequestMapping(value = "/locDirection/add/auth")
- @ManagerAuth
- public R add(LocDirection locDirection) {
- locDirection.setHostId(getHostId());
- locDirectionService.save(locDirection);
- return R.ok();
- }
-
- @RequestMapping(value = "/locDirection/update/auth")
- @ManagerAuth
- public R update(LocDirection locDirection){
- if (Cools.isEmpty(locDirection) || null==locDirection.getId()){
- return R.error();
- }
- locDirectionService.updateById(locDirection);
- return R.ok();
- }
-
- @RequestMapping(value = "/locDirection/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- locDirectionService.removeById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/locDirectionQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- LambdaQueryWrapper<LocDirection> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocDirection::getHostId, getHostId());
- wrapper.like(LocDirection::getId, condition);
- Page<LocDirection> page = locDirectionService.page(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (LocDirection locDirection : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locDirection.getId());
- map.put("value", locDirection.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping("/locDirection/all/get/kv")
- @ManagerAuth
- public R getDataKV(@RequestParam(required = false) String condition) {
- List<KeyValueVo> vos = new ArrayList<>();
- LambdaQueryWrapper<LocDirection> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LocDirection::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(LocDirection::getId, condition);
- }
- locDirectionService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
- return R.ok().add(vos);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/AdjDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/AdjDetl.java
deleted file mode 100644
index cd9f943..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/AdjDetl.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.LocMastService;
-import com.zy.asrs.common.wms.service.MatCodeService;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_adj_detl")
-public class AdjDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @ApiModelProperty(value= "搴忓彿")
- private Long adjId;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- /**
- * 鐗╂枡缂栧彿
- */
- @ApiModelProperty(value= "鐗╂枡缂栧彿")
- private String matnr;
-
- @ApiModelProperty(value= "")
- private String batch;
-
- /**
- * 鍘熺鏁�
- */
- @ApiModelProperty(value= "鍘熺鏁�")
- private Double oriCtns;
-
- /**
- * 鍘熸暟閲�
- */
- @ApiModelProperty(value= "鍘熸暟閲�")
- private Double oriQty;
-
- /**
- * 鍘熼噸閲�
- */
- @ApiModelProperty(value= "鍘熼噸閲�")
- private Double oriWt;
-
- /**
- * 鍙樻洿绠辨暟
- */
- @ApiModelProperty(value= "鍙樻洿绠辨暟")
- private Double adjCtns;
-
- /**
- * 鍙樻洿鏁伴噺
- */
- @ApiModelProperty(value= "鍙樻洿鏁伴噺")
- private Double adjQty;
-
- /**
- * 鍙樻洿閲嶉噺
- */
- @ApiModelProperty(value= "鍙樻洿閲嶉噺")
- private Double adjWt;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public AdjDetl() {}
-
- public AdjDetl(String locNo,String matnr,String batch,Double oriCtns,Double oriQty,Double oriWt,Double adjCtns,Double adjQty,Double adjWt,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.locNo = locNo;
- this.matnr = matnr;
- this.batch = batch;
- this.oriCtns = oriCtns;
- this.oriQty = oriQty;
- this.oriWt = oriWt;
- this.adjCtns = adjCtns;
- this.adjQty = adjQty;
- this.adjWt = adjWt;
- this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// AdjDetl adjDetl = new AdjDetl(
-// null, // 搴撲綅鍙穂闈炵┖]
-// null, // 鐗╂枡缂栧彿[闈炵┖]
-// null, //
-// null, // 鍘熺鏁�
-// null, // 鍘熸暟閲�
-// null, // 鍘熼噸閲�
-// null, // 鍙樻洿绠辨暟
-// null, // 鍙樻洿鏁伴噺
-// null, // 鍙樻洿閲嶉噺
-// null, // 澶囨敞
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.getById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getMatnr$(){
- MatCodeService service = SpringUtils.getBean(MatCodeService.class);
- MatCode matCode = service.getById(this.matnr);
- if (!Cools.isEmpty(matCode)){
- return String.valueOf(matCode.getMatNo());
- }
- return null;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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 getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java
deleted file mode 100644
index 3faa124..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_barcode")
-public class BasBarcode 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 barcode;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public BasBarcode() {}
-
- public BasBarcode(Long id,String barcode,Date createTime,Long hostId) {
- this.id = id;
- this.barcode = barcode;
- this.createTime = createTime;
- this.hostId = hostId;
- }
-
-// BasBarcode basBarcode = new BasBarcode(
-// null, // ID[闈炵┖]
-// null, // 鏉＄爜鍊�
-// null, // 鍒涘缓鏃堕棿
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java
deleted file mode 100644
index 7e94f94..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasDevp.java
+++ /dev/null
@@ -1,396 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("common_bas_devp")
-public class BasDevp implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "dev_no", type = IdType.INPUT)
- private Integer devNo;
-
- /**
- * 璁惧鎻忚堪
- */
- @ApiModelProperty(value= "璁惧鎻忚堪")
- private String decDesc;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String devMk;
-
- /**
- * 鍙叆(checkBox)
- */
- @ApiModelProperty(value= "鍙叆(checkBox)")
- private String inEnable;
-
- /**
- * 鍙嚭(checkBox)
- */
- @ApiModelProperty(value= "鍙嚭(checkBox)")
- private String outEnable;
-
- /**
- * 鑷姩(checkBox)
- */
- @ApiModelProperty(value= "鑷姩(checkBox)")
- private String autoing;
-
- /**
- * 鏈夌墿(checkBox)
- */
- @ApiModelProperty(value= "鏈夌墿(checkBox)")
- private String loading;
-
- /**
- * 鑳藉叆(checkBox)
- */
- @ApiModelProperty(value= "鑳藉叆(checkBox)")
- private String canining;
-
- /**
- * 鑳藉嚭(checkBox)
- */
- @ApiModelProperty(value= "鑳藉嚭(checkBox)")
- private String canouting;
-
- @ApiModelProperty(value= "")
- private String fronting;
-
- @ApiModelProperty(value= "")
- private String rearing;
-
- @ApiModelProperty(value= "")
- private String uping;
-
- @ApiModelProperty(value= "")
- private String downing;
-
- /**
- * 闇�姹�1(checkBox)
- */
- @ApiModelProperty(value= "闇�姹�1(checkBox)")
- private String inreq1;
-
- /**
- * 闇�姹�2(checkBox)
- */
- @ApiModelProperty(value= "闇�姹�2(checkBox)")
- private String inreq2;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrkNo;
-
- @ApiModelProperty(value= "")
- private Integer wrkNo1;
-
- /**
- * 瀹瑰櫒绫诲瀷
- */
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
- private Integer ctnType;
-
- /**
- * 鏉″舰鐮�
- */
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
-
- @ApiModelProperty(value= "")
- private Integer inQty;
-
- @ApiModelProperty(value= "")
- private Integer row1;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- @ApiModelProperty(value= "")
- private String area;
-
- @ApiModelProperty(value= "")
- private String inOk;
-
- @ApiModelProperty(value= "")
- private String outOk;
-
- /**
- * 楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣�
- */
- @ApiModelProperty(value= "楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣� ")
- private Short locType1;
-
- /**
- * 瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣�
- */
- @ApiModelProperty(value= "瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣� ")
- private Short locType2;
-
- /**
- * 杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣�
- */
- @ApiModelProperty(value= "杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣� ")
- private Short locType3;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- private Double stdQty;
-
- @ApiModelProperty(value= "")
- private Double minWt;
-
- @ApiModelProperty(value= "")
- private Double maxWt;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double grossWt;
-
- @ApiModelProperty(value= "")
- private Integer cartPos;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public BasDevp() {}
-
- public BasDevp(Integer devNo,String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String canining,String canouting,String fronting,String rearing,String uping,String downing,String inreq1,String inreq2,Integer wrkNo,Integer wrkNo1,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Short locType1,Short locType2,Short locType3,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double maxWt,Double grossWt,Integer cartPos,Long hostId) {
- this.devNo = devNo;
- this.decDesc = decDesc;
- this.devMk = devMk;
- this.inEnable = inEnable;
- this.outEnable = outEnable;
- this.autoing = autoing;
- this.loading = loading;
- this.canining = canining;
- this.canouting = canouting;
- this.fronting = fronting;
- this.rearing = rearing;
- this.uping = uping;
- this.downing = downing;
- this.inreq1 = inreq1;
- this.inreq2 = inreq2;
- this.wrkNo = wrkNo;
- this.wrkNo1 = wrkNo1;
- this.ctnType = ctnType;
- this.barcode = barcode;
- this.inQty = inQty;
- this.row1 = row1;
- this.ioTime = ioTime;
- this.area = area;
- this.inOk = inOk;
- this.outOk = outOk;
- this.locType1 = locType1;
- this.locType2 = locType2;
- this.locType3 = locType3;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.stdQty = stdQty;
- this.minWt = minWt;
- this.maxWt = maxWt;
- this.grossWt = grossWt;
- this.cartPos = cartPos;
- this.hostId = hostId;
- }
-
-// BasDevp basDevp = new BasDevp(
-// null, // 缂栧彿[闈炵┖]
-// null, // 璁惧鎻忚堪
-// null, // 澶囨敞
-// null, // 鍙叆(checkBox)
-// null, // 鍙嚭(checkBox)
-// null, // 鑷姩(checkBox)
-// null, // 鏈夌墿(checkBox)
-// null, // 鑳藉叆(checkBox)
-// null, // 鑳藉嚭(checkBox)
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 闇�姹�1(checkBox)
-// null, // 闇�姹�2(checkBox)
-// null, // 宸ヤ綔鍙�
-// null, //
-// null, // 瀹瑰櫒绫诲瀷
-// null, // 鏉″舰鐮�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 楂樹綆绫诲瀷
-// null, // 瀹界獎绫诲瀷
-// null, // 杞婚噸绫诲瀷
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, // 閲嶉噺
-// null, //
-// null // 鎺堟潈鍟嗘埛
-// );
-
- 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.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasLocSts.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasLocSts.java
deleted file mode 100644
index edf0b41..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasLocSts.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_loc_sts")
-public class BasLocSts implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴撲綅鐘舵�佷唬鍙�
- */
- @ApiModelProperty(value= "搴撲綅鐘舵�佷唬鍙�")
- @TableId(value = "loc_sts", type = IdType.INPUT)
- private String locSts;
-
- /**
- * 搴撲綅鐘舵�佹弿杩�
- */
- @ApiModelProperty(value= "搴撲綅鐘舵�佹弿杩�")
- private String locDesc;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- public BasLocSts() {}
-
- public BasLocSts(String locSts,String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.locSts = locSts;
- this.locDesc = locDesc;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasLocSts basLocSts = new BasLocSts(
-// null, // 搴撲綅鐘舵�佷唬鍙穂闈炵┖]
-// null, // 搴撲綅鐘舵�佹弿杩�
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasMap.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasMap.java
deleted file mode 100644
index 377a67c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasMap.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("common_bas_map")
-public class BasMap implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍦板浘鏁版嵁
- */
- @ApiModelProperty(value= "鍦板浘鏁版嵁")
- private String data;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value= "鏇存柊鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 鏇存柊鍓嶅湴鍥炬暟鎹�
- */
- @ApiModelProperty(value= "鏇存柊鍓嶅湴鍥炬暟鎹�")
- private String lastData;
-
- /**
- * 妤煎眰
- */
- @ApiModelProperty(value= "妤煎眰")
- private Integer lev;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public BasMap() {}
-
- public BasMap(String data,Date createTime,Date updateTime,String lastData,Integer lev,Long hostId) {
- this.data = data;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.lastData = lastData;
- this.lev = lev;
- this.hostId = hostId;
- }
-
-// BasMap basMap = new BasMap(
-// null, // 鍦板浘鏁版嵁
-// null, // 鍒涘缓鏃堕棿
-// null, // 鏇存柊鏃堕棿
-// null, // 鏇存柊鍓嶅湴鍥炬暟鎹�
-// null, // 妤煎眰
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java
deleted file mode 100644
index 13d245b..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWhs.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_whs")
-public class BasWhs implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 搴撲綅绫诲瀷
- */
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
- private String whsDesc;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public BasWhs() {}
-
- public BasWhs(String whsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.whsDesc = whsDesc;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasWhs basWhs = new BasWhs(
-// null, // 搴撲綅绫诲瀷
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkIotype.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkIotype.java
deleted file mode 100644
index f788999..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkIotype.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_wrk_iotype")
-public class BasWrkIotype implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍏ュ嚭绫诲瀷浠ｅ彿
- */
- @ApiModelProperty(value= "鍏ュ嚭绫诲瀷浠ｅ彿")
- @TableId(value = "io_type", type = IdType.INPUT)
- private Integer ioType;
-
- /**
- * 涓昏
- */
- @ApiModelProperty(value= "涓昏")
- private String ioPri;
-
- /**
- * 鍏ュ嚭绫诲瀷鎻忚堪
- */
- @ApiModelProperty(value= "鍏ュ嚭绫诲瀷鎻忚堪")
- private String ioDesc;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- public BasWrkIotype() {}
-
- public BasWrkIotype(Integer ioType,String ioPri,String ioDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.ioType = ioType;
- this.ioPri = ioPri;
- this.ioDesc = ioDesc;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasWrkIotype basWrkIotype = new BasWrkIotype(
-// null, // 鍏ュ嚭绫诲瀷浠ｅ彿[闈炵┖]
-// null, // 涓昏[闈炵┖]
-// null, // 鍏ュ嚭绫诲瀷鎻忚堪
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkStatus.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkStatus.java
deleted file mode 100644
index 12b5a3f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasWrkStatus.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_bas_wrk_status")
-public class BasWrkStatus implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 宸ヤ綔鐘舵�佷唬鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�佷唬鍙�")
- @TableId(value = "wrk_sts", type = IdType.INPUT)
- private Long wrkSts;
-
- /**
- * 鐘舵�佹弿杩�
- */
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
- private String wrkDesc;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- public BasWrkStatus() {}
-
- public BasWrkStatus(Long wrkSts,String wrkDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
- this.wrkSts = wrkSts;
- this.wrkDesc = wrkDesc;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- }
-
-// BasWrkStatus basWrkStatus = new BasWrkStatus(
-// null, // 宸ヤ綔鐘舵�佷唬鍙穂闈炵┖]
-// null, // 鐘舵�佹弿杩癧闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null // 娣诲姞鏃堕棿
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Cstmr.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Cstmr.java
deleted file mode 100644
index 1c3a180..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Cstmr.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_cstmr")
-public class Cstmr implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- private Long id;
-
- /**
- * 瀹㈡埛缂栧彿
- */
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private String uuid;
-
- /**
- * 瀹㈡埛鍚嶇О
- */
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String name;
-
- /**
- * 鑱旂郴浜�
- */
- @ApiModelProperty(value= "鑱旂郴浜�")
- private String contacts;
-
- /**
- * 鑱旂郴鐢佃瘽
- */
- @ApiModelProperty(value= "鑱旂郴鐢佃瘽")
- private String tel;
-
- /**
- * 鑱旂郴鍦板潃
- */
- @ApiModelProperty(value= "鑱旂郴鍦板潃")
- private String addr;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 2: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 2: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public Cstmr() {}
-
- public Cstmr(String uuid,String name,String contacts,String tel,String addr,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.uuid = uuid;
- this.name = name;
- this.contacts = contacts;
- this.tel = tel;
- this.addr = addr;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// Cstmr cstmr = new Cstmr(
-// null, // 瀹㈡埛缂栧彿[闈炵┖]
-// null, // 瀹㈡埛鍚嶇О
-// null, // 鑱旂郴浜�
-// null, // 鑱旂郴鐢佃瘽
-// null, // 鑱旂郴鍦板潃
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 2:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/DocType.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/DocType.java
deleted file mode 100644
index bfffc36..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/DocType.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_doc_type")
-public class DocType implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 绫诲瀷缂栧彿
- */
- @ApiModelProperty(value= "绫诲瀷缂栧彿")
- @TableId(value = "doc_id", type = IdType.INPUT)
- private Long docId;
-
- /**
- * 绫诲瀷鍚嶇О
- */
- @ApiModelProperty(value= "绫诲瀷鍚嶇О")
- private String docName;
-
- @ApiModelProperty(value= "")
- private Integer pakin;
-
- @ApiModelProperty(value= "")
- private Integer pakout;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public DocType() {}
-
- public DocType(Long docId,String docName,Integer pakin,Integer pakout,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.docId = docId;
- this.docName = docName;
- this.pakin = pakin;
- this.pakout = pakout;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// DocType docType = new DocType(
-// null, // 绫诲瀷缂栧彿[闈炵┖]
-// null, // 绫诲瀷鍚嶇О
-// null, //
-// null, //
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Item.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Item.java
deleted file mode 100644
index 68ecb7f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Item.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_item")
-public class Item implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- private Long id;
-
- /**
- * 椤圭洰缂栧彿
- */
- @ApiModelProperty(value= "椤圭洰缂栧彿")
- @TableId(value = "uuid", type = IdType.INPUT)
- private String uuid;
-
- /**
- * 椤圭洰鍚嶇О
- */
- @ApiModelProperty(value= "椤圭洰鍚嶇О")
- private String name;
-
- /**
- * 鍐呴儴缂栧彿
- */
- @ApiModelProperty(value= "鍐呴儴缂栧彿")
- private String inUuid;
-
- /**
- * 瀹㈡埛缂栧彿
- */
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private String cstmrUuid;
-
- /**
- * 瀹㈡埛
- */
- @ApiModelProperty(value= "瀹㈡埛")
- private String cstmr;
-
- /**
- * 椤圭洰鎴愬憳
- */
- @ApiModelProperty(value= "椤圭洰鎴愬憳")
- private String member;
-
- /**
- * 椤圭洰缁忕悊
- */
- @ApiModelProperty(value= "椤圭洰缁忕悊")
- private String leader;
-
- /**
- * 寮�濮嬫椂闂�
- */
- @ApiModelProperty(value= "寮�濮嬫椂闂�")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date startTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date endTime;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public Item() {}
-
- public Item(String uuid,String name,String inUuid,String cstmrUuid,String cstmr,String member,String leader,Date startTime,Date endTime,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.uuid = uuid;
- this.name = name;
- this.inUuid = inUuid;
- this.cstmrUuid = cstmrUuid;
- this.cstmr = cstmr;
- this.member = member;
- this.leader = leader;
- this.startTime = startTime;
- this.endTime = endTime;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// Item item = new Item(
-// null, // 椤圭洰缂栧彿[闈炵┖]
-// null, // 椤圭洰鍚嶇О
-// null, // 鍐呴儴缂栧彿
-// null, // 瀹㈡埛缂栧彿
-// null, // 瀹㈡埛
-// null, // 椤圭洰鎴愬憳
-// null, // 椤圭洰缁忕悊
-// null, // 寮�濮嬫椂闂�
-// null, // 缁撴潫鏃堕棿
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
- }
-
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
deleted file mode 100644
index f302516..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ /dev/null
@@ -1,340 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.common.wms.service.LocMastService;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_loc_detl")
-public class LocDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
-
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
-
- @ApiModelProperty(value= "")
- private String batch;
-
- @ApiModelProperty(value= "")
- private String orderNo;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "浠撳簱鍙�")
- private String specs;
-
- /**
- * 杞偍璇锋眰缂栧彿
- */
- @ApiModelProperty(value= "杞偍璇锋眰缂栧彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- @ApiModelProperty(value= "")
- private String brand;
-
- @ApiModelProperty(value= "")
- private String unit;
-
- @ApiModelProperty(value= "")
- private Double price;
-
- @ApiModelProperty(value= "")
- private String sku;
-
- @ApiModelProperty(value= "")
- private Double units;
-
- @ApiModelProperty(value= "")
- private String barcode;
-
- @ApiModelProperty(value= "")
- private String origin;
-
- @ApiModelProperty(value= "")
- private String manu;
-
- @ApiModelProperty(value= "")
- private String manuDate;
-
- @ApiModelProperty(value= "")
- private String itemNum;
-
- @ApiModelProperty(value= "")
- private Double safeQty;
-
- @ApiModelProperty(value= "")
- private Double weight;
-
- @ApiModelProperty(value= "")
- private Double length;
-
- @ApiModelProperty(value= "")
- private Double volume;
-
- @ApiModelProperty(value= "")
- private String threeCode;
-
- @ApiModelProperty(value= "")
- private String supp;
-
- @ApiModelProperty(value= "")
- private String suppCode;
-
- @ApiModelProperty(value= "")
- private Integer beBatch;
-
- @ApiModelProperty(value= "")
- private String deadTime;
-
- @ApiModelProperty(value= "")
- private Integer deadWarn;
-
- @ApiModelProperty(value= "")
- private Integer source;
-
- @ApiModelProperty(value= "")
- private Integer inspect;
-
- @ApiModelProperty(value= "")
- private Integer danger;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public LocDetl() {}
-
- public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
- this.locNo = locNo;
- this.zpallet = zpallet;
- this.anfme = anfme;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.orderNo = orderNo;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.safeQty = safeQty;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.beBatch = beBatch;
- this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// LocDetl locDetl = new LocDetl(
-// null, // 搴撲綅鍙穂闈炵┖]
-// null, // 鎵樼洏鏉＄爜
-// null, // 鏁伴噺
-// null, // 鐗╂枡[闈炵┖]
-// null, // 鐗╂枡鎻忚堪
-// null, //
-// null, //
-// null, // 浠撳簱鍙�
-// null, // 杞偍璇锋眰缂栧彿
-// null, // 棰滆壊
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.getById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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 void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDirection.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDirection.java
deleted file mode 100644
index 989f5d9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDirection.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("common_loc_direction")
-public class LocDirection 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 type;
-
- /**
- * 鎺掑簭鏁版嵁
- */
- @ApiModelProperty(value= "鎺掑簭鏁版嵁")
- private String data;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public LocDirection() {}
-
- public LocDirection(String type,String data,Long hostId) {
- this.type = type;
- this.data = data;
- this.hostId = hostId;
- }
-
-// LocDirection locDirection = new LocDirection(
-// 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
deleted file mode 100644
index d8ec34a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.zy.asrs.common.wms.service.BasLocStsService;
-import com.zy.asrs.common.wms.service.BasWhsService;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("common_loc_mast")
-public class LocMast 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 locNo;
-
- /**
- * 搴撲綅绫诲瀷
- */
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
- private Long whsType;
-
- /**
- * 搴撲綅鐘舵��
- */
- @ApiModelProperty(value= "搴撲綅鐘舵��")
- private String locSts;
-
- /**
- * 鍫嗗灈鏈哄彿
- */
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- private Integer crnNo;
-
- /**
- * 鎺�
- */
- @ApiModelProperty(value= "鎺�")
- private Integer row1;
-
- /**
- * 鍒�
- */
- @ApiModelProperty(value= "鍒�")
- private Integer bay1;
-
- /**
- * 灞�
- */
- @ApiModelProperty(value= "灞�")
- private Integer lev1;
-
- /**
- * 婊℃澘(checkBox)
- */
- @ApiModelProperty(value= "婊℃澘(checkBox)")
- private String fullPlt;
-
- /**
- * 楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣�
- */
- @ApiModelProperty(value= "楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣� ")
- private Short locType1;
-
- /**
- * 瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣�
- */
- @ApiModelProperty(value= "瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣� ")
- private Short locType2;
-
- /**
- * 杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣�
- */
- @ApiModelProperty(value= "杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣� ")
- private Short locType3;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date firstTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date errorTime;
-
- @ApiModelProperty(value= "")
- private String errorMemo;
-
- @ApiModelProperty(value= "")
- private String mk;
-
- @ApiModelProperty(value= "")
- private String barcode;
-
- @ApiModelProperty(value= "")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public LocMast() {}
-
- public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId) {
- this.locNo = locNo;
- this.whsType = whsType;
- this.locSts = locSts;
- this.crnNo = crnNo;
- this.row1 = row1;
- this.bay1 = bay1;
- this.lev1 = lev1;
- this.fullPlt = fullPlt;
- this.locType1 = locType1;
- this.locType2 = locType2;
- this.locType3 = locType3;
- this.ioTime = ioTime;
- this.firstTime = firstTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.mk = mk;
- this.barcode = barcode;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// LocMast locMast = new LocMast(
-// null, // 搴撲綅鍙穂闈炵┖]
-// null, // 搴撲綅绫诲瀷
-// null, // 搴撲綅鐘舵�乕闈炵┖]
-// null, // 鍫嗗灈鏈哄彿
-// null, // 鎺�
-// null, // 鍒�
-// null, // 灞�
-// null, // 婊℃澘(checkBox)
-// null, // 楂樹綆绫诲瀷
-// null, // 瀹界獎绫诲瀷
-// null, // 杞婚噸绫诲瀷
-// null, //
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.getById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
- return String.valueOf(basWhs.getWhsDesc());
- }
- return null;
- }
-
- public String getLocSts$(){
- BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
- BasLocSts basLocSts = service.getById(this.locSts);
- if (!Cools.isEmpty(basLocSts)){
- return String.valueOf(basLocSts.getLocDesc());
- }
- return null;
- }
-
- 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 getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getFirstTime$(){
- if (Cools.isEmpty(this.firstTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java
deleted file mode 100644
index 0d41962..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocRule.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_loc_rule")
-public class LocRule implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value= "")
- private String matnr;
-
- @ApiModelProperty(value= "")
- private String specs;
-
- @ApiModelProperty(value= "")
- private String model;
-
- @ApiModelProperty(value= "")
- private String cstmr;
-
- @ApiModelProperty(value= "")
- private String batch;
-
- @ApiModelProperty(value= "")
- private String other;
-
- @ApiModelProperty(value= "")
- private Integer rowBeg;
-
- @ApiModelProperty(value= "")
- private Integer rowEnd;
-
- @ApiModelProperty(value= "")
- private Integer bayBeg;
-
- @ApiModelProperty(value= "")
- private Integer bayEnd;
-
- @ApiModelProperty(value= "")
- private Integer levBeg;
-
- @ApiModelProperty(value= "")
- private Integer levEnd;
-
- @ApiModelProperty(value= "")
- private Integer limit;
-
- @ApiModelProperty(value= "")
- private Integer status;
-
- @ApiModelProperty(value= "")
- private Long createBy;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- @ApiModelProperty(value= "")
- private Long updateBy;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- @ApiModelProperty(value= "")
- private String memo;
-
- /**
- * 鏄惁鏀寔娣疯浇 0: 涓嶆敮鎸� 1: 鏀寔
- */
- @ApiModelProperty(value= "鏄惁鏀寔娣疯浇 0: 涓嶆敮鎸� 1: 鏀寔 ")
- private Short mixed;
-
- /**
- * 鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵� 0: 鍚� 1: 鏄�
- */
- @ApiModelProperty(value= "鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵� 0: 鍚� 1: 鏄� ")
- private Short keepGo;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public LocRule() {}
-
- public LocRule(String matnr,String specs,String model,String cstmr,String batch,String other,Integer rowBeg,Integer rowEnd,Integer bayBeg,Integer bayEnd,Integer levBeg,Integer levEnd,Integer limit,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Short mixed,Short keepGo) {
- this.matnr = matnr;
- this.specs = specs;
- this.model = model;
- this.cstmr = cstmr;
- this.batch = batch;
- this.other = other;
- this.rowBeg = rowBeg;
- this.rowEnd = rowEnd;
- this.bayBeg = bayBeg;
- this.bayEnd = bayEnd;
- this.levBeg = levBeg;
- this.levEnd = levEnd;
- this.limit = limit;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.mixed = mixed;
- this.keepGo = keepGo;
- }
-
-// LocRule locRule = new LocRule(
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鏄惁鏀寔娣疯浇
-// null // 鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵�
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getMixed$(){
- if (null == this.mixed){ return null; }
- switch (this.mixed){
- case 0:
- return "涓嶆敮鎸�";
- case 1:
- return "鏀寔";
- default:
- return String.valueOf(this.mixed);
- }
- }
-
- public String getKeepGo$(){
- if (null == this.keepGo){ return null; }
- switch (this.keepGo){
- case 0:
- return "鍚�";
- case 1:
- return "鏄�";
- default:
- return String.valueOf(this.keepGo);
- }
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
deleted file mode 100644
index c794049..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.TagService;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.service.UserService;
-
-import java.io.Serializable;
-
-@Data
-@TableName("wms_mat")
-public class Mat 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 tagId;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鍒悕
- */
- @ApiModelProperty(value= "鍒悕")
- private String name;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public Mat() {}
-
- public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
- this.uuid = uuid;
- this.tagId = tagId;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.deadTime = deadTime;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
- // Mat manMat = new Mat(
-// null, // 缂栧彿
-// null, // 鎵�灞炲綊绫�
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍒悕
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 瀹夊叏搴撳瓨閲�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null, // 鏄惁鎵规
-// null, // 淇濊川鏈�
-// null, // 棰勮澶╂暟
-// null, // 鍒惰喘
-// null, // 瑕佹眰妫�楠�
-// null, // 鍗遍櫓鍝�
-// null, // 鐘舵�乕闈炵┖]
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getTagId$(){
- TagService tagService = SpringUtils.getBean(TagService.class);
- Tag tag = tagService.getById(this.tagId);
- if (!Cools.isEmpty(tag)){
- return String.valueOf(tag.getName());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/MatCode.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/MatCode.java
deleted file mode 100644
index 51f1280..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/MatCode.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_mat_code")
-public class MatCode implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐗╂枡缂栫爜
- */
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
- @TableId(value = "mat_no", type = IdType.INPUT)
- private String matNo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 鐗╂枡鍚嶇О
- */
- @ApiModelProperty(value= "鐗╂枡鍚嶇О")
- private String matName;
-
- /**
- * 鐗╂枡鍗曚綅
- */
- @ApiModelProperty(value= "鐗╂枡鍗曚綅")
- private String str1;
-
- /**
- * 鐗╂枡瑙勬牸
- */
- @ApiModelProperty(value= "鐗╂枡瑙勬牸")
- private String str2;
-
- @ApiModelProperty(value= "")
- private String str3;
-
- @ApiModelProperty(value= "")
- private String str4;
-
- @ApiModelProperty(value= "")
- private String str5;
-
- @ApiModelProperty(value= "")
- private String str6;
-
- @ApiModelProperty(value= "")
- private String str7;
-
- @ApiModelProperty(value= "")
- private String str8;
-
- @ApiModelProperty(value= "")
- private String str9;
-
- @ApiModelProperty(value= "")
- private String str10;
-
- @ApiModelProperty(value= "")
- private String str11;
-
- @ApiModelProperty(value= "")
- private String str12;
-
- @ApiModelProperty(value= "")
- private String str13;
-
- @ApiModelProperty(value= "")
- private String str14;
-
- @ApiModelProperty(value= "")
- private String str15;
-
- @ApiModelProperty(value= "")
- private String str16;
-
- @ApiModelProperty(value= "")
- private String str17;
-
- @ApiModelProperty(value= "")
- private String str18;
-
- @ApiModelProperty(value= "")
- private String str19;
-
- @ApiModelProperty(value= "")
- private String str20;
-
- @ApiModelProperty(value= "")
- private String str21;
-
- @ApiModelProperty(value= "")
- private String str22;
-
- @ApiModelProperty(value= "")
- private String str23;
-
- @ApiModelProperty(value= "")
- private Double num1;
-
- @ApiModelProperty(value= "")
- private Double num2;
-
- @ApiModelProperty(value= "")
- private Double num3;
-
- @ApiModelProperty(value= "")
- private Double num4;
-
- @ApiModelProperty(value= "")
- private Double num5;
-
- @ApiModelProperty(value= "")
- private Double num6;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date date1;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- @ApiModelProperty(value= "")
- private Short status;
-
- public MatCode() {}
-
- public MatCode(String matNo,String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
- this.matNo = matNo;
- this.barcode = barcode;
- this.matName = matName;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- this.str8 = str8;
- this.str9 = str9;
- this.str10 = str10;
- this.str11 = str11;
- this.str12 = str12;
- this.str13 = str13;
- this.str14 = str14;
- this.str15 = str15;
- this.str16 = str16;
- this.str17 = str17;
- this.str18 = str18;
- this.str19 = str19;
- this.str20 = str20;
- this.str21 = str21;
- this.str22 = str22;
- this.str23 = str23;
- this.num1 = num1;
- this.num2 = num2;
- this.num3 = num3;
- this.num4 = num4;
- this.num5 = num5;
- this.num6 = num6;
- this.date1 = date1;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.status = status;
- }
-
-// MatCode matCode = new MatCode(
-// null, // 鐗╂枡缂栫爜[闈炵┖]
-// null, // 鏉＄爜
-// null, // 鐗╂枡鍚嶇О
-// null, // 鐗╂枡鍗曚綅
-// null, // 鐗╂枡瑙勬牸
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null //
-// );
-
- public String getDate1$(){
- if (Cools.isEmpty(this.date1)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.date1);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Node.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Node.java
deleted file mode 100644
index af32b76..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Node.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.NodeService;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_node")
-public class Node 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 Long parentId;
-
- /**
- * 鐖剁骇鍚嶇О
- */
- @ApiModelProperty(value= "鐖剁骇鍚嶇О")
- private String parentName;
-
- /**
- * 绫诲瀷 1: 浠撳簱 2: 搴撳尯 3: 璐т綅
- */
- @ApiModelProperty(value= "绫诲瀷 1: 浠撳簱 2: 搴撳尯 3: 璐т綅 ")
- private Integer type;
-
- /**
- * 鍏宠仈璺緞
- */
- @ApiModelProperty(value= "鍏宠仈璺緞")
- private String path;
-
- /**
- * 鍏宠仈璺緞鍚�
- */
- @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
- private String namePath;
-
- /**
- * 绛夌骇
- */
- @ApiModelProperty(value= "绛夌骇")
- private Integer level;
-
- /**
- * 璐熻矗浜�
- */
- @ApiModelProperty(value= "璐熻矗浜�")
- private String leading;
-
- /**
- * 鎺掑簭
- */
- @ApiModelProperty(value= "鎺掑簭")
- private Integer sort;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 鎺ㄨ崘浣�
- */
- @ApiModelProperty(value= "鎺ㄨ崘浣�")
- private Integer major;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @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;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public Node() {}
-
- public Node(String uuid,String name,Long parentId,String parentName,Integer type,String path,String namePath,Integer level,String leading,Integer sort,String barcode,Integer major,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,Long hostId) {
- this.uuid = uuid;
- this.name = name;
- this.parentId = parentId;
- this.parentName = parentName;
- this.type = type;
- this.path = path;
- this.namePath = namePath;
- this.level = level;
- this.leading = leading;
- this.sort = sort;
- this.barcode = barcode;
- this.major = major;
- this.status = status;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// Node node = new Node(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 鐖剁骇
-// null, // 鐖剁骇鍚嶇О
-// null, // 绫诲瀷
-// null, // 鍏宠仈璺緞
-// null, // 鍏宠仈璺緞鍚�
-// null, // 绛夌骇
-// null, // 璐熻矗浜�
-// null, // 鎺掑簭
-// null, // 鏉＄爜
-// null, // 鎺ㄨ崘浣�
-// null, // 鐘舵��
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getParentId$(){
- NodeService service = SpringUtils.getBean(NodeService.class);
- Node node = service.getById(this.parentId);
- if (!Cools.isEmpty(node)){
- return String.valueOf(node.getName());
- }
- return null;
- }
-
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
- case 1:
- return "浠撳簱";
- case 2:
- return "搴撳尯";
- case 3:
- return "璐т綅";
- default:
- return String.valueOf(this.type);
- }
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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;
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
deleted file mode 100644
index 64e74b7..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Order.java
+++ /dev/null
@@ -1,473 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.CstmrService;
-import com.zy.asrs.common.wms.service.DocTypeService;
-import com.zy.asrs.common.wms.service.ItemService;
-import com.zy.asrs.common.wms.service.OrderSettleService;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_order")
-public class Order implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- private Long id;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- private String uuid;
-
- /**
- * 璁㈠崟缂栧彿
- */
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
- private String orderNo;
-
- /**
- * 鍗曟嵁鏃ユ湡
- */
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
- private String orderTime;
-
- /**
- * 鍗曟嵁绫诲瀷
- */
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- private Long docType;
-
- /**
- * 椤圭洰缂栧彿
- */
- @ApiModelProperty(value= "椤圭洰缂栧彿")
- private Long itemId;
-
- @ApiModelProperty(value= "")
- private String itemName;
-
- /**
- * 璋冩嫧椤圭洰缂栧彿
- */
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
- private Long allotItemId;
-
- /**
- * 鍒濆绁ㄦ嵁鍙�
- */
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
- private String defNumber;
-
- /**
- * 绁ㄦ嵁鍙�
- */
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
- private String number;
-
- /**
- * 瀹㈡埛缂栧彿
- */
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long cstmr;
-
- /**
- * 瀹㈡埛
- */
- @ApiModelProperty(value= "瀹㈡埛")
- private String cstmrName;
-
- /**
- * 鑱旂郴鏂瑰紡
- */
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
- private String tel;
-
- /**
- * 鎿嶄綔浜哄憳
- */
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
- private String operMemb;
-
- /**
- * 鍚堣閲戦
- */
- @ApiModelProperty(value= "鍚堣閲戦")
- private Double totalFee;
-
- /**
- * 浼樻儬鐜�
- */
- @ApiModelProperty(value= "浼樻儬鐜�")
- private Double discount;
-
- /**
- * 浼樻儬閲戦
- */
- @ApiModelProperty(value= "浼樻儬閲戦")
- private Double discountFee;
-
- /**
- * 閿�鍞垨閲囪喘璐圭敤鍚堣
- */
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
- private Double otherFee;
-
- /**
- * 瀹炰粯閲戦
- */
- @ApiModelProperty(value= "瀹炰粯閲戦")
- private Double actFee;
-
- /**
- * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
- */
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
- private Integer payType;
-
- /**
- * 涓氬姟鍛�
- */
- @ApiModelProperty(value= "涓氬姟鍛�")
- private String salesman;
-
- /**
- * 缁撶畻澶╂暟
- */
- @ApiModelProperty(value= "缁撶畻澶╂暟")
- private Integer accountDay;
-
- /**
- * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
- */
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
- private Integer postFeeType;
-
- /**
- * 閭垂
- */
- @ApiModelProperty(value= "閭垂")
- private Double postFee;
-
- /**
- * 浠樻鏃堕棿
- */
- @ApiModelProperty(value= "浠樻鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date payTime;
-
- /**
- * 鍙戣揣鏃堕棿
- */
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date sendTime;
-
- /**
- * 鐗╂祦鍚嶇О
- */
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
- private String shipName;
-
- /**
- * 鐗╂祦鍗曞彿
- */
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
- private String shipCode;
-
- /**
- * 璁㈠崟鐘舵��
- */
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
- private Long settle;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public Order() {}
-
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.uuid = uuid;
- this.orderNo = orderNo;
- this.orderTime = orderTime;
- this.docType = docType;
- this.itemId = itemId;
- this.itemName = itemName;
- this.allotItemId = allotItemId;
- this.defNumber = defNumber;
- this.number = number;
- this.cstmr = cstmr;
- this.cstmrName = cstmrName;
- this.tel = tel;
- this.operMemb = operMemb;
- this.totalFee = totalFee;
- this.discount = discount;
- this.discountFee = discountFee;
- this.otherFee = otherFee;
- this.actFee = actFee;
- this.payType = payType;
- this.salesman = salesman;
- this.accountDay = accountDay;
- this.postFeeType = postFeeType;
- this.postFee = postFee;
- this.payTime = payTime;
- this.sendTime = sendTime;
- this.shipName = shipName;
- this.shipCode = shipCode;
- this.settle = settle;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// Order order = new Order(
-// null, // 缂栧彿[闈炵┖]
-// null, // 璁㈠崟缂栧彿
-// null, // 鍗曟嵁鏃ユ湡
-// null, // 鍗曟嵁绫诲瀷
-// null, // 椤圭洰缂栧彿
-// null, //
-// null, // 璋冩嫧椤圭洰缂栧彿
-// null, // 鍒濆绁ㄦ嵁鍙�
-// null, // 绁ㄦ嵁鍙�
-// null, // 瀹㈡埛缂栧彿
-// null, // 瀹㈡埛
-// null, // 鑱旂郴鏂瑰紡
-// null, // 鎿嶄綔浜哄憳
-// null, // 鍚堣閲戦
-// null, // 浼樻儬鐜�
-// null, // 浼樻儬閲戦
-// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
-// null, // 瀹炰粯閲戦
-// null, // 浠樻绫诲瀷
-// null, // 涓氬姟鍛�
-// null, // 缁撶畻澶╂暟
-// null, // 閭垂鏀粯绫诲瀷
-// null, // 閭垂
-// null, // 浠樻鏃堕棿
-// null, // 鍙戣揣鏃堕棿
-// null, // 鐗╂祦鍚嶇О
-// null, // 鐗╂祦鍗曞彿
-// null, // 璁㈠崟鐘舵��
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getDocType$(){
- DocTypeService service = SpringUtils.getBean(DocTypeService.class);
- DocType docType = service.getById(this.docType);
- if (!Cools.isEmpty(docType)){
- return String.valueOf(docType.getDocName());
- }
- return null;
- }
-
- public String getItemId$(){
- ItemService service = SpringUtils.getBean(ItemService.class);
- Item item = service.getById(this.itemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getId());
- }
- return null;
- }
-
- public String getAllotItemId$(){
- ItemService service = SpringUtils.getBean(ItemService.class);
- Item item = service.getById(this.allotItemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getId());
- }
- return null;
- }
-
- public String getCstmr$(){
- CstmrService service = SpringUtils.getBean(CstmrService.class);
- Cstmr cstmr = service.getById(this.cstmr);
- if (!Cools.isEmpty(cstmr)){
- return String.valueOf(cstmr.getId());
- }
- return null;
- }
-
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
- case 1:
- return "鐜伴噾";
- case 2:
- return "璁拌处";
- default:
- return String.valueOf(this.payType);
- }
- }
-
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
- case 1:
- return "鍦ㄧ嚎鏀粯";
- case 2:
- return "璐у埌浠樻";
- default:
- return String.valueOf(this.postFeeType);
- }
- }
-
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
- }
-
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
- }
-
- public String getSettle$(){
- OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
- OrderSettle orderSettle = service.getById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
- return String.valueOf(orderSettle.getSettleName());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetl.java
deleted file mode 100644
index 417cba5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetl.java
+++ /dev/null
@@ -1,492 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.common.wms.service.OrderService;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_order_detl")
-public class OrderDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 璁㈠崟鍐呯爜
- */
- @ApiModelProperty(value= "璁㈠崟鍐呯爜")
- private Long orderId;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- @ApiModelProperty(value= "")
- private Double qty;
-
- /**
- * 鍟嗗搧缂栫爜
- */
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public OrderDetl() {}
-
- public OrderDetl(Long orderId,String orderNo,Double anfme,Double qty,String matnr,String maktx,String batch,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.orderId = orderId;
- this.orderNo = orderNo;
- this.anfme = anfme;
- this.qty = qty;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.safeQty = safeQty;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.beBatch = beBatch;
- this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// OrderDetl orderDetl = new OrderDetl(
-// null, // 璁㈠崟鍐呯爜
-// null, // 鍗曟嵁缂栧彿
-// null, // 鏁伴噺
-// null, //
-// null, // 鍟嗗搧缂栫爜
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鎵瑰彿
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 瀹夊叏搴撳瓨閲�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null, // 鏄惁鎵规
-// null, // 淇濊川鏈�
-// null, // 棰勮澶╂暟
-// null, // 鍒惰喘
-// null, // 瑕佹眰妫�楠�
-// null, // 鍗遍櫓鍝�
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getOrderId$(){
- OrderService service = SpringUtils.getBean(OrderService.class);
- Order order = service.getById(this.orderId);
- if (!Cools.isEmpty(order)){
- return String.valueOf(order.getId());
- }
- return null;
- }
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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 Double getEnableQty() {
- if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
- }
- return null;
- }
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
deleted file mode 100644
index ca0af79..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.OrderService;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_order_detl_log")
-public class OrderDetlLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- private Long id;
-
- /**
- * 璁㈠崟鍐呯爜
- */
- @ApiModelProperty(value= "璁㈠崟鍐呯爜")
- private Long orderId;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鍟嗗搧缂栫爜
- */
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍟嗗搧鏉＄爜
- */
- @ApiModelProperty(value= "鍟嗗搧鏉＄爜")
- private String barcode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supplier;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double unitPrice;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private Integer itemNum;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double count;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public OrderDetlLog() {}
-
- public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.id = id;
- this.orderId = orderId;
- this.anfme = anfme;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.supplier = supplier;
- this.unitPrice = unitPrice;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// OrderDetlLog orderDetlLog = new OrderDetlLog(
-// null, // ID[闈炵┖]
-// null, // 璁㈠崟鍐呯爜
-// null, // 鏁伴噺
-// null, // 鍟嗗搧缂栫爜
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍚嶇О
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 鎵瑰彿
-// null, // 鍗曚綅
-// null, // 鍟嗗搧鏉＄爜
-// null, // 渚涘簲鍟�
-// null, // 鍗曚环
-// null, // 鍝侀」鏁�
-// null, // 鏁伴噺
-// null, // 閲嶉噺
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getOrderId$(){
- OrderService service = SpringUtils.getBean(OrderService.class);
- Order order = service.getById(this.orderId);
- if (!Cools.isEmpty(order)){
- return String.valueOf(order.getId());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java
deleted file mode 100644
index 5bacd3e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java
+++ /dev/null
@@ -1,465 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.CstmrService;
-import com.zy.asrs.common.wms.service.DocTypeService;
-import com.zy.asrs.common.wms.service.ItemService;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_order_log")
-public class OrderLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- private Long id;
-
- /**
- * 缂栧彿
- */
- @ApiModelProperty(value= "缂栧彿")
- private String uuid;
-
- /**
- * 璁㈠崟缂栧彿
- */
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
- private String orderNo;
-
- /**
- * 鍗曟嵁鏃ユ湡
- */
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
- private String orderTime;
-
- /**
- * 鍗曟嵁绫诲瀷
- */
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- private Long docType;
-
- /**
- * 椤圭洰缂栧彿
- */
- @ApiModelProperty(value= "椤圭洰缂栧彿")
- private Long itemId;
-
- @ApiModelProperty(value= "")
- private String itemName;
-
- /**
- * 璋冩嫧椤圭洰缂栧彿
- */
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
- private Long allotItemId;
-
- /**
- * 鍒濆绁ㄦ嵁鍙�
- */
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
- private String defNumber;
-
- /**
- * 绁ㄦ嵁鍙�
- */
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
- private String number;
-
- /**
- * 瀹㈡埛缂栧彿
- */
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long cstmr;
-
- /**
- * 瀹㈡埛
- */
- @ApiModelProperty(value= "瀹㈡埛")
- private String cstmrName;
-
- /**
- * 鑱旂郴鏂瑰紡
- */
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
- private String tel;
-
- /**
- * 鎿嶄綔浜哄憳
- */
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
- private String operMemb;
-
- /**
- * 鍚堣閲戦
- */
- @ApiModelProperty(value= "鍚堣閲戦")
- private Double totalFee;
-
- /**
- * 浼樻儬鐜�
- */
- @ApiModelProperty(value= "浼樻儬鐜�")
- private Double discount;
-
- /**
- * 浼樻儬閲戦
- */
- @ApiModelProperty(value= "浼樻儬閲戦")
- private Double discountFee;
-
- /**
- * 閿�鍞垨閲囪喘璐圭敤鍚堣
- */
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
- private Double otherFee;
-
- /**
- * 瀹炰粯閲戦
- */
- @ApiModelProperty(value= "瀹炰粯閲戦")
- private Double actFee;
-
- /**
- * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
- */
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
- private Integer payType;
-
- /**
- * 涓氬姟鍛�
- */
- @ApiModelProperty(value= "涓氬姟鍛�")
- private String salesman;
-
- /**
- * 缁撶畻澶╂暟
- */
- @ApiModelProperty(value= "缁撶畻澶╂暟")
- private Integer accountDay;
-
- /**
- * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
- */
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
- private Integer postFeeType;
-
- /**
- * 閭垂
- */
- @ApiModelProperty(value= "閭垂")
- private Double postFee;
-
- /**
- * 浠樻鏃堕棿
- */
- @ApiModelProperty(value= "浠樻鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date payTime;
-
- /**
- * 鍙戣揣鏃堕棿
- */
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date sendTime;
-
- /**
- * 鐗╂祦鍚嶇О
- */
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
- private String shipName;
-
- /**
- * 鐗╂祦鍗曞彿
- */
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
- private String shipCode;
-
- /**
- * 璁㈠崟鐘舵��
- */
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
- private Long settle;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public OrderLog() {}
-
- public OrderLog(Long id,String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.id = id;
- this.uuid = uuid;
- this.orderNo = orderNo;
- this.orderTime = orderTime;
- this.docType = docType;
- this.itemId = itemId;
- this.itemName = itemName;
- this.allotItemId = allotItemId;
- this.defNumber = defNumber;
- this.number = number;
- this.cstmr = cstmr;
- this.cstmrName = cstmrName;
- this.tel = tel;
- this.operMemb = operMemb;
- this.totalFee = totalFee;
- this.discount = discount;
- this.discountFee = discountFee;
- this.otherFee = otherFee;
- this.actFee = actFee;
- this.payType = payType;
- this.salesman = salesman;
- this.accountDay = accountDay;
- this.postFeeType = postFeeType;
- this.postFee = postFee;
- this.payTime = payTime;
- this.sendTime = sendTime;
- this.shipName = shipName;
- this.shipCode = shipCode;
- this.settle = settle;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// OrderLog orderLog = new OrderLog(
-// null, // ID[闈炵┖]
-// null, // 缂栧彿[闈炵┖]
-// null, // 璁㈠崟缂栧彿
-// null, // 鍗曟嵁鏃ユ湡
-// null, // 鍗曟嵁绫诲瀷
-// null, // 椤圭洰缂栧彿
-// null, //
-// null, // 璋冩嫧椤圭洰缂栧彿
-// null, // 鍒濆绁ㄦ嵁鍙�
-// null, // 绁ㄦ嵁鍙�
-// null, // 瀹㈡埛缂栧彿
-// null, // 瀹㈡埛
-// null, // 鑱旂郴鏂瑰紡
-// null, // 鎿嶄綔浜哄憳
-// null, // 鍚堣閲戦
-// null, // 浼樻儬鐜�
-// null, // 浼樻儬閲戦
-// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
-// null, // 瀹炰粯閲戦
-// null, // 浠樻绫诲瀷
-// null, // 涓氬姟鍛�
-// null, // 缁撶畻澶╂暟
-// null, // 閭垂鏀粯绫诲瀷
-// null, // 閭垂
-// null, // 浠樻鏃堕棿
-// null, // 鍙戣揣鏃堕棿
-// null, // 鐗╂祦鍚嶇О
-// null, // 鐗╂祦鍗曞彿
-// null, // 璁㈠崟鐘舵��
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getDocType$(){
- DocTypeService service = SpringUtils.getBean(DocTypeService.class);
- DocType docType = service.getById(this.docType);
- if (!Cools.isEmpty(docType)){
- return String.valueOf(docType.getDocName());
- }
- return null;
- }
-
- public String getItemId$(){
- ItemService service = SpringUtils.getBean(ItemService.class);
- Item item = service.getById(this.itemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getId());
- }
- return null;
- }
-
- public String getAllotItemId$(){
- ItemService service = SpringUtils.getBean(ItemService.class);
- Item item = service.getById(this.allotItemId);
- if (!Cools.isEmpty(item)){
- return String.valueOf(item.getId());
- }
- return null;
- }
-
- public String getCstmr$(){
- CstmrService service = SpringUtils.getBean(CstmrService.class);
- Cstmr cstmr = service.getById(this.cstmr);
- if (!Cools.isEmpty(cstmr)){
- return String.valueOf(cstmr.getId());
- }
- return null;
- }
-
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
- case 1:
- return "鐜伴噾";
- case 2:
- return "璁拌处";
- default:
- return String.valueOf(this.payType);
- }
- }
-
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
- case 1:
- return "鍦ㄧ嚎鏀粯";
- case 2:
- return "璐у埌浠樻";
- default:
- return String.valueOf(this.postFeeType);
- }
- }
-
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
- }
-
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderSettle.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderSettle.java
deleted file mode 100644
index b0b8fc6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderSettle.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_order_settle")
-public class OrderSettle implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 璁㈠崟鐘舵��
- */
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
- @TableId(value = "order_settle", type = IdType.INPUT)
- private Long orderSettle;
-
- /**
- * 鐘舵�佹弿杩�
- */
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
- private String settleName;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public OrderSettle() {}
-
- public OrderSettle(Long orderSettle,String settleName,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.orderSettle = orderSettle;
- this.settleName = settleName;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// OrderSettle orderSettle = new OrderSettle(
-// null, // 璁㈠崟鐘舵�乕闈炵┖]
-// null, // 鐘舵�佹弿杩�
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Prior.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Prior.java
deleted file mode 100644
index 216fa72..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Prior.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.MatService;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_prior")
-public class Prior 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 Long matId;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- /**
- * 瀹夊叏搴撳瓨
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨")
- private Double safeQua;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- private Integer prio;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public Prior() {}
-
- public Prior(String uuid,String name,Long matId,String matnr,String maktx,String locNo,Double safeQua,Integer prio,String barcode,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.name = name;
- this.matId = matId;
- this.matnr = matnr;
- this.maktx = maktx;
- this.locNo = locNo;
- this.safeQua = safeQua;
- this.prio = prio;
- this.barcode = barcode;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// Prior prior = new Prior(
-// null, // 缂栧彿
-// null, // 鎺ㄨ崘鍚�
-// null, // 鍏宠仈鍟嗗搧[闈炵┖]
-// null, // 鍟嗗搧缂栧彿
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍏宠仈璐т綅[闈炵┖]
-// null, // 璐т綅鍚嶇О
-// null, // 瀹夊叏搴撳瓨
-// null, // 浼樺厛绾�
-// null, // 鏉＄爜
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getMatId$(){
- MatService service = SpringUtils.getBean(MatService.class);
- Mat mat = service.getById(this.matId);
- if (!Cools.isEmpty(mat)){
- return String.valueOf(mat.getId());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- 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;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java
deleted file mode 100644
index 067a1ed..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RowLastno.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_row_lastno")
-public class RowLastno implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 绫诲埆
- */
- @ApiModelProperty(value= "绫诲埆")
- private Integer whsType;
-
- /**
- * 褰撳墠宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "褰撳墠宸ヤ綔鍙�")
- private String wrkMk;
-
- /**
- * 褰撳墠鎺掑彿
- */
- @ApiModelProperty(value= "褰撳墠鎺掑彿")
- private Integer currentRow;
-
- /**
- * 璧峰鎺掑彿
- */
- @ApiModelProperty(value= "璧峰鎺掑彿")
- private Integer startRow;
-
- /**
- * 缁堟鎺掑彿
- */
- @ApiModelProperty(value= "缁堟鎺掑彿")
- private Integer targetRow;
-
- /**
- * 鍫嗗灈鏈烘暟閲�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈烘暟閲�")
- private Integer crnQty;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- private Integer limintLoc;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public RowLastno() {}
-
- public RowLastno(Integer whsType,String wrkMk,Integer currentRow,Integer startRow,Integer targetRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
- this.whsType = whsType;
- this.wrkMk = wrkMk;
- this.currentRow = currentRow;
- this.startRow = startRow;
- this.targetRow = targetRow;
- 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, // 娣诲姞鏃堕棿
-// null //
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java
deleted file mode 100644
index ee0ed79..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Tag.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.service.UserService;
-
-import java.io.Serializable;
-
-@Data
-@TableName("wms_tag")
-public class Tag 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 Long parentId;
-
- /**
- * 鐖剁骇鍚嶇О
- */
- @ApiModelProperty(value= "鐖剁骇鍚嶇О")
- private String parentName;
-
- /**
- * 鍏宠仈璺緞
- */
- @ApiModelProperty(value= "鍏宠仈璺緞")
- private String path;
-
- /**
- * 鍏宠仈璺緞鍚�
- */
- @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
- private String pathName;
-
- /**
- * 绫诲瀷 1: 鐩掕 2: 琚嬭 0: 鍏朵粬
- */
- @ApiModelProperty(value= "绫诲瀷 1: 鐩掕 2: 琚嬭 0: 鍏朵粬 ")
- private Integer type;
-
- /**
- * 璐熻矗浜�
- */
- @ApiModelProperty(value= "璐熻矗浜�")
- private String leading;
-
- /**
- * 鍥剧墖
- */
- @ApiModelProperty(value= "鍥剧墖")
- private String img;
-
- /**
- * 绠�瑕佹弿杩�
- */
- @ApiModelProperty(value= "绠�瑕佹弿杩�")
- private String brief;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Integer count;
-
- /**
- * 绛夌骇
- */
- @ApiModelProperty(value= "绛夌骇")
- private Integer level;
-
- /**
- * 鎺掑簭
- */
- @ApiModelProperty(value= "鎺掑簭")
- private Integer sort;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @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;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public Tag() {}
-
- public Tag(String uuid, String name, Long parentId, String parentName, String path, String pathName, Integer type, String leading, String img, String brief, Integer count, Integer level, Integer sort, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
- this.uuid = uuid;
- this.name = name;
- this.parentId = parentId;
- this.parentName = parentName;
- this.path = path;
- this.pathName = pathName;
- this.type = type;
- this.leading = leading;
- this.img = img;
- this.brief = brief;
- this.count = count;
- this.level = level;
- this.sort = sort;
- this.status = status;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// Tag manTag = new Tag(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 鐖剁骇
-// null, // 鐖剁骇鍚嶇О
-// null, // 鍏宠仈璺緞
-// null, // 鍏宠仈璺緞鍚�
-// null, // 绫诲瀷
-// null, // 璐熻矗浜�
-// null, // 鍥剧墖
-// null, // 绠�瑕佹弿杩�
-// null, // 鏁伴噺
-// null, // 绛夌骇
-// null, // 鎺掑簭
-// null, // 鐘舵��
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
- case 1:
- return "鐩掕";
- case 2:
- return "琚嬭";
- case 0:
- return "鍏朵粬";
- default:
- return String.valueOf(this.type);
- }
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- 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-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
deleted file mode 100644
index cf1bdeb..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewInOutBean.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import lombok.Data;
-
-/**
- * 鏃ュ嚭鍏ュ簱娆℃暟缁熻
- * @author admin
- * @date 2018骞�11鏈�24鏃�
- */
-@Data
-public class ViewInOutBean {
- private String ymd;
- private String sourceStaNo;
- private Long stoQty;
- private Long retQty;
- private Long totalQty;
- private int pageNumber;
- private int pageSize;
- private String beginDate; //鏌ヨ寮�濮嬫棩鏈�
- private String endDate; //鏌ヨ鎴鏃ユ湡
-}
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java
deleted file mode 100644
index 0bcca55..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStayTimeBean.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.zy.asrs.common.sys.entity.User;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 搴撳瓨婊炵暀鏃堕棿瀹炰綋绫�
- * @author admin
- * @date 2018骞�11鏈�23鏃�
- */
-@Data
-public class ViewStayTimeBean {
-
- private int pageNumber;
- private int pageSize;
-
- private int stayTime;
-
- private String beginDate;
- private String endDate;
-
- private Integer row;
-
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- @ApiModelProperty(value= "搴忓垪鐮�")
- private String batch;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- @ApiModelProperty(value= "sku")
- private String sku;
-
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Date modiTime;
-
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Date appeTime;
-
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(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.getById(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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java
deleted file mode 100644
index 2605785..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewStockUseBean.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import lombok.Data;
-
-/**
- * 搴撲綅浣跨敤鐜囪鍥惧疄浣撶被
- * @author admin
- * @date 2018骞�11鏈�23鏃�
- */
-@Data
-public class ViewStockUseBean {
- private String row1; //閽㈡灦鍙�
-
- private Long totalQty; //搴撲綅鎬绘暟
-
- private Long fullQty; //鍦ㄥ簱鏁伴噺
-
- private Long nullQty; //绌哄簱浣�
-
- private Long forbidQty; //绂佺敤搴撲綅
-
- private Long emptyQty; //绌哄鍣�
-
- private String fullRate; //鍦ㄥ簱鐜�
-
- private String occRate; //浣跨敤鐜�
-
- private int pageNumber;
-
- private int pageSize;
-}
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
deleted file mode 100644
index 2a6332f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import com.zy.asrs.common.sys.entity.User;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 鍏ュ簱鏄庣粏缁熻
- * @author admin
- * @date 2018骞�11鏈�26鏃�
- */
-@Data
-public class ViewWorkInBean {
-
-
- private int pageNumber;
- private int pageSize;
-
- private int stayTime;
-
- private String beginDate;
- private String endDate;
- private String queryDate;
-
- private Integer row;
-
- private String crnStrTime;
- private String crnEndTime;
-
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrkNo;
-
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- private Date ioTime;
-
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- @ApiModelProperty(value= "搴忓垪鐮�")
- private String batch;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- @ApiModelProperty(value= "sku")
- private String sku;
-
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Object modiTime;
-
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Object appeTime;
-
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public void setQueryDate(String queryDate) {
- this.queryDate = queryDate;
- if (queryDate.contains(" - ")) {
- String[] dates = queryDate.split(" - ");
- this.beginDate = dates[0];
- this.endDate = dates[1];
-
- }
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
deleted file mode 100644
index 461b5f8..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
+++ /dev/null
@@ -1,435 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.utils.Synchro;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wait_pakin")
-public class WaitPakin implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- @ApiModelProperty(value= "")
- private String status;
-
- @ApiModelProperty(value= "")
- private String ioStatus;
-
- @ApiModelProperty(value= "")
- private Long modiUser;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- @ApiModelProperty(value= "")
- private Long appeUser;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public WaitPakin() {}
-
- public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
- this.zpallet = zpallet;
- this.anfme = anfme;
- this.locNo = locNo;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.orderNo = orderNo;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.safeQty = safeQty;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.beBatch = beBatch;
- this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
- this.status = status;
- this.ioStatus = ioStatus;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// WaitPakin waitPakin = new WaitPakin(
-// null, // 鎵樼洏鏉＄爜[闈炵┖]
-// null, // 鏁伴噺
-// null, // 搴撲綅鍙�
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鎵瑰彿
-// null, // 鍗曟嵁缂栧彿
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 瀹夊叏搴撳瓨閲�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null, // 鏄惁鎵规
-// null, // 淇濊川鏈�
-// null, // 棰勮澶╂暟
-// null, // 鍒惰喘
-// null, // 瑕佹眰妫�楠�
-// null, // 鍗遍櫓鍝�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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 void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
deleted file mode 100644
index 2cfc1f8..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakinLog.java
+++ /dev/null
@@ -1,431 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wait_pakin_log")
-public class WaitPakinLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- private Long id;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- @ApiModelProperty(value= "")
- private String status;
-
- @ApiModelProperty(value= "")
- private String ioStatus;
-
- @ApiModelProperty(value= "")
- private Long modiUser;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- @ApiModelProperty(value= "")
- private Long appeUser;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- public WaitPakinLog() {}
-
- public WaitPakinLog(Long id,String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
- this.id = id;
- this.zpallet = zpallet;
- this.anfme = anfme;
- this.locNo = locNo;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.orderNo = orderNo;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.safeQty = safeQty;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.beBatch = beBatch;
- this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
- this.status = status;
- this.ioStatus = ioStatus;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// WaitPakinLog waitPakinLog = new WaitPakinLog(
-// null, // [闈炵┖]
-// null, // 鎵樼洏鏉＄爜[闈炵┖]
-// null, // 鏁伴噺
-// null, // 搴撲綅鍙�
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鎵瑰彿
-// null, // 鍗曟嵁缂栧彿
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 瀹夊叏搴撳瓨閲�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null, // 鏄惁鎵规
-// null, // 淇濊川鏈�
-// null, // 棰勮澶╂暟
-// null, // 鍒惰喘
-// null, // 瑕佹眰妫�楠�
-// null, // 鍗遍櫓鍝�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
deleted file mode 100644
index dde883f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
+++ /dev/null
@@ -1,479 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.utils.Synchro;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wrk_detl")
-public class WrkDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrkNo;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- /**
- * 宸ヤ綔妗D
- */
- @ApiModelProperty(value= "宸ヤ綔妗D")
- private Long wrkMastId;
-
- public WrkDetl() {}
-
- public WrkDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
- this.wrkNo = wrkNo;
- this.ioTime = ioTime;
- this.anfme = anfme;
- this.zpallet = zpallet;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.orderNo = orderNo;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.safeQty = safeQty;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.beBatch = beBatch;
- this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// WrkDetl wrkDetl = new WrkDetl(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鏁伴噺
-// null, // 鎵樼洏鏉＄爜
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鎵瑰彿
-// null, // 鍗曟嵁缂栧彿
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 瀹夊叏搴撳瓨閲�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null, // 鏄惁鎵规
-// null, // 淇濊川鏈�
-// null, // 棰勮澶╂暟
-// null, // 鍒惰喘
-// null, // 瑕佹眰妫�楠�
-// null, // 鍗遍櫓鍝�
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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 void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java
deleted file mode 100644
index c2da70a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetlLog.java
+++ /dev/null
@@ -1,475 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wrk_detl_log")
-public class WrkDetlLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrkNo;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String orderNo;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty(value= "棰滆壊")
- private String color;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * sku
- */
- @ApiModelProperty(value= "sku")
- private String sku;
-
- /**
- * 鍗曚綅閲�
- */
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 浜у湴
- */
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- /**
- * 鍘傚
- */
- @ApiModelProperty(value= "鍘傚")
- private String manu;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manuDate;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String itemNum;
-
- /**
- * 瀹夊叏搴撳瓨閲�
- */
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safeQty;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 闀垮害
- */
- @ApiModelProperty(value= "闀垮害")
- private Double length;
-
- /**
- * 浣撶Н
- */
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
-
- /**
- * 涓夋柟缂栫爜
- */
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String threeCode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
-
- /**
- * 渚涘簲鍟嗙紪鐮�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String suppCode;
-
- /**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer beBatch;
-
- /**
- * 淇濊川鏈�
- */
- @ApiModelProperty(value= "淇濊川鏈�")
- private String deadTime;
-
- /**
- * 棰勮澶╂暟
- */
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer deadWarn;
-
- /**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
- */
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
-
- /**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- /**
- * 宸ヤ綔妗D
- */
- @ApiModelProperty(value= "宸ヤ綔妗D")
- private Long wrkMastId;
-
- public WrkDetlLog() {}
-
- public WrkDetlLog(Long id,Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
- this.id = id;
- this.wrkNo = wrkNo;
- this.ioTime = ioTime;
- this.anfme = anfme;
- this.zpallet = zpallet;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.orderNo = orderNo;
- this.specs = specs;
- this.model = model;
- this.color = color;
- this.brand = brand;
- this.unit = unit;
- this.price = price;
- this.sku = sku;
- this.units = units;
- this.barcode = barcode;
- this.origin = origin;
- this.manu = manu;
- this.manuDate = manuDate;
- this.itemNum = itemNum;
- this.safeQty = safeQty;
- this.weight = weight;
- this.length = length;
- this.volume = volume;
- this.threeCode = threeCode;
- this.supp = supp;
- this.suppCode = suppCode;
- this.beBatch = beBatch;
- this.deadTime = deadTime;
- this.deadWarn = deadWarn;
- this.source = source;
- this.inspect = inspect;
- this.danger = danger;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.memo = memo;
- this.hostId = hostId;
- }
-
-// WrkDetlLog wrkDetlLog = new WrkDetlLog(
-// null, // [闈炵┖]
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鏃堕棿
-// null, // 鏁伴噺
-// null, // 鎵樼洏鏉＄爜
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鎵瑰彿
-// null, // 鍗曟嵁缂栧彿
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 棰滆壊
-// null, // 鍝佺墝
-// null, // 鍗曚綅
-// null, // 鍗曚环
-// null, // sku
-// null, // 鍗曚綅閲�
-// null, // 鏉＄爜
-// null, // 浜у湴
-// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
-// null, // 鍝侀」鏁�
-// null, // 瀹夊叏搴撳瓨閲�
-// null, // 閲嶉噺
-// null, // 闀垮害
-// null, // 浣撶Н
-// null, // 涓夋柟缂栫爜
-// null, // 渚涘簲鍟�
-// null, // 渚涘簲鍟嗙紪鐮�
-// null, // 鏄惁鎵规
-// null, // 淇濊川鏈�
-// null, // 棰勮澶╂暟
-// null, // 鍒惰喘
-// null, // 瑕佹眰妫�楠�
-// null, // 鍗遍櫓鍝�
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 澶囨敞
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.beBatch);
- }
- }
-
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
- case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
- default:
- return String.valueOf(this.source);
- }
- }
-
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.inspect);
- }
- }
-
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.danger);
- }
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java
deleted file mode 100644
index 5dd0df2..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkLastno.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wrk_lastno")
-public class WrkLastno implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 绫诲瀷
- */
- @ApiModelProperty(value= "绫诲瀷")
- private Integer wrkMk;
-
- /**
- * 褰撳墠ID
- */
- @ApiModelProperty(value= "褰撳墠ID")
- private Integer wrkNo;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 璧峰ID
- */
- @ApiModelProperty(value= "璧峰ID")
- private Integer startNo;
-
- /**
- * 缁堟ID
- */
- @ApiModelProperty(value= "缁堟ID")
- private Integer targetNo;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memoM;
-
- /**
- * 浠撳簱ID
- */
- @ApiModelProperty(value= "浠撳簱ID")
- private Long hostId;
-
- public WrkLastno() {}
-
- public WrkLastno(Integer wrkMk,Integer wrkNo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer startNo,Integer targetNo,String memoM) {
- this.wrkMk = wrkMk;
- this.wrkNo = wrkNo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.startNo = startNo;
- this.targetNo = targetNo;
- this.memoM = memoM;
- }
-
-// WrkLastno wrkLastno = new WrkLastno(
-// null, // 绫诲瀷[闈炵┖]
-// null, // 褰撳墠ID[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, // 璧峰ID[闈炵┖]
-// null, // 缁堟ID[闈炵┖]
-// null // 澶囨敞
-// );
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
deleted file mode 100644
index 80e9f1a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
+++ /dev/null
@@ -1,340 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.BasWrkIotypeService;
-import com.zy.asrs.common.wms.service.BasWrkStatusService;
-import com.zy.asrs.common.wms.service.LocMastService;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wrk_mast")
-public class WrkMast implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrkNo;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- private Long wrkSts;
-
- /**
- * 鍏ュ嚭搴撶被鍨�
- */
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- private Integer ioType;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- private Double ioPri;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- private String locNo;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- private Integer staNo;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- private Integer sourceStaNo;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- private String sourceLocNo;
-
- /**
- * 鎷ｆ枡(checkBox)
- */
- @ApiModelProperty(value= "鎷ｆ枡(checkBox)")
- private String picking;
-
- /**
- * 閫�鍑�(checkBox)
- */
- @ApiModelProperty(value= "閫�鍑�(checkBox)")
- private String exitMk;
-
- @ApiModelProperty(value= "")
- private Integer pltType;
-
- /**
- * 绌烘澘(checkBox)
- */
- @ApiModelProperty(value= "绌烘澘(checkBox)")
- private String emptyMk;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- @ApiModelProperty(value= "")
- private Integer ctnType;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private String modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private String appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date errorTime;
-
- @ApiModelProperty(value= "")
- private String errorMemo;
-
- @ApiModelProperty(value= "")
- private String manuType;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 婊℃澘(checkBox)
- */
- @ApiModelProperty(value= "婊℃澘(checkBox)")
- private String fullPlt;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- @ApiModelProperty(value= "oveMk")
- private String oveMk;
-
- @ApiModelProperty(value= "invWh")
- private String invWh;
-
- public WrkMast() {}
-
- public WrkMast(Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
- this.wrkNo = wrkNo;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.ioPri = ioPri;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.picking = picking;
- this.exitMk = exitMk;
- this.pltType = pltType;
- this.emptyMk = emptyMk;
- this.ioTime = ioTime;
- this.ctnType = ctnType;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.manuType = manuType;
- this.memo = memo;
- this.barcode = barcode;
- this.fullPlt = fullPlt;
- this.hostId = hostId;
- }
-
-// WrkMast wrkMast = new WrkMast(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, // 浼樺厛绾�
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, // 鎷ｆ枡(checkBox)
-// null, // 閫�鍑�(checkBox)
-// null, //
-// null, // 绌烘澘(checkBox)
-// null, // 宸ヤ綔鏃堕棿
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, // 澶囨敞
-// null, // 鏉＄爜
-// null, // 婊℃澘(checkBox)
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getWrkSts$(){
- BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
- return String.valueOf(basWrkStatus.getWrkDesc());
- }
- return null;
- }
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.getById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.getById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.getById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
deleted file mode 100644
index d996070..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package com.zy.asrs.common.wms.entity;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import com.zy.asrs.common.wms.service.BasWrkIotypeService;
-import com.zy.asrs.common.wms.service.BasWrkStatusService;
-import com.zy.asrs.common.wms.service.LocMastService;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-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.common.sys.entity.User;
-import com.zy.asrs.common.sys.entity.Host;
-import com.zy.asrs.common.sys.service.UserService;
-import com.zy.asrs.common.sys.service.HostService;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("wms_wrk_mast_log")
-public class WrkMastLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrkNo;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- private Long wrkSts;
-
- /**
- * 鍏ュ嚭搴撶被鍨�
- */
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- private Integer ioType;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- private Double ioPri;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- private String locNo;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- private Integer staNo;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- private Integer sourceStaNo;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- private String sourceLocNo;
-
- /**
- * 鎷ｆ枡(checkBox)
- */
- @ApiModelProperty(value= "鎷ｆ枡(checkBox)")
- private String picking;
-
- /**
- * 閫�鍑�(checkBox)
- */
- @ApiModelProperty(value= "閫�鍑�(checkBox)")
- private String exitMk;
-
- @ApiModelProperty(value= "")
- private Integer pltType;
-
- /**
- * 绌烘澘(checkBox)
- */
- @ApiModelProperty(value= "绌烘澘(checkBox)")
- private String emptyMk;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- @ApiModelProperty(value= "")
- private Integer ctnType;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private String modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private String appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date errorTime;
-
- @ApiModelProperty(value= "")
- private String errorMemo;
-
- @ApiModelProperty(value= "")
- private String manuType;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
-
- /**
- * 婊℃澘(checkBox)
- */
- @ApiModelProperty(value= "婊℃澘(checkBox)")
- private String fullPlt;
-
- /**
- * 鎺堟潈鍟嗘埛
- */
- @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
- private Long hostId;
-
- @ApiModelProperty(value= "oveMk")
- private String oveMk;
-
- @ApiModelProperty(value= "invWh")
- private String invWh;
-
- public WrkMastLog() {}
-
- public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
- this.id = id;
- this.wrkNo = wrkNo;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.ioPri = ioPri;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.picking = picking;
- this.exitMk = exitMk;
- this.pltType = pltType;
- this.emptyMk = emptyMk;
- this.ioTime = ioTime;
- this.ctnType = ctnType;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.manuType = manuType;
- this.memo = memo;
- this.barcode = barcode;
- this.fullPlt = fullPlt;
- this.hostId = hostId;
- }
-
-// WrkMastLog wrkMastLog = new WrkMastLog(
-// null, // [闈炵┖]
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, // 浼樺厛绾�
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, // 鎷ｆ枡(checkBox)
-// null, // 閫�鍑�(checkBox)
-// null, //
-// null, // 绌烘澘(checkBox)
-// null, // 宸ヤ綔鏃堕棿
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, // 澶囨敞
-// null, // 鏉＄爜
-// null, // 婊℃澘(checkBox)
-// null // 鎺堟潈鍟嗘埛
-// );
-
- public String getWrkSts$(){
- BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
- return String.valueOf(basWrkStatus.getWrkDesc());
- }
- return null;
- }
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.getById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.getById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.getById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- 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;
- }
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/AdjDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/AdjDetlMapper.java
deleted file mode 100644
index 4722275..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/AdjDetlMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.AdjDetl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface AdjDetlMapper extends BaseMapper<AdjDetl> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java
deleted file mode 100644
index 2b63f90..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasBarcode;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasBarcodeMapper extends BaseMapper<BasBarcode> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasDevpMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasDevpMapper.java
deleted file mode 100644
index 16db60e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasDevpMapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasDevp;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-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, @Param("hostId") Long hostId);
-
- List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo, @Param("hostId") Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasLocStsMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasLocStsMapper.java
deleted file mode 100644
index 7729278..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasLocStsMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasLocSts;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasLocStsMapper extends BaseMapper<BasLocSts> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasMapMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasMapMapper.java
deleted file mode 100644
index b58213b..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasMapMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasMap;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasMapMapper extends BaseMapper<BasMap> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWhsMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWhsMapper.java
deleted file mode 100644
index ab1684c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWhsMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasWhs;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasWhsMapper extends BaseMapper<BasWhs> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkIotypeMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkIotypeMapper.java
deleted file mode 100644
index 1db8261..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkIotypeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasWrkIotype;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasWrkIotypeMapper extends BaseMapper<BasWrkIotype> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkStatusMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkStatusMapper.java
deleted file mode 100644
index bb9ca71..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasWrkStatusMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.BasWrkStatus;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface BasWrkStatusMapper extends BaseMapper<BasWrkStatus> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/CstmrMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/CstmrMapper.java
deleted file mode 100644
index 35b739e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/CstmrMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.Cstmr;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface CstmrMapper extends BaseMapper<Cstmr> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/DocTypeMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/DocTypeMapper.java
deleted file mode 100644
index 8c37878..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/DocTypeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.DocType;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface DocTypeMapper extends BaseMapper<DocType> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ItemMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ItemMapper.java
deleted file mode 100644
index 86284f1..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ItemMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.Item;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface ItemMapper extends BaseMapper<Item> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
deleted file mode 100644
index 8dc58e0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zy.asrs.common.domain.dto.QueryStockPreDo;
-import com.zy.asrs.common.domain.dto.ReportStockDto;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Mapper
-@Repository
-public interface LocDetlMapper extends BaseMapper<LocDetl> {
-
- IPage<LocDetl> getStockStatis(IPage<?> page, Map<String, Object> map);
-
- Integer sum();
-
- List<LocDetl> queryStock(@Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- LocDetl selectItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- int deleteItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- int updateAnfme(@Param("anfme") Double anfme, @Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- @Update("update wms_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo} and host_id = #{hostId}")
- int updateLocNo(String newLocNo, String oldLocNo, Long hostId);
-
- IPage<LocDetl> getStockOutPage(IPage<LocDetl> page, Map<String, Object> map);
-
- List<ReportStockDto> getReportStockDto(Long hostId);
-
- List<String> selectSameDetl(@Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDirectionMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDirectionMapper.java
deleted file mode 100644
index d7f2e9a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDirectionMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.LocDirection;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface LocDirectionMapper extends BaseMapper<LocDirection> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocMastMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocMastMapper.java
deleted file mode 100644
index 941aabd..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocMastMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface LocMastMapper extends BaseMapper<LocMast> {
-
- @Select("select loc_no from common_loc_mast where 1=1 and loc_sts = 'O' and host_id = #{hostId}")
- List<String> queryGroupEmptyStock(Long hostId);
-
- List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java
deleted file mode 100644
index 1afd995..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocRuleMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.LocRule;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface LocRuleMapper extends BaseMapper<LocRule> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatCodeMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatCodeMapper.java
deleted file mode 100644
index ee5bc79..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatCodeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.MatCode;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MatCodeMapper extends BaseMapper<MatCode> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java
deleted file mode 100644
index 8db3608..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/MatMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.Mat;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MatMapper extends BaseMapper<Mat> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/NodeMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/NodeMapper.java
deleted file mode 100644
index 5a25770..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/NodeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.Node;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface NodeMapper extends BaseMapper<Node> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlLogMapper.java
deleted file mode 100644
index ca0118a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.OrderDetlLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface OrderDetlLogMapper extends BaseMapper<OrderDetlLog> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
deleted file mode 100644
index 56add91..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-@Repository
-public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
-
- List<OrderDetl> selectWorkingDetls(Long orderId);
-
- OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
-
- IPage<OrderDetl> getPakoutPage(Page<OrderDetl> page ,Map<String, Object> map);
-
- int increase(@Param("orderId") Long orderId, @Param("hostId") Long hostId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
-
- int decrease(@Param("orderNo") String orderNo, @Param("hostId") Long hostId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderLogMapper.java
deleted file mode 100644
index 11b6e7a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.OrderLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface OrderLogMapper extends BaseMapper<OrderLog> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
deleted file mode 100644
index 9a02a9b..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.Order;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface OrderMapper extends BaseMapper<Order> {
-
- void updateOrder1(Long orderId,@Param("userId")Long userId);
-
- int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId, @Param("hostId") Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderSettleMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderSettleMapper.java
deleted file mode 100644
index 600ec9d..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderSettleMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.OrderSettle;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface OrderSettleMapper extends BaseMapper<OrderSettle> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/PriorMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/PriorMapper.java
deleted file mode 100644
index 075a772..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/PriorMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.dto.SafeStoDo;
-import com.zy.asrs.common.domain.entity.SafeStoExport;
-import com.zy.asrs.common.wms.entity.Prior;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-@Repository
-public interface PriorMapper extends BaseMapper<Prior> {
-
- IPage<SafeStoDo> selectSafeStoPage(Page<SafeStoDo> page, Map<String, Object> map);
-
- Integer selectSafeStoPageCount(Map<String, Object> map);
-
- List<SafeStoExport> selectSafeStoExportExcel(Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
deleted file mode 100644
index 352183e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/ReportQueryMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zy.asrs.common.wms.entity.ViewInOutBean;
-import com.zy.asrs.common.wms.entity.ViewStayTimeBean;
-import com.zy.asrs.common.wms.entity.ViewStockUseBean;
-import com.zy.asrs.common.wms.entity.ViewWorkInBean;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Mapper
-@Repository
-public interface ReportQueryMapper {
-
- //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
- IPage<ViewStockUseBean> queryViewStockUseList(IPage<?> page, ViewStockUseBean viewStockUse);
-
- //鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
- IPage<ViewStayTimeBean> queryViewStayTimeList(IPage<?> page, ViewStayTimeBean viewStayTime);
-
- //鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
- IPage<ViewInOutBean> queryViewInOutList(IPage<?> page, ViewInOutBean viewInOut);
-
- //鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
- IPage<ViewWorkInBean> queryViewWorkInList(IPage<?> page, ViewWorkInBean viewWorkIn);
-
- //鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
- IPage<ViewWorkInBean> queryViewWorkOutList(IPage<?> page, ViewWorkInBean viewWorkIn);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/RowLastnoMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/RowLastnoMapper.java
deleted file mode 100644
index 499623a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/RowLastnoMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.RowLastno;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface RowLastnoMapper extends BaseMapper<RowLastno> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
deleted file mode 100644
index c567423..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/StaDescMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.domain.entity.StaDesc;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-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 StaDescMapper extends BaseMapper<StaDesc> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java
deleted file mode 100644
index 8c02735..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/TagMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.Tag;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface TagMapper extends BaseMapper<Tag> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinLogMapper.java
deleted file mode 100644
index 46435dc..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.WaitPakinLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WaitPakinLogMapper extends BaseMapper<WaitPakinLog> {
-
- @Insert("insert into wms_wait_pakin_log select * from wms_wait_pakin where zpallet=#{zpallet} and host_id = #{hostId}")
- int saveToHistory(String zpallet, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinMapper.java
deleted file mode 100644
index 2f6ede1..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WaitPakinMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.WaitPakin;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WaitPakinMapper extends BaseMapper<WaitPakin> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlLogMapper.java
deleted file mode 100644
index 22c4c43..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.WrkDetlLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkDetlLogMapper extends BaseMapper<WrkDetlLog> {
-
- @Insert("insert into wms_wrk_detl_log select * from wms_wrk_detl where wrk_no=#{workNo} and host_id = #{hostId}")
- int saveToHistory(Integer workNo, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlMapper.java
deleted file mode 100644
index 72b45c6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkDetlMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-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 WrkDetlMapper extends BaseMapper<WrkDetl> {
-
- List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
-
- int updateOrderNo(@Param("orderNo") String orderNo, @Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- List<WrkDetl> selectAndLogByOrderNo(String orderNo, Long hostId);
-
- List<WrkDetl> selectPakoutQuery(@Param("staNo") Integer staNo, @Param("matnr") String matnr, @Param("hostId") Long hostId);
-
- int updateInspect(@Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- int deleteItem(@Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
- int updateAnfme(@Param("anfme") Double anfme, @Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkLastnoMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkLastnoMapper.java
deleted file mode 100644
index d49311f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkLastnoMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.WrkLastno;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkLastnoMapper extends BaseMapper<WrkLastno> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastLogMapper.java
deleted file mode 100644
index f7cccd0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastLogMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.wms.entity.WrkMastLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastLogMapper extends BaseMapper<WrkMastLog> {
-
- @Insert("insert into wms_wrk_mast_log select * from wms_wrk_mast where id=#{id}")
- int saveToHistory(Long id);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastMapper.java
deleted file mode 100644
index 60e0a03..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/WrkMastMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zy.asrs.common.wms.mapper;
-
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-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 WrkMastMapper extends BaseMapper<WrkMast> {
-
- List<WrkMast> selectToBeCompleteData();
-
- List<WrkMast> selectToBeHistoryData();
-
- List<WrkMast> selectSameLevMatnrs(@Param("matnr") String matnr, @Param("batch") String batch, @Param("locRangeDto") LocRangeDto locRangeDto, @Param("hostId") Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/AdjDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/AdjDetlService.java
deleted file mode 100644
index 92e0269..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/AdjDetlService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.AdjDetl;
-
-public interface AdjDetlService extends IService<AdjDetl> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java
deleted file mode 100644
index ceaf7b1..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasBarcode;
-
-public interface BasBarcodeService extends IService<BasBarcode> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
deleted file mode 100644
index 8dbc6d9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasDevpService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasDevp;
-
-import java.util.List;
-
-public interface BasDevpService extends IService<BasDevp> {
-
- /**
- * 鍏ュ簱绔�
- * @return
- */
- List<Integer> getAvailableInSite(Long hostId);
-
- /**
- * 绌烘澘鍏ュ簱绔�
- * @return
- */
- List<Integer> getAvailableEmptyInSite(Long hostId);
-
- /**
- * 鍑哄簱绔�
- *
- * @return
- */
- List<Integer> getAvailableOutSite(Integer typeNo, Long hostId);
-
- /**
- * 鐩爣绔欑偣鐘舵�佹娴�
- *
- * @param pakin 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
- */
- BasDevp checkSiteStatus(Integer devpNo, boolean pakin, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasLocStsService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasLocStsService.java
deleted file mode 100644
index 67d3037..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasLocStsService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasLocSts;
-
-public interface BasLocStsService extends IService<BasLocSts> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasMapService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasMapService.java
deleted file mode 100644
index f2227da..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasMapService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasMap;
-
-public interface BasMapService extends IService<BasMap> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWhsService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWhsService.java
deleted file mode 100644
index 0fc8f3e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWhsService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasWhs;
-
-public interface BasWhsService extends IService<BasWhs> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkIotypeService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkIotypeService.java
deleted file mode 100644
index 2d88fe5..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkIotypeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasWrkIotype;
-
-public interface BasWrkIotypeService extends IService<BasWrkIotype> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkStatusService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkStatusService.java
deleted file mode 100644
index b6f58d0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasWrkStatusService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.BasWrkStatus;
-
-public interface BasWrkStatusService extends IService<BasWrkStatus> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
deleted file mode 100644
index 3b57b43..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ /dev/null
@@ -1,331 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import com.zy.asrs.common.domain.dto.LocTypeDto;
-import com.zy.asrs.common.domain.dto.StartupDto;
-import com.zy.asrs.common.domain.entity.StaDesc;
-import com.zy.asrs.common.sys.service.StaDescService;
-import com.zy.asrs.common.utils.VersionUtils;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 璐ф灦鏍稿績鍔熻兘
- * Created by vincent on 2020/6/11
- */
-@Slf4j
-@Service
-public class CommonService {
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkLastnoService wrkLastnoService;
- @Autowired
- private RowLastnoService rowLastnoService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private LocRuleService locRuleService;
-
- /**
- * 鐢熸垚宸ヤ綔鍙�
- *
- * @param wrkMk
- * @return workNo(宸ヤ綔鍙�)
- */
- public int getWorkNo(Integer wrkMk) {
- WrkLastno wrkLastno = wrkLastnoService.getOne(new LambdaQueryWrapper<WrkLastno>().eq(WrkLastno::getWrkMk, wrkMk));
- if (Cools.isEmpty(wrkLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- int workNo = wrkLastno.getWrkNo();
- int sNo = wrkLastno.getStartNo();
- int eNo = wrkLastno.getTargetNo();
- workNo = workNo >= eNo ? sNo : workNo + 1;
- while (true) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, workNo));
- if (null != wrkMast) {
- workNo = workNo >= eNo ? sNo : workNo + 1;
- } else {
- break;
- }
- }
- // 淇敼搴忓彿璁板綍
- if (workNo > 0) {
- wrkLastno.setWrkNo(workNo);
- wrkLastnoService.updateById(wrkLastno);
- }
- // 妫�楠�
- if (workNo == 0) {
- throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
- } else {
- if (wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, workNo)) != null) {
- throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
- }
- }
- return workNo;
- }
-
- /**
- * 妫�绱㈠簱浣嶅彿
- */
- @Transactional
- public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matnrs, String batch, Long hostId, LocTypeDto locTypeDto, int times) {
- // 鐩爣搴撲綅
- LocMast locMast = null;
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- locMast = getLocNoEmptyPakIn(staDescId, locTypeDto, sourceStaNo, hostId);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //搴撲綅瑙勫垯
- locMast = getLocNoStepRule(matnrs, batch, locTypeDto, hostId);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- locMast = getLocNoNearPlace(staDescId, matnrs, batch, locTypeDto, sourceStaNo, hostId);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //鎼滅储鏁翠釜绌哄簱浣嶇粍
- locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo, hostId);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
- }
-
- //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
-
- /**
- * 搴撲綅瑙勫垯
- */
- private LocMast getLocNoStepRule(List<String> matnrs, String batch, LocTypeDto locTypeDto, Long hostId) {
- if (matnrs.size() != 1) {
- return null;
- }
- String matnr = matnrs.get(0);
- LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<LocRule>()
- .eq(LocRule::getHostId, hostId)
- .eq(LocRule::getMatnr, matnr);
- if (batch != null) {
- wrapper.eq(LocRule::getBatch, batch);
- }
- List<LocRule> locRules = locRuleService.list(wrapper);
- if (locRules == null || locRules.isEmpty()) {
- return null;//娌℃湁搴撲綅瑙勫垯锛岃烦鍑哄綋鍓嶄换鍔�
- }
-
- for (LocRule locRule : locRules) {
- if (locRule == null) {
- continue;
- }
-
- List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd(), hostId);
- for (LocMast locMast0 : locMasts) {
- //棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10, hostId)) {
- return locMast0;
- }
- }
- }
-
- if (locRules.get(0).getKeepGo() == 0) {
- //鎵句笉鍒扮┖搴撲綅锛屼笖绂佹缁х画瀵绘壘鍏朵粬闈炴贩杞藉尯鍩熷簱浣�
- //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("瑙勫垯鍖哄煙娌℃湁绌哄簱浣�");
- }
-
- return null;
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- private LocMast getLocNoNearPlace(Integer staDescId, List<String> matnrs, String batch, LocTypeDto locTypeDto, Integer sourceStaNo, Long hostId) {
- LocMast locMast = null;
- if (staDescId == 1) {
- // 鑾峰彇鐩爣绔�
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
- .eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo)
- .eq(StaDesc::getHostId, hostId);
- StaDesc staDesc = staDescService.getOne(wrapper);
- if (staDesc == null) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
-
- String matnr = matnrs.get(0);
-
- //搴撲綅鎼滅储鑼冨洿
- LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
-
- //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
- List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matnr, batch, locTypeDto.getLocRangeDto(), hostId);
- for (WrkMast wrkMast : wrkMasts) {
- LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo(), hostId, locRangeDto);
- if (null != locMast0) {
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
- locMast = locMast0;
- }
- }
- }
- if (Cools.isEmpty(locMast)) {
- //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
- List<String> locNos = locDetlService.getSameDetl(matnr, batch, hostId);
- for (String locNo : locNos) {
- LocMast locMast0 = locMastService.findNearloc(locNo, hostId, locRangeDto);
- if (null != locMast0) {
- // 娴呭簱浣嶇鍚堝昂瀵告娴�
- if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
- locMast = locMast0;
- break;
- }
- }
- }
- }
- }
-
- return locMast;
- }
-
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- private LocMast getLocNoEmptyPakIn(Integer staDescId, LocTypeDto locTypeDto, Integer sourceStaNo, Long hostId) {
- LocMast locMast = null;
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (staDescId == 10) {
- // 鑾峰彇鐩爣绔�
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
- .eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo)
- .eq(StaDesc::getHostId,hostId);
- StaDesc staDesc = staDescService.getOne(wrapper);
- if (staDesc == null) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
-
- LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocSts, "O")
- .eq(LocMast::getLocType1, 1)
- .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
- .eq(LocMast::getHostId, hostId)
- .orderByAsc(LocMast::getLev1, LocMast::getBay1, LocMast::getRow1);
-
- //搴撲綅鎼滅储鑼冨洿
- LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
- if (locRangeDto != null) {
- wrapper1.ge(LocMast::getRow1, locRangeDto.getStartRow());
- wrapper1.le(LocMast::getRow1, locRangeDto.getTargetRow());
- wrapper1.ge(LocMast::getBay1, locRangeDto.getStartBay());
- wrapper1.le(LocMast::getBay1, locRangeDto.getTargetBay());
- wrapper1.ge(LocMast::getLev1, locRangeDto.getStartLev());
- wrapper1.le(LocMast::getLev1, locRangeDto.getTargetLev());
- }
-
- List<LocMast> locMasts = locMastService.list(wrapper1);
- if (!locMasts.isEmpty()) {
- for (LocMast loc : locMasts) {
- LocMast locMast0 = locMastService.findNearloc(loc.getLocNo(), hostId, locRangeDto);
- if (null != locMast0) {
- locMast = locMast0;
- break;
- }
- }
- }
-
- if (locMast == null) {
- throw new CoolException("缂哄皯绌哄簱浣�");
- }
- }
- return locMast;
- }
-
- // 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
- private LocMast getLocNoStepSingle(LocTypeDto locTypeDto, Integer staDescId, Integer sourceStaNo, Long hostId) {
- LocMast locMast = null;
- // 鑾峰彇鐩爣绔�
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
- .eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo)
- .eq(StaDesc::getHostId, hostId);
- StaDesc staDesc = staDescService.getOne(wrapper);
- if (staDesc == null) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
-
- LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocSts, "O")
- .eq(LocMast::getHostId, hostId);
- //搴撲綅鎼滅储鑼冨洿
- LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
- if (locRangeDto != null) {
- wrapper1.ge(LocMast::getRow1, locRangeDto.getStartRow());
- wrapper1.le(LocMast::getRow1, locRangeDto.getTargetRow());
- wrapper1.ge(LocMast::getBay1, locRangeDto.getStartBay());
- wrapper1.le(LocMast::getBay1, locRangeDto.getTargetBay());
- wrapper1.ge(LocMast::getLev1, locRangeDto.getStartLev());
- wrapper1.le(LocMast::getLev1, locRangeDto.getTargetLev());
- }
- List<LocMast> locMasts = locMastService.list(wrapper1);//鎼滅储璐х墿
- for (LocMast mast : locMasts) {
- if (VersionUtils.checkLocType(mast, locTypeDto)) {
- locMast = mast;
- break;
- }
- }
- return locMast;
- }
-
- //杩斿洖dto
- private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
- StartupDto startupDto = new StartupDto();
- // 鑾峰彇鐩爣绔�
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
- .eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo);
- StaDesc staDesc = staDescService.getOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
-
- // 妫�娴嬬洰鏍囩珯
- BasDevp staNo = basDevpService.getById(staDesc.getDeviceStn());
- if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�" + staDesc.getDeviceStn() + "涓嶅彲鐢�");
- }
-
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
- // 杩斿洖dto
- startupDto.setWorkNo(workNo);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setStaNo(staNo.getDevNo());
- startupDto.setLocNo(locMast.getLocNo());
- return startupDto;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CstmrService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CstmrService.java
deleted file mode 100644
index c724ab9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CstmrService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.Cstmr;
-
-public interface CstmrService extends IService<Cstmr> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/DocTypeService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/DocTypeService.java
deleted file mode 100644
index 04de222..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/DocTypeService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.DocType;
-
-public interface DocTypeService extends IService<DocType> {
-
- DocType selectOrAdd(String docName, Boolean pakin);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ItemService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ItemService.java
deleted file mode 100644
index f561067..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/ItemService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.Item;
-
-public interface ItemService extends IService<Item> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
deleted file mode 100644
index 737248e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.domain.dto.ReportStockDto;
-import com.zy.asrs.common.wms.entity.LocDetl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public interface LocDetlService extends IService<LocDetl> {
-
- IPage<LocDetl> getStockStatis(Integer curr, Integer limit, Map<String, Object> param);
-
- Integer sum();
-
- List<LocDetl> queryStock(String matnr, String batch, Long hostId);
-
- LocDetl selectItem(String locNo, String matnr, String batch, Long hostId);
-
- /**
- * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
- */
- boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, Long hostId);
-
- boolean updateLocNo(String newLocNo, String oldLocNo, Long hostId);
-
- IPage<LocDetl> getStockOut(Integer curr, Integer limit, Map<String, Object> param);
-
- List<ReportStockDto> getReportStockDto(Long hostId);
-
- /**
- * 鑾峰彇鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- */
- List<String> getSameDetl(String matnr, String batch, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDirectionService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDirectionService.java
deleted file mode 100644
index 1eb2fa6..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDirectionService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.LocDirection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public interface LocDirectionService extends IService<LocDirection> {
-
- List<ArrayList<Integer>> getInnerList(Long hostId);
-
- List<ArrayList<Integer>> getOuterList(Long hostId);
-
- List<ArrayList<Integer>> getNaturalList(Long hostId);
-
- List<ArrayList<Integer>> parseData(List<LocDirection> origin);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocMastService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocMastService.java
deleted file mode 100644
index 8878241..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocMastService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import com.zy.asrs.common.wms.entity.LocMast;
-
-import java.util.List;
-
-public interface LocMastService extends IService<LocMast> {
-
- /**
- * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
- *
- * @param sourceLocNo 婧愬簱浣�
- * @return 鍚岀粍绌哄簱浣嶉泦鍚�
- */
- List<String> queryGroupEmptyStock(String sourceLocNo, Long hostId);
-
- /**
- * 妫�绱㈠彲鐢ㄥ簱浣�
- */
- List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId);
-
- /**
- * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
- */
- Boolean checkEmptyCount(LocMast locMast, int quaOfBlank, Long hostId);
-
- LocMast findNearloc(String locNo, Long hostId, LocRangeDto locRangeDto);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java
deleted file mode 100644
index 79cc6cd..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocRuleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.LocRule;
-
-public interface LocRuleService extends IService<LocRule> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatCodeService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatCodeService.java
deleted file mode 100644
index 168fae9..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatCodeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.MatCode;
-
-public interface MatCodeService extends IService<MatCode> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java
deleted file mode 100644
index 1c2b27c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MatService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.Mat;
-
-public interface MatService extends IService<Mat> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
deleted file mode 100644
index 5a3c79b..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.zy.asrs.common.domain.param.MobileAdjustParam;
-import com.zy.asrs.common.openapi.entity.param.CombParam;
-
-public interface MobileService {
-
- /**
- * 缁勬墭
- */
- void comb(CombParam param, Long userId, Long hostId);
-
- /**
- * 鐩樼偣
- */
- void adjust(MobileAdjustParam param, Long userId, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/NodeService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/NodeService.java
deleted file mode 100644
index 9d0202d..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/NodeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.Node;
-
-public interface NodeService extends IService<Node> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OpenService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OpenService.java
deleted file mode 100644
index 0a75b44..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OpenService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-
-import com.zy.asrs.common.domain.param.OpenOrderPakinParam;
-import com.zy.asrs.common.domain.param.OpenOrderPakoutParam;
-
-import java.util.List;
-
-public interface OpenService {
-
- /**
- * 娣诲姞鍏ュ簱鍗�
- */
- void pakinOrderCreate(OpenOrderPakinParam param);
-
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- void pakoutOrderCreate(OpenOrderPakoutParam param);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlLogService.java
deleted file mode 100644
index 7936485..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.OrderDetlLog;
-
-public interface OrderDetlLogService extends IService<OrderDetlLog> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
deleted file mode 100644
index 291af59..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-
-import java.util.Map;
-
-public interface OrderDetlService extends IService<OrderDetl> {
-
- OrderDetl selectItem(Long orderId, String matnr, String batch);
-
- IPage<OrderDetl> getPakoutPage(Integer curr, Integer limit, Map<String, Object> map);
-
- boolean increase(Long orderId, Long hostId, String matnr, String batch, Double qty);
-
- boolean decrease(String orderNo, Long hostId, String matnr, String batch, Double qty);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderLogService.java
deleted file mode 100644
index 12f962a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.OrderLog;
-
-public interface OrderLogService extends IService<OrderLog> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
deleted file mode 100644
index 13b876c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.Order;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.entity.WrkMast;
-
-import java.util.List;
-
-public interface OrderService extends IService<Order> {
-
- List<OrderDetl> selectWorkingDetls(Long orderId);
-
- void updateOrder1(Long orderId,Long userId);
-
- Order selectByNo(String orderNo, Long hostId);
-
- boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls, Long hostId);
-
- boolean updateSettle(Long orderId, Long settle, Long userId, Long hostId);
-
- void checkComplete(String orderNo, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderSettleService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderSettleService.java
deleted file mode 100644
index 1b12c28..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderSettleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.OrderSettle;
-
-public interface OrderSettleService extends IService<OrderSettle> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/PriorService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/PriorService.java
deleted file mode 100644
index 9f207ee..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/PriorService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.domain.dto.SafeStoDo;
-import com.zy.asrs.common.domain.entity.SafeStoExport;
-import com.zy.asrs.common.wms.entity.Prior;
-
-import java.util.List;
-import java.util.Map;
-
-public interface PriorService extends IService<Prior> {
-
- IPage<SafeStoDo> getSafeQtyPage(Integer curr, Integer limit, Map<String, Object> param);
-
- List<SafeStoExport> getSafeExportExcel(Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/RowLastnoService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/RowLastnoService.java
deleted file mode 100644
index eaf6e32..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/RowLastnoService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.RowLastno;
-
-public interface RowLastnoService extends IService<RowLastno> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
deleted file mode 100644
index b888c2f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/TagService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.Tag;
-
-public interface TagService extends IService<Tag> {
-
- Tag getTop(Long hostId);
-
- Tag getTag(String firstTagName, String secondTagName, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinLogService.java
deleted file mode 100644
index dc9c694..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinLogService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.WaitPakinLog;
-
-public interface WaitPakinLogService extends IService<WaitPakinLog> {
-
- boolean saveToHistory(String zpallet, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinService.java
deleted file mode 100644
index 611f36f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WaitPakinService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.WaitPakin;
-
-public interface WaitPakinService extends IService<WaitPakin> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
deleted file mode 100644
index 7ff9ca8..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.zy.asrs.common.domain.dto.LocDetlDto;
-import com.zy.asrs.common.domain.dto.TaskDto;
-import com.zy.asrs.common.domain.enums.IoWorkType;
-import com.zy.asrs.common.domain.param.FullStoreParam;
-import com.zy.asrs.common.domain.param.LocDetlAdjustParam;
-import com.zy.asrs.common.domain.param.StockOutParam;
-
-import java.util.List;
-
-public interface WorkService {
-
- /**
- * 鍏ㄦ澘鍏ュ簱
- *
- * @return 搴撲綅鍙�
- */
- String startupFullPutStore(FullStoreParam param, Long userId, Long hostId);
-
- /**
- * 鍑哄簱浣滀笟
- */
- void startupFullTakeStore(StockOutParam param, Long userId, Long hostId);
-
- /**
- * 鎵嬪姩瀹屾垚宸ヤ綔妗�
- */
- void completeWrkMast(String workNo, Long userId, Long hostId);
-
- /**
- * 鎵嬪姩鍙栨秷宸ヤ綔妗�
- */
- void cancelWrkMast(String workNo, Long userId, Long hostId);
-
- /**
- * 鎵嬪姩鎷ｆ枡鍏ュ簱宸ヤ綔妗�
- */
- void pickWrkMast(String workNo, Long userId, Long hostId);
-
- void stockOut(Integer staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId, Long hostId);
-
- void stockOut(Integer staNo, TaskDto taskDto, Long userId, Long hostId);
-
- /**
- * 搴撳瓨鏄庣粏璋冩暣
- */
- void adjustLocDetl(LocDetlAdjustParam param, Long userId, Long hostId);
-
- /**
- * 搴撲綅绉昏浆
- */
- void locMove(String sourceLocNo, String locNo, Long userId, Long hostId);
-
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlLogService.java
deleted file mode 100644
index 84b1ebd..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlLogService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.WrkDetlLog;
-
-public interface WrkDetlLogService extends IService<WrkDetlLog> {
-
- boolean saveToHistory(Integer workNo, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlService.java
deleted file mode 100644
index aecceaa..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkDetlService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-
-import java.util.List;
-
-public interface WrkDetlService extends IService<WrkDetl> {
-
- List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
-
- boolean updateOrderNo(String orderNo, Integer wrkNo, String matnr, String batch, Long hostId);
-
- List<WrkDetl> selectAndLogByOrderNo(String orderNo, Long hostId);
-
- List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr, Long hostId);
-
- boolean updateInspect(Integer wrkNo, String matnr, String batch, Long hostId);
-
- boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkLastnoService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkLastnoService.java
deleted file mode 100644
index 02f46dd..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkLastnoService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.WrkLastno;
-
-public interface WrkLastnoService extends IService<WrkLastno> {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastLogService.java
deleted file mode 100644
index a357aa7..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastLogService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.wms.entity.WrkMastLog;
-
-public interface WrkMastLogService extends IService<WrkMastLog> {
-
- boolean saveToHistory(Long id);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastService.java
deleted file mode 100644
index e91b7dc..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WrkMastService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.common.wms.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import com.zy.asrs.common.wms.entity.WrkMast;
-
-import java.util.List;
-
-public interface WrkMastService extends IService<WrkMast> {
-
- List<WrkMast> selectToBeCompleteData();
-
- List<WrkMast> selectToBeHistoryData();
-
- WrkMast selectByBarcode(String barcode, Long hostId);
-
- List<WrkMast> selectSameMatnrs(String matnr, String batch, LocRangeDto locRangeDto, Long hostId);
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/AdjDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/AdjDetlServiceImpl.java
deleted file mode 100644
index 98fb38d..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/AdjDetlServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.AdjDetlMapper;
-import com.zy.asrs.common.wms.entity.AdjDetl;
-import com.zy.asrs.common.wms.service.AdjDetlService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("adjDetlService")
-public class AdjDetlServiceImpl extends ServiceImpl<AdjDetlMapper, AdjDetl> implements AdjDetlService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java
deleted file mode 100644
index 7b5eb91..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasBarcodeMapper;
-import com.zy.asrs.common.wms.entity.BasBarcode;
-import com.zy.asrs.common.wms.service.BasBarcodeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basBarcodeService")
-public class BasBarcodeServiceImpl extends ServiceImpl<BasBarcodeMapper, BasBarcode> implements BasBarcodeService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
deleted file mode 100644
index 8bb4afd..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasDevpServiceImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.mapper.BasDevpMapper;
-import com.zy.asrs.common.wms.entity.BasDevp;
-import com.zy.asrs.common.wms.service.BasDevpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.common.wms.service.WrkMastService;
-import com.zy.asrs.framework.exception.CoolException;
-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(Long hostId) {
- return this.baseMapper.getAvailableInSite(1, hostId);
- }
-
- @Override
- public List<Integer> getAvailableEmptyInSite(Long hostId) {
- return this.baseMapper.getAvailableInSite(10, hostId);
- }
-
- @Override
- public List<Integer> getAvailableOutSite(Integer typeNo, Long hostId) {
- return this.baseMapper.getAvailableOutSite(typeNo, hostId);
- }
-
- @Override
- public BasDevp checkSiteStatus(Integer devpNo, boolean pakin, Long hostId) {
- BasDevp station = this.getOne(new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, devpNo).eq(BasDevp::getHostId, hostId));
- if (station == null){
- throw new CoolException(devpNo + "绔欑偣涓嶅瓨鍦�");
- }
- if (pakin) {
- 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 && station.getWrkNo() < 9990) {
- throw new CoolException(devpNo + "绔欑偣宸叉湁宸ヤ綔鍙�");
- }
- if (wrkMastService.count(new LambdaQueryWrapper<WrkMast>()
- .eq(WrkMast::getSourceStaNo, devpNo)
- .in(WrkMast::getWrkSts, 1, 6)) > 0) {
- throw new CoolException(devpNo + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
- }
- }
- return station;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasLocStsServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasLocStsServiceImpl.java
deleted file mode 100644
index 5fe77e0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasLocStsServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasLocStsMapper;
-import com.zy.asrs.common.wms.entity.BasLocSts;
-import com.zy.asrs.common.wms.service.BasLocStsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basLocStsService")
-public class BasLocStsServiceImpl extends ServiceImpl<BasLocStsMapper, BasLocSts> implements BasLocStsService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasMapServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasMapServiceImpl.java
deleted file mode 100644
index c8786d2..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasMapServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasMapMapper;
-import com.zy.asrs.common.wms.entity.BasMap;
-import com.zy.asrs.common.wms.service.BasMapService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basMapService")
-public class BasMapServiceImpl extends ServiceImpl<BasMapMapper, BasMap> implements BasMapService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWhsServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWhsServiceImpl.java
deleted file mode 100644
index db3acc2..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWhsServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasWhsMapper;
-import com.zy.asrs.common.wms.entity.BasWhs;
-import com.zy.asrs.common.wms.service.BasWhsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basWhsService")
-public class BasWhsServiceImpl extends ServiceImpl<BasWhsMapper, BasWhs> implements BasWhsService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkIotypeServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkIotypeServiceImpl.java
deleted file mode 100644
index d1e2b41..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkIotypeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasWrkIotypeMapper;
-import com.zy.asrs.common.wms.entity.BasWrkIotype;
-import com.zy.asrs.common.wms.service.BasWrkIotypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basWrkIotypeService")
-public class BasWrkIotypeServiceImpl extends ServiceImpl<BasWrkIotypeMapper, BasWrkIotype> implements BasWrkIotypeService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkStatusServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkStatusServiceImpl.java
deleted file mode 100644
index dc65b04..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasWrkStatusServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.BasWrkStatusMapper;
-import com.zy.asrs.common.wms.entity.BasWrkStatus;
-import com.zy.asrs.common.wms.service.BasWrkStatusService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("basWrkStatusService")
-public class BasWrkStatusServiceImpl extends ServiceImpl<BasWrkStatusMapper, BasWrkStatus> implements BasWrkStatusService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/CstmrServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/CstmrServiceImpl.java
deleted file mode 100644
index 769f80b..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/CstmrServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.CstmrMapper;
-import com.zy.asrs.common.wms.entity.Cstmr;
-import com.zy.asrs.common.wms.service.CstmrService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("cstmrService")
-public class CstmrServiceImpl extends ServiceImpl<CstmrMapper, Cstmr> implements CstmrService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/DocTypeServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/DocTypeServiceImpl.java
deleted file mode 100644
index 98ab54c..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/DocTypeServiceImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.mapper.DocTypeMapper;
-import com.zy.asrs.common.wms.entity.DocType;
-import com.zy.asrs.common.wms.service.DocTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-@Service("docTypeService")
-public class DocTypeServiceImpl extends ServiceImpl<DocTypeMapper, DocType> implements DocTypeService {
-
- @Override
- public DocType selectOrAdd(String docName, Boolean pakin) {
- if (Cools.isEmpty(docName)) {
- return null;
- }
- DocType docType = this.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocName, docName));
- if (docType == null) {
- long docId = 1L;
- DocType last = this.getOne(new LambdaQueryWrapper<DocType>().orderByDesc(DocType::getDocId));
- if (last != null) {
- docId = last.getDocId() + 1;
- }
- docType = new DocType();
- docType.setDocId(docId);
- docType.setDocName(docName);
- if (null != pakin) {
- docType.setPakin(pakin ? 1 : 0);
- docType.setPakout(pakin ? 0 : 1);
- }
- docType.setStatus(1);
- docType.setCreateTime(new Date());
- docType.setUpdateTime(new Date());
- if (!this.save(docType)) {
- throw new CoolException("鍗曟嵁绫诲瀷閿欒");
- }
- }
- return docType;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ItemServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ItemServiceImpl.java
deleted file mode 100644
index 2cae7da..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/ItemServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.ItemMapper;
-import com.zy.asrs.common.wms.entity.Item;
-import com.zy.asrs.common.wms.service.ItemService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("itemService")
-public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements ItemService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
deleted file mode 100644
index 4fe5548..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.domain.dto.QueryStockPreDo;
-import com.zy.asrs.common.domain.dto.ReportStockDto;
-import com.zy.asrs.common.wms.mapper.LocDetlMapper;
-import com.zy.asrs.common.wms.entity.LocDetl;
-import com.zy.asrs.common.wms.service.LocDetlService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Service("locDetlService")
-public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
-
- @Override
- public IPage<LocDetl> getStockStatis(Integer curr, Integer limit, Map<String, Object> param) {
- Page<LocDetl> page = new Page<>(curr, limit);
- return this.baseMapper.getStockStatis(page, param);
- }
-
- /**
- * 鑾峰彇搴撳瓨鎬绘暟
- * @return
- */
- @Override
- public Integer sum() {
- return this.baseMapper.sum();
- }
-
- @Override
- public List<LocDetl> queryStock(String matnr, String batch, Long hostId) {
- List<LocDetl> result = this.baseMapper.queryStock(matnr, batch, hostId);
- return result;
- }
-
- @Override
- public LocDetl selectItem(String locNo, String matnr, String batch, Long hostId) {
- return this.baseMapper.selectItem(locNo, matnr, batch, hostId);
- }
-
- @Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, Long hostId) {
- if (anfme <= 0) {
- return this.baseMapper.deleteItem(locNo, matnr, batch, hostId) > 0;
- } else {
- return baseMapper.updateAnfme(anfme, locNo, matnr, batch, hostId) > 0;
- }
- }
-
- @Override
- public boolean updateLocNo(String newLocNo, String oldLocNo, Long hostId) {
- return baseMapper.updateLocNo(newLocNo, oldLocNo, hostId) > 0;
- }
-
- @Override
- public IPage<LocDetl> getStockOut(Integer curr, Integer limit, Map<String, Object> param) {
- Page<LocDetl> page = new Page<>(curr, limit);
- return this.baseMapper.getStockOutPage(page, param);
- }
-
- @Override
- public List<ReportStockDto> getReportStockDto(Long hostId) {
- return this.baseMapper.getReportStockDto(hostId);
- }
-
- @Override
- public List<String> getSameDetl(String matnr, String batch, Long hostId) {
- return this.baseMapper.selectSameDetl(matnr, batch, hostId);
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDirectionServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDirectionServiceImpl.java
deleted file mode 100644
index 54e3a43..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDirectionServiceImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.mapper.LocDirectionMapper;
-import com.zy.asrs.common.wms.entity.LocDirection;
-import com.zy.asrs.common.wms.service.LocDirectionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("locDirectionService")
-public class LocDirectionServiceImpl extends ServiceImpl<LocDirectionMapper, LocDirection> implements LocDirectionService {
-
- @Override
- public List<ArrayList<Integer>> getInnerList(Long hostId) {
- List<LocDirection> inner = this.list(new LambdaQueryWrapper<LocDirection>()
- .eq(LocDirection::getHostId, hostId)
- .eq(LocDirection::getType, "inner"));
- return this.parseData(inner);
- }
-
- @Override
- public List<ArrayList<Integer>> getOuterList(Long hostId) {
- List<LocDirection> outer = this.list(new LambdaQueryWrapper<LocDirection>()
- .eq(LocDirection::getHostId, hostId)
- .eq(LocDirection::getType, "outer"));
- return this.parseData(outer);
- }
-
- @Override
- public List<ArrayList<Integer>> getNaturalList(Long hostId) {
- List<LocDirection> natural = this.list(new LambdaQueryWrapper<LocDirection>()
- .eq(LocDirection::getHostId, hostId)
- .eq(LocDirection::getType, "natural"));
- return this.parseData(natural);
- }
-
- @Override
- public List<ArrayList<Integer>> parseData(List<LocDirection> origin) {
- ArrayList<ArrayList<Integer>> data = new ArrayList<>();
- for (LocDirection direction : origin) {
- ArrayList<Integer> list = new ArrayList<>();
- String[] split = direction.getData().split(",");
- for (String row : split) {
- list.add(Integer.parseInt(row));
- }
- data.add(list);
- }
- return data;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java
deleted file mode 100644
index d1608ec..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import com.zy.asrs.common.utils.Utils;
-import com.zy.asrs.common.wms.mapper.LocMastMapper;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.service.LocMastService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("locMastService")
-public class LocMastServiceImpl extends ServiceImpl<LocMastMapper, LocMast> implements LocMastService {
-
- @Override
- public List<String> queryGroupEmptyStock(String sourceLocNo, Long hostId) {
- if (Cools.isEmpty(sourceLocNo)) {
- return null;
- }
- LocMast sourceStock = this.getOne(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocNo, sourceLocNo)
- .eq(LocMast::getHostId, hostId));
- if (Cools.isEmpty(sourceStock)) {
- return null;
- }
- return this.baseMapper.queryGroupEmptyStock(hostId);
- }
-
- @Override
- public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd, Long hostId) {
- return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd, hostId);
- }
-
- @Override
- public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank, Long hostId) {
- if (locMast == null) {
- return false;
- }
- int count = this.baseMapper.selectCount(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocSts, 'O')
-// .eq(LocMast::getLocType3, locMast.getLocType3())
- .eq(LocMast::getLev1, locMast.getLev1())
- .eq(LocMast::getHostId, hostId));
- return count > quaOfBlank;
- }
-
- @Override
- public LocMast findNearloc(String locNo, Long hostId, LocRangeDto locRangeDto) {
- LocMast locMast = null;
- List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo, hostId);
- if (!Cools.isEmpty(groupOuterLoc)) {
- LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocSts, 'O')
- .in(LocMast::getLocNo, groupOuterLoc)
- .eq(LocMast::getHostId, hostId)
- .orderByAsc(LocMast::getRow1);
- //搴撲綅鎼滅储鑼冨洿
- if (locRangeDto != null) {
- wrapper.ge(LocMast::getRow1, locRangeDto.getStartRow());
- wrapper.le(LocMast::getRow1, locRangeDto.getTargetRow());
- wrapper.ge(LocMast::getBay1, locRangeDto.getStartBay());
- wrapper.le(LocMast::getBay1, locRangeDto.getTargetBay());
- wrapper.ge(LocMast::getLev1, locRangeDto.getStartLev());
- wrapper.le(LocMast::getLev1, locRangeDto.getTargetLev());
- }
- locMast = this.getOne(wrapper, false);
- }
- return locMast;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java
deleted file mode 100644
index 388ce99..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocRuleServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.LocRuleMapper;
-import com.zy.asrs.common.wms.entity.LocRule;
-import com.zy.asrs.common.wms.service.LocRuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("locRuleService")
-public class LocRuleServiceImpl extends ServiceImpl<LocRuleMapper, LocRule> implements LocRuleService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatCodeServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatCodeServiceImpl.java
deleted file mode 100644
index 9143304..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatCodeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.MatCodeMapper;
-import com.zy.asrs.common.wms.entity.MatCode;
-import com.zy.asrs.common.wms.service.MatCodeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("matCodeService")
-public class MatCodeServiceImpl extends ServiceImpl<MatCodeMapper, MatCode> implements MatCodeService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java
deleted file mode 100644
index 165da66..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MatServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.MatMapper;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.service.MatService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("manMatService")
-public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
deleted file mode 100644
index 9aaacf0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.domain.param.MobileAdjustParam;
-import com.zy.asrs.common.openapi.entity.param.CombParam;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * 绉诲姩绔湇鍔℃牳蹇冪被
- */
-@Slf4j
-@Service
-public class MobileServiceImpl implements MobileService {
-
- @Autowired
- private WaitPakinService waitPakinService;
- @Autowired
- private MatService matService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkDetlService wrkDetlService;
-
- @Override
- @Transactional
- public void comb(CombParam param, Long userId, Long hostId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.count(new LambdaQueryWrapper<WaitPakin>().
- eq(WaitPakin::getZpallet, param.getBarcode()).eq(WaitPakin::getIoStatus, "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
- Date now = new Date();
-
- // 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
-
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, hostId));
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.save(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- }
- // 鍏宠仈缁勬墭
- } else {
- Order order = orderService.selectByNo(param.getOrderNo(), hostId);
- if (order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
-
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- if (elem.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), hostId, elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
- }
-
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, hostId));
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
- waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.save(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- }
- orderService.updateSettle(order.getId(), 2L, userId, hostId);
- }
-
- }
-
- @Override
- public void adjust(MobileAdjustParam param, Long userId, Long hostId) {
- BasDevp basDevp = basDevpService.getOne(new LambdaQueryWrapper<BasDevp>().eq(BasDevp::getDevNo, param.getStaNo()).eq(BasDevp::getHostId, hostId));
- if (null == basDevp || basDevp.getWrkNo() == null) {
- throw new CoolException(param.getStaNo() + "鐩樼偣绔欐棤鏁�");
- }
- if (!param.getWrkNo().equals(basDevp.getWrkNo())) {
- throw new CoolException(param.getStaNo() + "鐩樼偣绔欐洿鏂帮紝璇烽噸鏂版绱�");
- }
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, param.getWrkNo()).eq(WrkMast::getHostId, hostId));
- if (wrkMast.getWrkSts() < 10) {
- throw new CoolException("鐩樼偣鏃犳晥锛屼换鍔″凡鐩樼偣鍐嶅叆搴�");
- }
- Date now = new Date();
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
-
- List<WrkDetl> list = param.getWrkDetls();
-
- // 淇敼鏁伴噺
- Iterator<WrkDetl> iterator = wrkDetls.iterator();
- while (iterator.hasNext()) {
- WrkDetl wrkDetl = iterator.next();
- Iterator<WrkDetl> iterator1 = list.iterator();
- while (iterator1.hasNext()) {
- WrkDetl wrkDetl1 = iterator1.next();
- if (wrkDetl1.getAnfme() == 0) {
- iterator1.remove();
- }
- if (wrkDetl.getMatnr().equals(wrkDetl1.getMatnr()) && Cools.eq(wrkDetl.getBatch(), wrkDetl1.getBatch())) {
- if (!wrkDetl.getAnfme().equals(wrkDetl1.getAnfme())) {
- // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
- // 淇敼鏄庣粏
- if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId)) {
- throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
- }
- }
- iterator.remove();
- iterator1.remove();
- }
- }
- }
-
- // 鍒犻櫎鏄庣粏
- for (WrkDetl wrkDetl : wrkDetls) {
- // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
- if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId)) {
- throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "搴忓垪鐮佷换鍔℃槑缁嗗け璐�");
- }
- }
-
- // 娣诲姞鏄庣粏
- for (WrkDetl wrkDetl : list) {
- if (wrkDetl.getAnfme() == 0.0D) { continue; }
- // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
- String orderNo = wrkDetl.getOrderNo();
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, wrkDetl.getMatnr()).eq(Mat::getHostId, hostId));
- wrkDetl.sync(mat);
- wrkDetl.setOrderNo(orderNo);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "搴忓垪鐮佷换鍔℃槑缁嗗け璐�");
- }
- }
-
- // 淇敼鐩樼偣浠诲姟涓绘。鐘舵��
- wrkMast.setFullPlt(wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId)) != 0 ? "Y" : "N");
- wrkMast.setModiTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("淇敼鐩樼偣浠诲姟涓绘。澶辫触");
- }
-
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/NodeServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/NodeServiceImpl.java
deleted file mode 100644
index f1ca6a8..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/NodeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.NodeMapper;
-import com.zy.asrs.common.wms.entity.Node;
-import com.zy.asrs.common.wms.service.NodeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("nodeService")
-public class NodeServiceImpl extends ServiceImpl<NodeMapper, Node> implements NodeService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OpenServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OpenServiceImpl.java
deleted file mode 100644
index f78d78f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OpenServiceImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.domain.param.OpenOrderPakinParam;
-import com.zy.asrs.common.domain.param.OpenOrderPakoutParam;
-import com.zy.asrs.common.wms.entity.DocType;
-import com.zy.asrs.common.wms.entity.Mat;
-import com.zy.asrs.common.wms.entity.Order;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.framework.common.SnowflakeIdWorker;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/4/9
- */
-@Slf4j
-@Service
-public class OpenServiceImpl implements OpenService {
-
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private DocTypeService docTypeService;
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private MatService matService;
-
- @Override
- @Transactional
- public void pakinOrderCreate(OpenOrderPakinParam param) {
- Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
- if (!Cools.isEmpty(order)) {
- throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 澶囨敞
- param.getHostId()
- );
- if (!orderService.save(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, param.getHostId()));
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- }
-
- @Override
- @Transactional
- public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo(), param.getHostId());
- // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
- }
- orderService.removeById(order.getId());
- }
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 澶囨敞
- param.getHostId()
- );
- if (!orderService.save(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, param.getHostId()));
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlLogServiceImpl.java
deleted file mode 100644
index ddcfe4e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.OrderDetlLogMapper;
-import com.zy.asrs.common.wms.entity.OrderDetlLog;
-import com.zy.asrs.common.wms.service.OrderDetlLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("orderDetlLogService")
-public class OrderDetlLogServiceImpl extends ServiceImpl<OrderDetlLogMapper, OrderDetlLog> implements OrderDetlLogService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
deleted file mode 100644
index 6bbe5dd..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zy.asrs.common.wms.mapper.OrderDetlMapper;
-import com.zy.asrs.common.wms.entity.OrderDetl;
-import com.zy.asrs.common.wms.service.OrderDetlService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-@Service("orderDetlService")
-public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
-
- @Override
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
- }
-
- @Override
- public IPage<OrderDetl> getPakoutPage(Integer curr, Integer limit, Map<String, Object> map) {
- Page<OrderDetl> page = new Page<>(curr, limit);
- return this.baseMapper.getPakoutPage(page, map);
- }
-
- @Override
- public boolean increase(Long orderId, Long hostId, String matnr, String batch, Double qty) {
- return this.baseMapper.increase(orderId, hostId, matnr, batch, qty) > 0;
- }
-
- @Override
- public boolean decrease(String orderNo, Long hostId, String matnr, String batch, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, hostId, matnr, batch, qty);
- if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, hostId, matnr, null, qty) > 0;
- } else {
- return true;
- }
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderLogServiceImpl.java
deleted file mode 100644
index d799033..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.OrderLogMapper;
-import com.zy.asrs.common.wms.entity.OrderLog;
-import com.zy.asrs.common.wms.service.OrderLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("orderLogService")
-public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog> implements OrderLogService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
deleted file mode 100644
index 1428c9a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.DetlDto;
-import com.zy.asrs.common.domain.param.OpenOrderPakinParam;
-import com.zy.asrs.common.domain.param.OpenOrderPakoutParam;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.mapper.OrderDetlMapper;
-import com.zy.asrs.common.wms.mapper.OrderMapper;
-import com.zy.asrs.common.wms.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.DateUtils;
-import com.zy.asrs.framework.common.SnowflakeIdWorker;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("orderService")
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
-
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private OpenService openService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private OrderDetlMapper orderDetlMapper;
- @Autowired
- private DocTypeService docTypeService;
-
- @Override
- public List<OrderDetl> selectWorkingDetls(Long orderId) {
- return orderDetlMapper.selectWorkingDetls(orderId);
- }
-
- @Override
- public void updateOrder1(Long orderId,Long userId) {
- this.baseMapper.updateOrder1(orderId, userId);
- }
-
- @Override
- public Order selectByNo(String orderNo, Long hostId) {
- List<Order> orderList = this.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo).eq(Order::getHostId, hostId));
- if (Cools.isEmpty(orderList)) {
- return null;
- }
- return orderList.get(0);
- }
-
- @Override
- public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls, Long hostId) {
- try {
- List<DetlDto> detlDtos = new ArrayList<>();
- wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
- });
- String orderNo = "HAND" + snowflakeIdWorker.nextId();
- if (pakin) {
- // 鐢熸垚鍏ュ簱鍗曟嵁
- OpenOrderPakinParam openParam = new OpenOrderPakinParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openParam.setHostId(hostId);
- openService.pakinOrderCreate(openParam);
- } else {
- // 鐢熸垚鍑哄簱鍗曟嵁
- OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
- openParam.setOrderType("鎵嬪姩鍑哄簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openParam.setHostId(hostId);
- openService.pakoutOrderCreate(openParam);
- }
-
- Order order = this.selectByNo(orderNo, hostId);
- if (null == order) {
- throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
- }
- if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
- throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
- }
- for (DetlDto detlDto : detlDtos) {
- // 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), hostId, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
- }
- }
- // 宸ヤ綔妗ｆ槑缁嗘洿鏂板崟鎹紪鍙�
- for (WrkDetl wrkDetl : wrkDetls) {
- wrkDetlService.updateOrderNo(orderNo, wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), hostId);
- }
- } catch (Exception e) {
- log.error("", e);
- return false;
- }
- return true;
- }
-
- @Override
- public boolean updateSettle(Long orderId, Long settle, Long userId, Long hostId) {
- return this.baseMapper.updateSettle(orderId, settle, userId, hostId) > 0;
- }
-
- @Override
- public void checkComplete(String orderNo, Long hostId) {
- Order order = this.selectByNo(orderNo, hostId);
- if (order.getSettle() >= 4L) {
- return;
- }
- List<OrderDetl> orderDetls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
- boolean complete = true;
- for (OrderDetl orderDetl : orderDetls) {
- if (orderDetl.getAnfme() > orderDetl.getQty()) {
- complete = false;
- break;
- }
- }
- if (complete && wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getOrderNo, orderNo).eq(WrkDetl::getHostId, hostId)) == 0) {
- // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
- DocType docType = docTypeService.getById(order.getDocType());
- if (null != docType && docType.getPakout() == 1) {
- if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
- for (WrkDetl wrkDetl : wrkDetls) {
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(wrkDetl);
- orderDetl.setQty(orderDetl.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(orderNo);
- orderDetl.setStatus(1);
- orderDetl.setCreateTime(order.getCreateTime());
- orderDetl.setCreateBy(order.getCreateBy());
- orderDetl.setUpdateTime(order.getUpdateTime());
- orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.save(orderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- }
- }
-
- if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
- throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
- }
- }
-
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderSettleServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderSettleServiceImpl.java
deleted file mode 100644
index f5c5734..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderSettleServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.OrderSettleMapper;
-import com.zy.asrs.common.wms.entity.OrderSettle;
-import com.zy.asrs.common.wms.service.OrderSettleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("orderSettleService")
-public class OrderSettleServiceImpl extends ServiceImpl<OrderSettleMapper, OrderSettle> implements OrderSettleService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/PriorServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/PriorServiceImpl.java
deleted file mode 100644
index 5f8b9cc..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/PriorServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.common.domain.dto.SafeStoDo;
-import com.zy.asrs.common.domain.entity.SafeStoExport;
-import com.zy.asrs.common.wms.entity.Prior;
-import com.zy.asrs.common.wms.mapper.PriorMapper;
-import com.zy.asrs.common.wms.service.PriorService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service("priorService")
-public class PriorServiceImpl extends ServiceImpl<PriorMapper, Prior> implements PriorService {
-
- @Override
- public IPage<SafeStoDo> getSafeQtyPage(Integer curr, Integer limit, Map<String, Object> param) {
- Page<SafeStoDo> page = new Page<>(curr, limit);
- return this.baseMapper.selectSafeStoPage(page, param);
- }
-
- @Override
- public List<SafeStoExport> getSafeExportExcel(Long hostId) {
- return this.baseMapper.selectSafeStoExportExcel(hostId);
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/RowLastnoServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/RowLastnoServiceImpl.java
deleted file mode 100644
index 798b1e0..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/RowLastnoServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.RowLastnoMapper;
-import com.zy.asrs.common.wms.entity.RowLastno;
-import com.zy.asrs.common.wms.service.RowLastnoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("rowLastnoService")
-public class RowLastnoServiceImpl extends ServiceImpl<RowLastnoMapper, RowLastno> implements RowLastnoService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
deleted file mode 100644
index cd2364a..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/TagServiceImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.wms.entity.Tag;
-import com.zy.asrs.common.wms.mapper.TagMapper;
-import com.zy.asrs.common.wms.service.TagService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.exception.CoolException;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-@Service("manTagService")
-public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
-
- @Override
- public synchronized Tag getTop(Long hostId) {
- Tag top = this.getOne(new LambdaQueryWrapper<Tag>().eq(Tag::getLevel, 1).eq(Tag::getHostId, hostId));
- if (top == null) {
- top = new Tag();
- top.setName("鍏ㄩ儴");
- top.setType(0);
- top.setLevel(1);
- top.setStatus(1);
- top.setSort(0);
- top.setHostId(hostId);
- Integer insert = this.baseMapper.insert(top);
- if (insert == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
- }
- }
- return top;
- }
-
- @Override
- public Tag getTag(String firstTagName, String secondTagName, Long hostId) {
- Date now = new Date();
- Tag tag = this.getOne(new LambdaQueryWrapper<Tag>()
- .eq(Tag::getName, "鍏ㄩ儴")
- .eq(Tag::getHostId, hostId)
- .isNull(Tag::getParentId));
- if (tag == null) {
- throw new CoolException("鍒嗙被绯荤粺寮傚父");
- }
-
- if (Cools.isEmpty(firstTagName)) {
- //涓�绾у垎绫伙紝鐩存帴杩斿洖鏍瑰垎绫�(鍏ㄩ儴)
- return tag;
- }
-
- if (!Cools.isEmpty(firstTagName)) {
- //瀛樺湪涓�绾у垎绫伙紝鏌ヨ涓�绾у垎绫�
- Tag firstTag = this.getOne(new LambdaQueryWrapper<Tag>()
- .eq(Tag::getName, firstTagName)
- .eq(Tag::getHostId, hostId));
- if (firstTag == null) {
- //涓�绾у垎绫讳负绌猴紝鍒涘缓涓�绾у垎绫�
- firstTag = new Tag();
- firstTag.setName(firstTagName);
- firstTag.setParentId(tag.getId());
- firstTag.setStatus(1);
- firstTag.setHostId(hostId);
- firstTag.setCreateTime(now);
- firstTag.setUpdateTime(now);
- this.save(firstTag);
- }
-
- if (!Cools.isEmpty(secondTagName)) {
- //瀛樺湪浜岀骇鍒嗙被锛屾煡璇簩绾у垎绫�
- Tag secondTag = this.getOne(new LambdaQueryWrapper<Tag>()
- .eq(Tag::getName, secondTagName)
- .eq(Tag::getHostId, hostId));
- if (secondTag == null) {
- //浜岀骇鍒嗙被涓虹┖锛屽垱寤轰簩绾у垎绫�
- secondTag = new Tag();
- secondTag.setName(secondTagName);
- secondTag.setParentId(firstTag.getId());
- secondTag.setStatus(1);
- secondTag.setHostId(hostId);
- secondTag.setCreateTime(now);
- secondTag.setUpdateTime(now);
- this.save(secondTag);
- return secondTag;
- }
- return secondTag;
- }else {
- return firstTag;//涓嶅瓨鍦ㄤ簩绾у垎绫伙紝鐩存帴杩斿洖涓�绾у垎绫�
- }
- }
- return tag;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinLogServiceImpl.java
deleted file mode 100644
index 3def741..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinLogServiceImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.WaitPakinLogMapper;
-import com.zy.asrs.common.wms.entity.WaitPakinLog;
-import com.zy.asrs.common.wms.service.WaitPakinLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("waitPakinLogService")
-public class WaitPakinLogServiceImpl extends ServiceImpl<WaitPakinLogMapper, WaitPakinLog> implements WaitPakinLogService {
-
- @Override
- public boolean saveToHistory(String zpallet, Long hostId) {
- return this.baseMapper.saveToHistory(zpallet, hostId) > 0;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinServiceImpl.java
deleted file mode 100644
index a7abe8f..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WaitPakinServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.WaitPakinMapper;
-import com.zy.asrs.common.wms.entity.WaitPakin;
-import com.zy.asrs.common.wms.service.WaitPakinService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("waitPakinService")
-public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
deleted file mode 100644
index ee20d56..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ /dev/null
@@ -1,754 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.*;
-import com.zy.asrs.common.domain.entity.StaDesc;
-import com.zy.asrs.common.domain.enums.IoWorkType;
-import com.zy.asrs.common.domain.enums.WorkNoType;
-import com.zy.asrs.common.domain.param.FullStoreParam;
-import com.zy.asrs.common.domain.param.LocDetlAdjustParam;
-import com.zy.asrs.common.domain.param.StockOutParam;
-import com.zy.asrs.common.sys.service.StaDescService;
-import com.zy.asrs.common.utils.Utils;
-import com.zy.asrs.common.wms.entity.*;
-import com.zy.asrs.common.wms.service.*;
-import com.zy.asrs.framework.common.BaseRes;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.exception.CoolException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * Created by vincent on 2020/6/11
- */
-@Slf4j
-@Service
-public class WorkServiceImpl implements WorkService {
-
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private CommonService commonService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private MatService matService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private WrkMastLogService wrkMastLogService;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private AdjDetlService adjDetlService;
- @Autowired
- private OrderService orderService;
-
- @Override
- @Transactional
- public String startupFullPutStore(FullStoreParam param, Long userId, Long hostId) {
- // 鍙傛暟闈炵┖鍒ゆ柇
- if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
- throw new CoolException(BaseRes.PARAM);
- }
- Date now = new Date();
- LocTypeDto locTypeDto = new LocTypeDto();
- locTypeDto.setLocType1(param.getLocType1());
- locTypeDto.setLocRangeDto(param.getLocRangeDto());
- List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
- String batch = param.getList().get(0).getBatch();
- StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), matnrs, batch, hostId, locTypeDto, 0);
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = dto.getWorkNo();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setAppeUser(String.valueOf(userId));
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- wrkMast.setModiTime(now);
- wrkMast.setHostId(hostId);
- if (!wrkMastService.save(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getList().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert detlDto1 != null;
- detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, hostId));
- if (Cools.isEmpty(mat)){
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧缁存姢澶辫触");
- }
- // 淇濇寔宸ヤ綔妗ｆ槑缁�
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(mat);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- wrkDetl.setBatch(detlDto.getBatch());
- wrkDetl.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鏉＄爜
- wrkDetl.setAppeUser(userId);
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setWrkMastId(wrkMast.getId());
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
-
- // 鏇存柊鐩爣搴撲綅鐘舵��
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
- if (locMast.getLocSts().equals("O")){
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
- throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
- }
- return dto.getLocNo();
- }
-
- @Override
- @Transactional
- public void startupFullTakeStore(StockOutParam param, Long userId, Long hostId) {
- // 鑾峰彇搴撲綅鏄庣粏
- List<LocDetlDto> locDetlDtos = new ArrayList<>();
- for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
- LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch(), hostId);
- if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
- }
- }
- if (!locDetlDtos.isEmpty()) {
- // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(param.getOutSite(), locDetlDtos, null, userId, hostId);
- } else {
- throw new CoolException("搴撳瓨涓嶅瓨鍦�");
- }
- }
-
- @Override
- @Transactional
- public void stockOut(Integer staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId, Long hostId) {
- Date now = new Date();
- // 鍚堝苟鍚岀被椤�
- Set<String> locNos = new HashSet<>();
- List<OutLocDto> dtos = new ArrayList<>();
- for (LocDetlDto locDetlDto : locDetlDtos) {
- String locNo = locDetlDto.getLocDetl().getLocNo();
- if (locNos.contains(locNo)) {
- for (OutLocDto dto : dtos) {
- if (dto.getLocNo().equals(locNo)) {
- dto.getLocDetlDtos().add(locDetlDto);
- break;
- }
- }
- } else {
- locNos.add(locNo);
- dtos.add(new OutLocDto(locNo, locDetlDto, hostId));
- }
- }
- Integer ioType = null;
- // 鐢熸垚宸ヤ綔妗�
- for (OutLocDto dto : dtos) {
- // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
- if (ioWorkType == null) {
- ioType = dto.isAll() ? 101 : 103;
- } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
- ioType = 107;
- }
- assert ioType != null;
- // 鑾峰彇搴撲綅
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
- // 鑾峰彇璺緞
- StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getDeviceStn, staNo).eq(StaDesc::getHostId, hostId));
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setBarcode(locMast.getBarcode());
- wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- wrkMast.setModiTime(now);
- wrkMast.setHostId(hostId);
- if (!wrkMastService.save(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
- continue;
- }
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(detlDto.getLocDetl());
- wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
- wrkDetl.setAnfme(anfme); // 鏁伴噺
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- wrkDetl.setHostId(hostId);
- wrkDetl.setWrkMastId(wrkMast.getId());
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
- locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
- if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType == 101 ? "R" : "P");
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
- }
- } else {
- throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
- }
- }
- }
-
- @Override
- @Transactional
- public void stockOut(Integer staNo, TaskDto taskDto, Long userId, Long hostId) {
- Date now = new Date();
- List<LocDto> locDtos = taskDto.getLocDtos();
- for (LocDto locDto : locDtos) {
- if (!taskDto.getLocNo().equals(locDto.getLocNo()) && !taskDto.getStaNo().equals(locDto.getStaNo())) {
- throw new CoolException("璁㈠崟鍑哄簱寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- // 鑾峰彇搴撲綅
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocNo, taskDto.getLocNo())
- .eq(LocMast::getHostId, hostId));
- // 鑾峰彇璺緞
- int ioType = taskDto.isAll() ? 101 : 103;
- // 鑾峰彇璺緞
- StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>().eq(StaDesc::getTypeNo, ioType).eq(StaDesc::getDeviceStn, staNo).eq(StaDesc::getHostId, hostId));
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setBarcode(locMast.getBarcode());
- wrkMast.setAppeUser(String.valueOf(userId)); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- wrkMast.setModiTime(now);
- wrkMast.setHostId(hostId);
- if (!wrkMastService.save(wrkMast)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+taskDto.getLocNo());
- }
- // 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDto locDto : taskDto.getLocDtos()) {
- if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
- Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
- .eq(Order::getOrderNo, locDto.getOrderNo())
- .eq(Order::getHostId, hostId));
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(order.getId(), locDto.getMatnr(), null);
- }
- LocDetl locDetl = locDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), hostId);
- if (locDetl == null || locDetl.getAnfme() < locDto.getAnfme()) {
- throw new CoolException(locDto.getLocNo() + "搴撲綅涓�" + locDto.getMatnr() + "鍟嗗搧搴撳瓨涓嶈冻锛�");
- }
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(orderDetl);
- wrkDetl.setZpallet(wrkMast.getBarcode());
- wrkDetl.setIoTime(now);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setBatch(locDto.getBatch());
- wrkDetl.setOrderNo(locDto.getOrderNo());
- wrkDetl.setAnfme(locDto.getAnfme()); // 鏁伴噺
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- wrkDetl.setHostId(hostId);
- wrkDetl.setWrkMastId(wrkMast.getId());
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- // 淇敼璁㈠崟鏄庣粏
- if (!orderDetlService.increase(orderDetl.getOrderId(), hostId, orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- orderService.updateSettle(orderDetl.getOrderId(), 2L, userId, hostId);
- }
- // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
- locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocNo, taskDto.getLocNo())
- .eq(LocMast::getHostId, hostId));
- if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType==101?"R":"P");
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+taskDto.getLocNo());
- }
- } else {
- throw new CoolException(taskDto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
- }
- }
-
- @Override
- @Transactional
- public void completeWrkMast(String workNo, Long userId, Long hostId) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, workNo).eq(WrkMast::getHostId, hostId));
- if (Cools.isEmpty(wrkMast)){
- throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
- }
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
- throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
- }
- // 鍏ュ簱 + 搴撲綅杞Щ
- if (wrkMast.getWrkSts() < 99 || (wrkMast.getWrkSts() > 100 && wrkMast.getIoType()==11)) {
- wrkMast.setWrkSts(99L);//99.鍏ュ簱瀹屾垚
- // 鍑哄簱
- } else if (wrkMast.getWrkSts() > 100) {
- wrkMast.setWrkSts(199L);//199.鍑哄簱瀹屾垚
- }
- Date now = new Date();
- wrkMast.setModiTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- // 瀹屾垚鎿嶄綔浜哄憳璁板綍
- wrkMast.setManuType("鎵嬪姩瀹屾垚");
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("淇敼宸ヤ綔妗ｅけ璐�");
- }
- }
-
- @Override
- @Transactional
- public void cancelWrkMast(String workNo, Long userId, Long hostId) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, workNo).eq(WrkMast::getHostId, hostId));
- if (Cools.isEmpty(wrkMast)) {
- throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
- }
- String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
- String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
- // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
- if (wrkMast.getWrkSts() < 99) {
- locNo = wrkMast.getLocNo();
- locSts = "O";
-
- // 搴撲綅杞Щ
- if (wrkMast.getIoType() == 11) {
- // 搴撲綅杞Щ锛氭簮搴撲綅
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, wrkMast.getSourceLocNo()).eq(LocMast::getHostId, hostId));
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:" + wrkMast.getSourceLocNo());
- }
- locMast.setLocSts("F");
- locMast.setModiTime(new Date());
- locMast.setModiUser(userId);
- locMastService.updateById(locMast);
- }
- // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
- } else if (wrkMast.getWrkSts() > 100 && wrkMast.getWrkSts() != 199) {
- locNo = wrkMast.getSourceLocNo();
- // 鍑哄簱 ===>> F.鍦ㄥ簱
- if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {
- locSts = "F";
- // 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
- } else if (wrkMast.getIoType() == 110) {
- locSts = "D";
- // 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
- } else if (wrkMast.getIoType() == 11) {
- locSts = wrkMast.getFullPlt().equalsIgnoreCase("N") ? "D" : "F";
- // 搴撲綅杞Щ锛氱洰鏍囧簱浣�
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, wrkMast.getLocNo()).eq(LocMast::getHostId, hostId));
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛岀洰鏍囧簱浣嶄笉瀛樺湪:" + wrkMast.getSourceLocNo());
- }
- locMast.setLocSts("O");
- locMast.setModiTime(new Date());
- locMast.setModiUser(userId);
- locMastService.updateById(locMast);
- }
- } else {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�");
- }
- // 璁㈠崟鍏宠仈
- List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, wrkMast.getWrkNo()).eq(WrkDetl::getHostId, hostId));
- for (WrkDetl wrkDetl : wrkDetls) {
- if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
- if (!orderDetlService.decrease(wrkDetl.getOrderNo(), hostId, wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
- throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
- }
- }
- }
- // 鍙栨秷鎿嶄綔浜哄憳璁板綍
- wrkMast.setManuType("鎵嬪姩鍙栨秷");
- wrkMast.setModiUser(String.valueOf(userId));
- wrkMast.setModiTime(new Date());
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐�");
- }
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.saveToHistory(wrkMast.getId())) {
- throw new CoolException("淇濆瓨宸ヤ綔鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- boolean wrkMastRes = wrkMastService.removeById(wrkMast);
-
- if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.saveToHistory(wrkMast.getWrkNo(), hostId)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔妗ｆ槑缁�
- boolean wrkDetlRes = wrkDetlService.remove(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getWrkNo, workNo).eq(WrkDetl::getHostId, hostId));
- }
-
- // 淇敼搴撲綅鐘舵��
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId, hostId));
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("鍙栨秷宸ヤ綔妗ｅけ璐ワ紝搴撲綅涓嶅瓨鍦�:" + locNo);
- }
- locMast.setLocSts(locSts);
- locMast.setModiTime(new Date());
- locMast.setModiUser(userId);
- boolean locMastRes = locMastService.updateById(locMast);
- if (!wrkMastRes || !locMastRes) {
- throw new CoolException("淇濆瓨鏁版嵁澶辫触");
- }
- }
-
- @Override
- @Transactional
- public void pickWrkMast(String workNo, Long userId, Long hostId) {
- WrkMast wrkMast = wrkMastService.getOne(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getWrkNo, workNo).eq(WrkMast::getHostId, hostId));
- if (Cools.isEmpty(wrkMast)) {
- throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
- }
- // 鍏ュ嚭搴撶被鍨嬪垽鏂�
- if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
- throw new CoolException("褰撳墠鍏ュ嚭搴撶被鍨嬫棤娉曡繘琛屾搷浣�");
- }
- // 宸ヤ綔鐘舵�佸垽鏂�
- if (wrkMast.getWrkSts() < 101 || wrkMast.getWrkSts() == 200) {
- throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
- }
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
-// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。澶辫触");
-// }
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.saveToHistory(wrkMast.getId())) {
- throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
- }
- // 鑾峰彇鐩爣绔�
- LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
- .eq(StaDesc::getTypeNo, wrkMast.getIoType() - 50)
- .eq(StaDesc::getStnNo, wrkMast.getStaNo()); // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
- StaDesc staDesc = staDescService.getOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- // 鍫嗗灈鏈虹珯鐐�(鐩爣绔�)
- Integer staNo = staDesc.getDeviceStn();
- Date now = new Date();
- // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
- wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
- wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
- wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 婧愮珯
- wrkMast.setStaNo(staNo); // 鐩爣绔�
- wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
- wrkMast.setModiTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
- }
- // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, wrkMast.getLocNo()).eq(LocMast::getHostId, hostId));
- locMast.setLocSts("Q");
- locMast.setModiTime(now);
- locMast.setModiUser(userId);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
- }
- }
-
- @Override
- @Transactional
- public void adjustLocDetl(LocDetlAdjustParam param, Long userId, Long hostId) {
- param.integrate();
- LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, hostId));
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("搴撲綅涓嶅瓨鍦�");
- }
- if (!(locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O"))) {
- throw new CoolException("褰撳墠搴撲綅涓嶅彲璋冩暣锛佸簱浣嶇姸鎬侊細" + locMast.getLocSts$());
- }
-
- Date now = new Date();
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, param.getLocNo()).eq(LocDetl::getHostId, hostId));
-
- List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();
-
- // 淇敼鏁伴噺
- Iterator<LocDetl> iterator = locDetls.iterator();
- while (iterator.hasNext()) {
- LocDetl locDetl = iterator.next();
-
- Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
- while (iterator1.hasNext()) {
- LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
- if (adjust.getCount() == 0) { continue; }
- if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) {
- if (!locDetl.getAnfme().equals(adjust.getCount())) {
- // todo 鐩樼偣璁板綍
- // 淇敼搴撳瓨
- if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), hostId)) {
- throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
- }
- // 淇濆瓨璋冩暣璁板綍
- AdjDetl adjDetl = new AdjDetl();
- adjDetl.setLocNo(locDetl.getLocNo());
- adjDetl.setMatnr(locDetl.getMatnr());
- adjDetl.setBatch(locDetl.getBatch());
- adjDetl.setOriQty(locDetl.getAnfme());
- adjDetl.setAdjQty(adjust.getCount());
- adjDetl.setModiTime(now);
- adjDetl.setModiUser(userId);
- adjDetl.setAppeTime(now);
- adjDetl.setAppeUser(userId);
- adjDetl.setHostId(hostId);
- adjDetlService.save(adjDetl);
- }
- iterator.remove();
- iterator1.remove();
- }
- }
- }
-
- // 鍒犻櫎搴撳瓨
- for (LocDetl locDetl : locDetls) {
- // todo 鐩樼偣璁板綍
- if (!locDetlService.updateAnfme(-1.0D, locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), hostId)) {
- throw new CoolException("鍒犻櫎" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
- }
- // 淇濆瓨璋冩暣璁板綍
- AdjDetl adjDetl = new AdjDetl();
- adjDetl.setLocNo(locDetl.getLocNo());
- adjDetl.setMatnr(locDetl.getMatnr());
- adjDetl.setBatch(locDetl.getBatch());
- adjDetl.setOriQty(locDetl.getAnfme());
- adjDetl.setAdjQty(0.0D);
- adjDetl.setModiTime(now);
- adjDetl.setModiUser(userId);
- adjDetl.setAppeTime(now);
- adjDetl.setAppeUser(userId);
- adjDetl.setHostId(hostId);
- adjDetlService.save(adjDetl);
- }
-
- // 娣诲姞搴撳瓨
- for (LocDetlAdjustParam.LocDetlAdjust adjust : list) {
- if (adjust.getCount() == 0.0D) { continue; }
- Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, adjust.getMatnr()).eq(Mat::getHostId, hostId));
- LocDetl locDetl = new LocDetl();
- locDetl.sync(mat);
- locDetl.setBatch(adjust.getBatch());
- locDetl.setLocNo(locMast.getLocNo());
- locDetl.setAnfme(adjust.getCount()); // 鏁伴噺
- locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
- locDetl.setModiTime(now);
- locDetl.setAppeUser(userId);
- locDetl.setAppeTime(now);
- locDetl.setHostId(hostId);
- if (!locDetlService.save(locDetl)) {
- throw new CoolException("娣诲姞" + locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "搴忓垪鐮佸簱瀛樻槑缁嗗け璐�");
- }
- // 淇濆瓨璋冩暣璁板綍
- AdjDetl adjDetl = new AdjDetl();
- adjDetl.setLocNo(locMast.getLocNo());
- adjDetl.setMatnr(adjust.getMatnr());
- adjDetl.setBatch(adjust.getBatch());
- adjDetl.setOriQty(0.0D);
- adjDetl.setAdjQty(adjust.getCount());
- adjDetl.setModiTime(now);
- adjDetl.setModiUser(userId);
- adjDetl.setAppeTime(now);
- adjDetl.setAppeUser(userId);
- adjDetl.setHostId(hostId);
- adjDetlService.save(adjDetl);
- }
- // 淇敼搴撲綅鐘舵��
- int count = locDetlService.count(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locMast.getLocNo()).eq(LocDetl::getHostId, hostId));
- if (locMast.getLocSts().equals("F")) {
- if (count == 0) {
- locMast.setLocSts("D");
- }
- }
- if (locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O")) {
- if (count > 0) {
- locMast.setLocSts("F");
- }
- }
- locMast.setModiUser(userId);
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
- }
- }
-
- @Override
- @Transactional
- public void locMove(String sourceLocNo, String locNo, Long userId, Long hostId) {
- LocMast sourceLoc = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocNo, sourceLocNo)
- .eq(LocMast::getHostId, hostId));
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getLocNo, sourceLocNo)
- .eq(LocDetl::getHostId, hostId));
- if (Cools.isEmpty(sourceLoc)){
- throw new CoolException("鏈壘鍒板簱浣�");
- }
- LocMast loc = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
- .eq(LocMast::getLocNo, locNo)
- .eq(LocMast::getHostId, hostId));
- if (Cools.isEmpty(loc)){
- throw new CoolException("鏈壘鍒板簱浣�");
- }
- if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
-// throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�"); todo:luxiaotao
- }
- Date now = new Date();
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鐢熸垚鍑哄簱浠诲姟
- wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
- wrkMast.setIoPri(10D);
- wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
- wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
- wrkMast.setFullPlt(Cools.isEmpty(locDetls)?"N":"Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 绌烘澘
- wrkMast.setBarcode(sourceLoc.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setAppeUser(String.valueOf(userId));
- wrkMast.setAppeTime(now);
- wrkMast.setModiUser(String.valueOf(userId));
- wrkMast.setModiTime(now);
- wrkMast.setHostId(hostId);
- boolean res = wrkMastService.save(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- for (LocDetl locDetl : locDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.sync(locDetl);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(now);
- wrkDetl.setAnfme(locDetl.getAnfme());
- wrkDetl.setAppeTime(now);
- wrkDetl.setAppeUser(userId);
- wrkDetl.setModiTime(now);
- wrkDetl.setModiUser(userId);
- wrkDetl.setHostId(hostId);
- wrkDetl.setWrkMastId(wrkMast.getId());
- if (!wrkDetlService.save(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
- }
- }
- // 淇敼婧愬簱浣嶇姸鎬�
- if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
- sourceLoc.setLocSts("R"); // R.鍑哄簱棰勭害
- sourceLoc.setModiUser(userId);
- sourceLoc.setModiTime(now);
- if (!locMastService.updateById(sourceLoc)){
- throw new CoolException("鏇存柊婧愬簱浣嶇姸鎬佸け璐�");
- }
- } else {
- throw new CoolException(sourceLoc.getLocNo() + "婧愬簱浣嶅嚭搴撳け璐ワ紝鐘舵�侊細"+sourceLoc.getLocSts$());
- }
- // 淇敼鐩爣搴撲綅鐘舵��
- if (loc.getLocSts().equals("O")) {
- loc.setLocSts("S"); // S.鍏ュ簱棰勭害
- loc.setModiTime(now);
- loc.setModiUser(userId);
- if (!locMastService.updateById(loc)) {
- throw new CoolException("鏇存柊鐩爣搴撲綅鐘舵�佸け璐�");
- }
- } else {
- throw new CoolException("绉昏浆澶辫触锛岀洰鏍囧簱浣嶇姸鎬侊細"+loc.getLocSts$());
- }
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java
deleted file mode 100644
index 0ef3518..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlLogServiceImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.WrkDetlLogMapper;
-import com.zy.asrs.common.wms.entity.WrkDetlLog;
-import com.zy.asrs.common.wms.service.WrkDetlLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkDetlLogService")
-public class WrkDetlLogServiceImpl extends ServiceImpl<WrkDetlLogMapper, WrkDetlLog> implements WrkDetlLogService {
-
- @Override
- public boolean saveToHistory(Integer workNo, Long hostId) {
- return this.baseMapper.saveToHistory(workNo, hostId) > 0;
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlServiceImpl.java
deleted file mode 100644
index ba3aafb..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkDetlServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.WrkDetlMapper;
-import com.zy.asrs.common.wms.entity.WrkDetl;
-import com.zy.asrs.common.wms.service.WrkDetlService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("wrkDetlService")
-public class WrkDetlServiceImpl extends ServiceImpl<WrkDetlMapper, WrkDetl> implements WrkDetlService {
-
- @Override
- public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
- return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
- }
-
- @Override
- public boolean updateOrderNo(String orderNo, Integer wrkNo, String matnr, String batch, Long hostId) {
- return baseMapper.updateOrderNo(orderNo, wrkNo, matnr, batch, hostId) > 0;
- }
-
- @Override
- public List<WrkDetl> selectAndLogByOrderNo(String orderNo, Long hostId) {
- return this.baseMapper.selectAndLogByOrderNo(orderNo, hostId);
- }
-
- @Override
- public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr, Long hostId) {
- return this.baseMapper.selectPakoutQuery(staNo, matnr, hostId);
- }
-
- @Override
- public boolean updateInspect(Integer wrkNo, String matnr, String batch, Long hostId) {
- return this.baseMapper.updateInspect(wrkNo, matnr, batch, hostId) > 0;
- }
-
- @Override
- public boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch, Long hostId) {
- if (anfme <= 0) {
- return this.baseMapper.deleteItem(wrkNo, matnr, batch, hostId) > 0;
- } else {
- return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch, hostId) > 0;
- }
- }
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkLastnoServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkLastnoServiceImpl.java
deleted file mode 100644
index 8ac4461..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkLastnoServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.WrkLastnoMapper;
-import com.zy.asrs.common.wms.entity.WrkLastno;
-import com.zy.asrs.common.wms.service.WrkLastnoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkLastnoService")
-public class WrkLastnoServiceImpl extends ServiceImpl<WrkLastnoMapper, WrkLastno> implements WrkLastnoService {
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastLogServiceImpl.java
deleted file mode 100644
index 1823932..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastLogServiceImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.zy.asrs.common.wms.mapper.WrkMastLogMapper;
-import com.zy.asrs.common.wms.entity.WrkMastLog;
-import com.zy.asrs.common.wms.service.WrkMastLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastLogService")
-public class WrkMastLogServiceImpl extends ServiceImpl<WrkMastLogMapper, WrkMastLog> implements WrkMastLogService {
-
- @Override
- public boolean saveToHistory(Long id) {
- return this.baseMapper.saveToHistory(id) > 0;
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastServiceImpl.java
deleted file mode 100644
index 2d7355e..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WrkMastServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.zy.asrs.common.wms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.common.domain.dto.LocRangeDto;
-import com.zy.asrs.common.wms.mapper.WrkMastMapper;
-import com.zy.asrs.common.wms.entity.WrkMast;
-import com.zy.asrs.common.wms.service.WrkMastService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("wrkMastService")
-public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService {
-
- @Override
- public List<WrkMast> selectToBeCompleteData() {
- return this.baseMapper.selectToBeCompleteData();
- }
-
- @Override
- public List<WrkMast> selectToBeHistoryData() {
- return this.baseMapper.selectToBeHistoryData();
- }
-
- @Override
- public WrkMast selectByBarcode(String barcode, Long hostId) {
- List<WrkMast> wrkMasts = this.list(new LambdaQueryWrapper<WrkMast>().eq(WrkMast::getBarcode, barcode).eq(WrkMast::getHostId, hostId));
- if (Cools.isEmpty(wrkMasts)) {
- return null;
- }
- return wrkMasts.get(0);
- }
-
- @Override
- public List<WrkMast> selectSameMatnrs(String matnr, String batch, LocRangeDto locRangeDto, Long hostId) {
- return this.baseMapper.selectSameLevMatnrs(matnr, batch, locRangeDto, hostId);
- }
-}
diff --git a/zy-asrs-common/src/main/resources/mapper/openapi/ApiListMapper.xml b/zy-asrs-common/src/main/resources/mapper/openapi/ApiListMapper.xml
deleted file mode 100644
index dacc46e..0000000
--- a/zy-asrs-common/src/main/resources/mapper/openapi/ApiListMapper.xml
+++ /dev/null
@@ -1,5 +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.common.openapi.mapper.ApiListMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/openapi/ApiLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/openapi/ApiLogMapper.xml
deleted file mode 100644
index 4baba72..0000000
--- a/zy-asrs-common/src/main/resources/mapper/openapi/ApiLogMapper.xml
+++ /dev/null
@@ -1,5 +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.common.openapi.mapper.ApiLogMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/openapi/HostKeyMapper.xml b/zy-asrs-common/src/main/resources/mapper/openapi/HostKeyMapper.xml
deleted file mode 100644
index b0d1e61..0000000
--- a/zy-asrs-common/src/main/resources/mapper/openapi/HostKeyMapper.xml
+++ /dev/null
@@ -1,11 +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.common.openapi.mapper.HostKeyMapper">
-
- <select id="getList" resultType="com.zy.asrs.common.openapi.entity.HostKey">
- select sh.id host_id,ohk.* from sys_host sh
- left join openapi_host_key ohk
- on ohk.host_id = sh.id
- </select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/AdjDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/AdjDetlMapper.xml
deleted file mode 100644
index 470838c..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/AdjDetlMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.AdjDetlMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml
deleted file mode 100644
index 8b8635e..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasBarcodeMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
deleted file mode 100644
index 08fa32d..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasDevpMapper.xml
+++ /dev/null
@@ -1,29 +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.common.wms.mapper.BasDevpMapper">
-
- <select id="getAvailableInSite" resultType="java.lang.Integer">
- select
- wbd.dev_no
- from common_bas_devp wbd
- left join common_sta_desc asd on wbd.dev_no = asd.stn_no
- where 1=1
- and asd.type_no = #{typeNo}
- and wbd.host_id = #{hostId}
- -- and wbd.in_enable = 'Y'
- group by wbd.dev_no
- </select>
-
- <select id="getAvailableOutSite" resultType="java.lang.Integer">
- select
- wbd.dev_no
- from common_bas_devp wbd
- left join common_sta_desc asd on wbd.dev_no = asd.stn_no
- where 1=1
- and asd.type_no = #{typeNo}
- and wbd.host_id = #{hostId}
- -- wbd abd.out_enable = 'Y'
- group by wbd.dev_no
- </select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasLocStsMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasLocStsMapper.xml
deleted file mode 100644
index dcd7bc1..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasLocStsMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasLocStsMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasMapMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasMapMapper.xml
deleted file mode 100644
index eeb6e6b..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasMapMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasMapMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasPlcerrorMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasPlcerrorMapper.xml
deleted file mode 100644
index 736729d..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasPlcerrorMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasPlcerrorMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasWhsMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasWhsMapper.xml
deleted file mode 100644
index 5f5d735..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasWhsMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasWhsMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasWrkIotypeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasWrkIotypeMapper.xml
deleted file mode 100644
index 146e56c..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasWrkIotypeMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasWrkIotypeMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasWrkStatusMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasWrkStatusMapper.xml
deleted file mode 100644
index a883347..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/BasWrkStatusMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.BasWrkStatusMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/CstmrMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/CstmrMapper.xml
deleted file mode 100644
index 1134c42..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/CstmrMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.CstmrMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/DocTypeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/DocTypeMapper.xml
deleted file mode 100644
index d82d8ca..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/DocTypeMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.DocTypeMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ItemMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ItemMapper.xml
deleted file mode 100644
index c1457fa..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/ItemMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.ItemMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
deleted file mode 100644
index c8584e7..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
+++ /dev/null
@@ -1,145 +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.common.wms.mapper.LocDetlMapper">
-
- <sql id="batchSeq">
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- </sql>
-
- <sql id="stockOutCondition">
- <if test="map.loc_no!=null and map.loc_no!='' ">
- and a.loc_no like '%' + #{map.loc_no} + '%'
- </if>
- <if test="map.matnr!=null and map.matnr!='' ">
- and a.matnr like '%' + #{map.matnr} + '%'
- </if>
- <if test="map.maktx!=null and map.maktx!='' ">
- and a.maktx like '%' + #{map.maktx} + '%'
- </if>
- <if test="map.batch!=null and map.batch!='' ">
- and a.batch like '%' + #{map.batch} + '%'
- </if>
- <if test="map.anfme!=null and map.anfme!='' ">
- and a.anfme like '%' + #{map.anfme} + '%'
- </if>
- <if test="map.startTime!=null and map.endTime!=null">
- and a.modi_time between #{map.startTime} and #{map.endTime}
- </if>
- <if test="map.memo!=null and map.memo!='' and map.memo!='all'">
- and a.memo like '%' + #{map.memo} + '%'
- </if>
- <if test="map.memo!=null and map.memo!='' and map.memo=='all'">
- and a.memo is not null
- and a.memo !=''
- </if>
- </sql>
-
- <select id="getStockStatis" resultType="com.zy.asrs.common.wms.entity.LocDetl">
- select
- a.matnr
- , sum(a.anfme) as anfme
- from wms_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr
- </select>
-
- <select id="sum" resultType="java.lang.Integer">
- SELECT SUM(anfme) FROM wms_loc_detl
- </select>
-
- <select id="queryStock" resultType="com.zy.asrs.common.wms.entity.LocDetl">
- select
- a.*
- from wms_loc_detl a
- left join common_loc_mast b on a.loc_no = b.loc_no and a.host_id = b.host_id
- where 1=1
- and a.matnr = #{matnr}
- <if test="batch!=null and batch!=''">
- and a.batch = #{batch}
- </if>
- and b.host_id = #{hostId}
- and b.loc_sts = 'F'
- order by b.row1
- </select>
-
- <select id="selectItem" resultType="com.zy.asrs.common.wms.entity.LocDetl">
- select top 1 *
- from wms_loc_detl
- where 1=1
- and loc_no = #{locNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </select>
-
- <delete id="deleteItem">
- delete from wms_loc_detl
- where 1=1
- and loc_no = #{locNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </delete>
-
- <update id="updateAnfme">
- update wms_loc_detl
- set anfme = #{anfme}
- , modi_time = getdate()
- where 1=1
- and loc_no = #{locNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </update>
-
- <select id="getStockOutPage" resultType="com.zy.asrs.common.wms.entity.LocDetl">
- select
- a.*
- from wms_loc_detl a
- left join common_loc_mast b on a.loc_no = b.loc_no and a.host_id = b.host_id
- where 1=1
- and b.loc_sts = 'F'
- and b.host_id = #{map.hostId}
- <include refid="stockOutCondition"></include>
- </select>
-
- <select id="getReportStockDto" resultType="com.zy.asrs.common.domain.dto.ReportStockDto">
- select matnr,batch,sum(anfme) anfme from wms_loc_detl
- where host_id = #{hostId}
- group by matnr,batch
- </select>
-
- <select id="selectSameDetl" resultType="java.lang.String">
- SELECT
- ld.loc_no
- FROM wms_loc_detl ld
- LEFT JOIN common_loc_mast lm ON ld.loc_no = lm.loc_no and ld.host_id = lm.host_id
- LEFT JOIN (
- select
- loc_no,
- count(1) as count
- from wms_loc_detl
- where 1=1
- and host_id = #{hostId}
- group by loc_no
- ) dual on dual.loc_no = lm.loc_no
- WHERE 1 = 1
- AND ld.matnr = #{matnr}
- <if test="batch">
- AND ld.batch = #{batch}
- </if>
- AND (lm.loc_sts = 'F')
- AND dual.count = 1
- AND lm.host_id = #{hostId}
- ORDER BY lm.modi_time ASC
- </select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocDirectionMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDirectionMapper.xml
deleted file mode 100644
index f90b91a..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDirectionMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.LocDirectionMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocMastMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocMastMapper.xml
deleted file mode 100644
index 626241e..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocMastMapper.xml
+++ /dev/null
@@ -1,38 +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.common.wms.mapper.LocMastMapper">
-
- <select id="queryFreeLocMast2" resultType="com.zy.asrs.common.wms.entity.LocMast">
- select *
- from common_loc_mast
- where 1=1
- and loc_sts='O'
- <if test="locType1 != null">
- and loc_type1 = #{locType1}
- </if>
- <if test="rowBeg != null">
- and row1 >= #{rowBeg}
- </if>
- <if test="rowEnd != null">
- and row1 <= #{rowEnd}
- </if>
- <if test="bayBeg != null">
- and bay1 >= #{bayBeg}
- </if>
- <if test="bayEnd != null">
- and bay1 <= #{bayEnd}
- </if>
- <if test="levBeg != null">
- and lev1 >= #{levBeg}
- </if>
- <if test="levEnd != null">
- and lev1 <= #{levEnd}
- </if>
- <if test="hostId != null">
- and host_id = #{hostId}
- </if>
--- and loc_no not in ('0100101')
- order by loc_sts desc ,lev1 asc,bay1 asc
- </select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml
deleted file mode 100644
index 92583a9..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocRuleMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.LocRuleMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/MatCodeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/MatCodeMapper.xml
deleted file mode 100644
index d970907..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/MatCodeMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.MatCodeMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml
deleted file mode 100644
index 20a4c8a..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/MatMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.MatMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/NodeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/NodeMapper.xml
deleted file mode 100644
index 32c0265..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/NodeMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.NodeMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlLogMapper.xml
deleted file mode 100644
index 7848bd7..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlLogMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.OrderDetlLogMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
deleted file mode 100644
index e8a6247..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
+++ /dev/null
@@ -1,89 +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.common.wms.mapper.OrderDetlMapper">
-
- <sql id="pakOutPageCondition">
- <if test="map.order_id!=null and map.order_id!='' ">
- and mod.order_id = #{map.order_id}
- </if>
- <if test="map.matnr!=null and map.matnr!='' ">
- and mod.matnr = #{map.matnr}
- </if>
- <if test="map.maktx!=null and map.maktx!='' ">
- and mod.maktx = #{map.maktx}
- </if>
- <if test="map.batch!=null and map.batch!='' ">
- and mod.batch = #{map.batch}
- </if>
- </sql>
-
- <select id="selectWorkingDetls" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
- select * from wms_order_detl
- where 1=1
- and order_id = #{orderId}
- and qty < anfme
- </select>
-
- <select id="selectItem" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
- select * from wms_order_detl
- where 1=1
- and order_id = #{orderId}
- and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- </select>
-
- <select id="getPakoutPage" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
- select
- mod.*
- from wms_order_detl mod
- inner join wms_order mo on mod.order_id = mo.id
- inner join wms_doc_type mdt on mo.doc_type = mdt.doc_id
- where 1=1
- and mo.settle <= 2
- and mo.status = 1
- and mdt.pakout = 1
- <include refid="pakOutPageCondition"></include>
- </select>
-
- <update id="increase">
- update wms_order_detl
- set qty = qty + #{qty}
- where 1=1
- and order_id = #{orderId}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- </update>
-
- <update id="decrease">
- update wms_order_detl
- set qty = qty - #{qty}
- where 1=1
- and order_no = #{orderNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- </update>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml
deleted file mode 100644
index 4fd146a..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.OrderLogMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
deleted file mode 100644
index 9d7c276..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
+++ /dev/null
@@ -1,30 +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.common.wms.mapper.OrderMapper">
-
- <update id="updateOrder1">
- update wms_order
- set settle = 6
- ,update_time = getdate()
- ,memo = '鍒犻櫎鎸夐挳鎵嬪姩杞崲'
- <if test="userId != null">
- ,update_by = #{userId}
- </if>
- where 1=1
- and id = #{orderId}
- </update>
-
- <update id="updateSettle">
- update wms_order
- set settle = #{settle}
- ,update_time = getdate()
- <if test="userId != null">
- ,update_by = #{userId}
- </if>
- where 1=1
- and id = #{orderId}
- and host_id = #{hostId}
- </update>
-
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderSettleMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderSettleMapper.xml
deleted file mode 100644
index ba191ff..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderSettleMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.OrderSettleMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/PriorMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/PriorMapper.xml
deleted file mode 100644
index c96a014..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/PriorMapper.xml
+++ /dev/null
@@ -1,26 +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.common.wms.mapper.PriorMapper">
-
- <sql id="pageCondition">
- <if test="map.host_id != null and map.host_id != ''">
- and host_id = #{map.host_id}
- </if>
- <if test="map.matnr != null and map.matnr != ''">
- and matnr like concat('%',#{map.matnr},'%')
- </if>
- <if test="map.maktx != null and map.maktx != ''">
- and maktx like concat('%',#{map.maktx},'%')
- </if>
- <if test="map.loc_no != null and map.loc_no != ''">
- and loc_no like concat('%',#{map.loc_no},'%')
- </if>
- </sql>
-
- <select id="selectSafeStoPage" resultType="com.zy.asrs.common.domain.dto.SafeStoDo">
- select * from wms_prior
- where 1=1
- <include refid="pageCondition"></include>
- </select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
deleted file mode 100644
index ba60db9..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/ReportQueryMapper.xml
+++ /dev/null
@@ -1,10 +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.common.wms.mapper.ReportQueryMapper">
-
- <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
- <select id="queryViewStockUseList" parameterType="com.zy.asrs.common.wms.entity.ViewStockUseBean" resultType="com.zy.asrs.common.wms.entity.ViewStockUseBean">
- select * from asr_stk_use_view
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/RowLastnoMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/RowLastnoMapper.xml
deleted file mode 100644
index 20bdaf1..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/RowLastnoMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.RowLastnoMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml
deleted file mode 100644
index 1de9679..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/StaDescMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.StaDescMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml
deleted file mode 100644
index 32a7949..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/TagMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.TagMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
deleted file mode 100644
index d1c436e..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewInOutMapper.xml
+++ /dev/null
@@ -1,20 +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.common.wms.mapper.ReportQueryMapper">
-
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewInOutConditionSql">
- <if test="viewInOut.sourceStaNo!=null and viewInOut.sourceStaNo!='' ">
- and source_sta_no like '%' + #{viewInOut.sourceStaNo} + '%'
- </if>
-</sql>
-
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewInOutList" parameterType="com.zy.asrs.common.wms.entity.ViewInOutBean" resultType="com.zy.asrs.common.wms.entity.ViewInOutBean">
- select * from asr_sta_inout_view
- where 1=1
- <include refid="viewInOutConditionSql"></include>
-</select>
-
-</mapper>
\ No newline at end of file
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
deleted file mode 100644
index 5a220a1..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
+++ /dev/null
@@ -1,28 +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.common.wms.mapper.ReportQueryMapper">
-
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewStayTimeConditionSql">
- <if test="viewStayTime.locNo!=null and viewStayTime.locNo!='' ">
- and common_loc_mast.loc_no like '%' + #{viewStayTime.locNo} + '%'
- </if>
- <if test="viewStayTime.matnr!=null and viewStayTime.matnr!='' ">
- and matnr like '%' + #{viewStayTime.matnr} + '%'
- </if>
-</sql>
-
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewStayTimeList" parameterType="com.zy.asrs.common.wms.entity.ViewStayTimeBean" resultType="com.zy.asrs.common.wms.entity.ViewStayTimeBean">
- SELECT
- GETDATE() AS today
- , CONVERT(decimal, DATEDIFF(second,wms_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , wms_loc_detl.*
- FROM wms_loc_detl
- INNER JOIN common_loc_mast ON wms_loc_detl.loc_no = common_loc_mast.loc_no and wms_loc_detl.host_id = common_loc_mast.host_id
- where 1=1
- <include refid="viewStayTimeConditionSql"></include>
-</select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
deleted file mode 100644
index 5e24305..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
+++ /dev/null
@@ -1,58 +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.common.wms.mapper.ReportQueryMapper">
-
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewWorkInConditionSql">
- <if test="viewWorkIn.locNo!=null and viewWorkIn.locNo!='' ">
- and loc_no like '%' + #{viewWorkIn.locNo} + '%'
- </if>
- <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
- and matnr like '%' + #{viewWorkIn.matnr} + '%'
- </if>
- <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
- and (maktx like '%' + #{viewWorkIn.maktx} + '%'
- or matnr like '%' + #{viewWorkIn.maktx} + '%'
- or lgnum like '%' + #{viewWorkIn.maktx} + '%'
- or tbnum like '%' + #{viewWorkIn.maktx} + '%'
- or tbpos like '%' + #{viewWorkIn.maktx} + '%'
- or zmatid like '%' + #{viewWorkIn.maktx} + '%'
- or maktx like '%' + #{viewWorkIn.maktx} + '%'
- or werks like '%' + #{viewWorkIn.maktx} + '%'
- or anfme like '%' + #{viewWorkIn.maktx} + '%'
- or altme like '%' + #{viewWorkIn.maktx} + '%'
- or zpallet like '%' + #{viewWorkIn.maktx} + '%'
- or bname like '%' + #{viewWorkIn.maktx} + '%'
- )
- </if>
- <if test="viewWorkIn.beginDate!=null and viewWorkIn.beginDate!='' ">
- <![CDATA[
- and io_time >= #{viewWorkIn.beginDate}
- ]]>
- </if>
- <if test="viewWorkIn.endDate!=null and viewWorkIn.endDate!='' ">
- <![CDATA[
- and io_time <= #{viewWorkIn.endDate}
- ]]>
- </if>
-</sql>
-
-<!-- 鍏ュ簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkInList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
- select * from asr_wrkin_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
-
-<!-- 鍑哄簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkOutList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
- select *
- from asr_wrkout_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WaitPakinLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WaitPakinLogMapper.xml
deleted file mode 100644
index 4addd1e..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WaitPakinLogMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.WaitPakinLogMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WaitPakinMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WaitPakinMapper.xml
deleted file mode 100644
index 453f9d8..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WaitPakinMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.WaitPakinMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlLogMapper.xml
deleted file mode 100644
index 4eb991b..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlLogMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.WrkDetlLogMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml
deleted file mode 100644
index 1be1642..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WrkDetlMapper.xml
+++ /dev/null
@@ -1,99 +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.common.wms.mapper.WrkDetlMapper">
-
- <sql id="batchSeq">
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- </sql>
-
- <select id="selectAndLogByOrderNoGroupByMatnrOfSum" resultType="com.zy.asrs.common.wms.entity.WrkDetl">
- select awd.wrk_no, awd.io_time, awd.matnr, sum(awd.anfme) as anfme
- from wms_wrk_detl awd
- left join wms_wrk_mast awm on awd.wrk_mast_id = awm.id and awd.host_id = awm.host_id
- where order_no = #{orderNo}
- group by awd.wrk_no, awd.io_time, awd.matnr
- union
- select distinct awdl.wrk_no, awdl.io_time, awdl.matnr, sum(awdl.anfme) as anfme
- from wms_wrk_detl_log awdl
- left join wms_wrk_mast_log awml on awdl.wrk_mast_id = awml.id and awdl.host_id = awml.host_id
- where awdl.order_no = #{orderNo}
- and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
- group by awdl.wrk_no, awdl.io_time, awdl.matnr
- </select>
-
- <update id="updateOrderNo">
- update wms_wrk_detl
- set order_no = #{orderNo}
- , modi_time = getdate()
- where 1=1
- and wrk_no = #{wrkNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </update>
-
- <select id="selectAndLogByOrderNo" resultType="com.zy.asrs.common.wms.entity.WrkDetl">
- select wd.*
- from wms_wrk_detl wd
- left join wms_wrk_mast wm on wd.wrk_mast_id = wm.id and wd.host_id = wm.host_id
- where order_no = #{orderNo}
- and wd.host_id = #{hostId}
- union
- select distinct wdl.*
- from wms_wrk_detl_log wdl
- left join wms_wrk_mast_log wml on wdl.wrk_mast_id = wml.id and wdl.host_id = wml.host_id
- where wdl.order_no = #{orderNo}
- and wdl.host_id = #{hostId}
- and (wml.manu_type is null or wml.manu_type != '鎵嬪姩鍙栨秷')
- </select>
-
- <select id="selectPakoutQuery" resultType="com.zy.asrs.common.wms.entity.WrkDetl">
- select
- awd.*
- from wms_wrk_detl awd
- left join asr_wrk_mast awm on awd.wrk_mast_id = awm.id and awd.host_id = awm.host_id
- where 1=1
- and awm.wrk_sts = 199
- and (awd.inspect is null or awd.inspect = 0)
- and awm.sta_no = #{staNo}
- and awd.matnr + '-' + awd.batch = #{matnr}
- </select>
-
- <update id="updateInspect">
- update wms_wrk_detl
- set inspect = 1
- where 1=1
- and wrk_no = #{wrkNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </update>
-
- <delete id="deleteItem">
- delete from wms_wrk_detl
- where 1=1
- and wrk_no = #{wrkNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </delete>
-
- <update id="updateAnfme">
- update wms_wrk_detl
- set anfme = #{anfme}
- , modi_time = getdate()
- where 1=1
- and wrk_no = #{wrkNo}
- and matnr = #{matnr}
- and host_id = #{hostId}
- <include refid="batchSeq"></include>
- </update>
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WrkLastnoMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WrkLastnoMapper.xml
deleted file mode 100644
index adf8988..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WrkLastnoMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.WrkLastnoMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WrkMastLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WrkMastLogMapper.xml
deleted file mode 100644
index 42c5188..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WrkMastLogMapper.xml
+++ /dev/null
@@ -1,5 +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.common.wms.mapper.WrkMastLogMapper">
-
-</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/WrkMastMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/WrkMastMapper.xml
deleted file mode 100644
index be000f9..0000000
--- a/zy-asrs-common/src/main/resources/mapper/wms/WrkMastMapper.xml
+++ /dev/null
@@ -1,58 +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.common.wms.mapper.WrkMastMapper">
-
- <select id="selectToBeCompleteData" resultType="com.zy.asrs.common.wms.entity.WrkMast">
- select * from wms_wrk_mast where ((wrk_sts = 99 Or wrk_sts = 199 ) and io_type != 103 and io_type != 104 and io_type != 107 ) order by io_time,wrk_no
- </select>
-
- <select id="selectToBeHistoryData" resultType="com.zy.asrs.common.wms.entity.WrkMast">
- select * from wms_wrk_mast
- where wrk_sts=100
- or (wrk_sts=200 and ove_mk='Y' and wrk_no not in (select wrk_no from common_bas_devp where common_bas_devp.host_id = wms_wrk_mast.host_id))
- or (wrk_sts=200 and dateadd(mi,15,io_time) <= getdate() and wrk_no not in (select wrk_no from common_bas_devp where common_bas_devp.host_id = wms_wrk_mast.host_id))
- or (wrk_sts=200 and io_time is null and wrk_no not in (select wrk_no from common_bas_devp where common_bas_devp.host_id = wms_wrk_mast.host_id))
- order by io_time,wrk_no asc
- </select>
-
- <select id="selectSameLevMatnrs" resultType="com.zy.asrs.common.wms.entity.WrkMast">
- select m.loc_no
- from wms_wrk_mast m,
- wms_wrk_detl d,
- common_loc_mast lm
- where m.id = d.wrk_mast_id
- and m.loc_no = lm.loc_no
- and m.host_id = lm.host_id
- and io_type = 1
- and wrk_sts < 99
- and d.matnr = #{matnr}
- <if test="batch != null and batch != ''">
- and d.batch = #{batch}
- </if>
- <if test="hostId != null">
- and lm.host_id = #{hostId}
- </if>
- <if test="locRangeDto != null">
- <if test="locRangeDto.startRow">
- and lm.row1 >= #{locRangeDto.startRow}
- </if>
- <if test="locRangeDto.targetRow">
- and lm.row1 <= #{locRangeDto.targetRow}
- </if>
- <if test="locRangeDto.startBay">
- and lm.bay1 >= #{locRangeDto.startBay}
- </if>
- <if test="locRangeDto.targetBay">
- and lm.bay1 <= #{locRangeDto.targetBay}
- </if>
- <if test="locRangeDto.startLev">
- and lm.lev1 >= #{locRangeDto.startLev}
- </if>
- <if test="locRangeDto.targetLev">
- and lm.lev1 <= #{locRangeDto.targetLev}
- </if>
- </if>
- ORDER BY m.wrk_no desc;
- </select>
-
-</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
index 797a9af..4d6aeb1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java
@@ -8,5 +8,4 @@
public interface TaskService extends IService<Task> {
List<Task> getByOrderDetlId(Long orderDetlId);
-
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
index db20756..9b024e8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/TaskServiceImpl.java
@@ -1,7 +1,6 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wms.asrs.entity.TaskDetl;
import com.zy.asrs.wms.asrs.mapper.TaskMapper;
import com.zy.asrs.wms.asrs.entity.Task;
import com.zy.asrs.wms.asrs.service.TaskDetlService;
@@ -11,7 +10,6 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
@Service("taskService")
@@ -29,4 +27,5 @@
}
return tasks;
}
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
new file mode 100644
index 0000000..770ff8c
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
@@ -0,0 +1,128 @@
+package com.zy.asrs.wms.asrs.timer;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
+import com.zy.asrs.wms.asrs.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class TaskTimer {
+
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private TaskDetlService taskDetlService;
+ @Autowired
+ private TaskDetlFieldService taskDetlFieldService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocDetlFieldService locDetlFieldService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ @Transactional
+ public void inExecute() {
+ InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
+ try {
+ //鑾峰彇鍏ュ簱瀹屾垚浠诲姟
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 99));
+ if (list.isEmpty()) {
+ return;
+ }
+
+ for (Task task : list) {
+ //鍚屾鏁版嵁
+ Long hostId = task.getHostId();
+ switch (task.getTaskType().intValue()) {
+ case 1://鍏ュ簱
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
+ if(loc == null) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦�");
+ }
+
+ if(loc.getLocStsId() != LocStsType.S.val()){
+ throw new CoolException("搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害");
+ }
+
+ loc.setLocStsId(LocStsType.F.val());
+ loc.setUpdateTime(new Date());
+ loc.setBarcode(task.getBarcode());
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐�");
+ }
+
+
+ List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(task.getId());
+ if(taskDetls.isEmpty()) {
+ throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
+ }
+
+ //娣诲姞搴撳瓨鏄庣粏
+ for (TaskDetl taskDetl : taskDetls) {
+ LocDetl locDetl = new LocDetl();
+ locDetl.setLocId(loc.getId());
+ locDetl.setLocNo(loc.getLocNo());
+ locDetl.setMatId(taskDetl.getMatId());
+ locDetl.setMatnr(taskDetl.getMat$().getMatnr());
+ locDetl.setOrderNo(taskDetl.getOrderNo());
+ locDetl.setBatch(taskDetl.getBatch());
+ locDetl.setAnfme(taskDetl.getAnfme());
+ locDetl.setHostId(hostId);
+ if (!locDetlService.save(locDetl)) {
+ throw new CoolException("鎻掑叆搴撳瓨鏄庣粏澶辫触");
+ }
+
+ //娣诲姞搴撳瓨鏄庣粏鎵╁睍瀛楁
+ List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
+ for (TaskDetlField detlField : detlFields) {
+ LocDetlField locDetlField = new LocDetlField();
+ locDetlField.setDetlId(locDetl.getId());
+ locDetlField.setFieldId(detlField.getFieldId());
+ locDetlField.setName(detlField.getName());
+ locDetlField.setHostId(hostId);
+ if (!locDetlFieldService.save(locDetlField)) {
+ throw new CoolException("鎻掑叆鏄庣粏鎵╁睍瀛楁澶辫触");
+ }
+ }
+ }
+
+ //鍒犻櫎缁勬墭閫氱煡妗�
+ waitPakinService.remove(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
+
+ break;
+ }
+
+ task.setTaskSts(100L);//100.搴撳瓨鏇存柊瀹屾垚
+ task.setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("搴撳瓨鏇存柊澶辫触");
+ }
+ }
+ } catch (Exception e) {
+
+ }finally {
+ InterceptorIgnoreHelper.clearIgnoreStrategy();
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ @Transactional
+ public void outExecute() {
+
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
index 652e886..7f50413 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/config/MybatisPlusConfig.java
@@ -50,6 +50,10 @@
"sys_user_role",
"sys_role_menu",
"sys_language",
+ "man_loc_sts",
+ "man_task_sts",
+ "man_task_type",
+ "man_order_settle",
"view_man_loc_detl_field"
).contains(tableName);
}
--
Gitblit v1.9.1