From 816492029454f2870812aa8e4e855bc75ad1689e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 八月 2023 13:38:49 +0800
Subject: [PATCH] #对WMS开放接口-创建任务
---
/dev/null | 32 ----------
src/main/java/com/zy/asrs/controller/OpenController.java | 16 ++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 74 ++++++++++++------------
src/main/java/com/zy/asrs/service/OpenService.java | 6 +-
src/main/java/com/zy/asrs/entity/param/taskCreateParam.java | 26 ++++++++
5 files changed, 75 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 65671ac..6024d65 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,7 +5,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.WmsWrkCreateParam;
+import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -27,17 +27,17 @@
add("ea1f0459efc02a79f046f982767939ae");
}};
- //鍒涘缓WMS浠诲姟
- @PostMapping("/wmsWrkCreate")
- public R wmsWrkCreate(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) WmsWrkCreateParam param,
+ //鍒涘缓浠诲姟
+ @PostMapping("/taskCreate")
+ public R taskCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) taskCreateParam param,
HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getWmsWrkNo())) {
- return R.error("WMS浠诲姟鍙穂wmsWrkNo]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getIoType())) {
return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
@@ -45,7 +45,7 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
- openService.wmsWrkCreate(param);
+ openService.taskCreate(param);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/param/WmsWrkCreateParam.java b/src/main/java/com/zy/asrs/entity/param/WmsWrkCreateParam.java
deleted file mode 100644
index e55bd3b..0000000
--- a/src/main/java/com/zy/asrs/entity/param/WmsWrkCreateParam.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.zy.asrs.entity.param;
-
-import lombok.Data;
-
-@Data
-public class WmsWrkCreateParam {
-
- //WMS浠诲姟鍙�
- private Integer wmsWrkNo;
-
- //浠诲姟绫诲瀷
- private Integer ioType;
-
- //鐩爣搴撲綅
- private String locNo;
-
- //婧愬簱浣�
- private String sourceLocNo;
-
- //鐩爣绔�
- private Integer staNo;
-
- //婧愮珯
- private Integer sourceStaNo;
-
- //鏉＄爜
- private String barcode;
-
- //澶囨敞
- private String memo;
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/param/taskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/taskCreateParam.java
new file mode 100644
index 0000000..2cd5078
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/taskCreateParam.java
@@ -0,0 +1,26 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class taskCreateParam {
+
+ //浠诲姟鍙�
+ private String taskNo;
+
+ //浠诲姟绫诲瀷
+ private Integer ioType;
+
+ //璧风偣
+ private String startPoint;
+
+ //缁堢偣
+ private String targetPoint;
+
+ //鏉＄爜
+ private String barcode;
+
+ //澶囨敞
+ private String memo;
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 953c957..57699cc 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.param.WmsWrkCreateParam;
+import com.zy.asrs.entity.param.taskCreateParam;
public interface OpenService {
- //鍒涘缓WMS浠诲姟
- void wmsWrkCreate(WmsWrkCreateParam param);
+ //鍒涘缓浠诲姟
+ void taskCreate(taskCreateParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index bc0c5a4..6d8046a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,48 +1,50 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.entity.param.WmsWrkCreateParam;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.TaskWrkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.Date;
@Service
public class OpenServiceImpl implements OpenService {
+ @Autowired
+ private TaskWrkService taskWrkService;
+
@Override
- public void wmsWrkCreate(WmsWrkCreateParam param) {
-// WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo());
-// if (wmsWrk != null) {
-// throw new CoolException(param.getWmsWrkNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
-// }
-//
-// Date now = new Date();
-// wmsWrk = new WmsWrk();
-// wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS浠诲姟鍙�
-// wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS鐘舵�侊細鎺ユ敹
-// wmsWrk.setCreateTime(now);
-// wmsWrk.setAppeTime(now);
-// wmsWrk.setAppeUser(9527L);
-// wmsWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
-// wmsWrk.setIoPri(13D);//浼樺厛绾�
-// wmsWrk.setBarcode(param.getBarcode());//鏉＄爜
-// if (!Cools.isEmpty(param.getLocNo())) {
-// wmsWrk.setLocNo(param.getLocNo());//鐩爣搴撲綅
-// }
-// if (!Cools.isEmpty(param.getSourceLocNo())) {
-// wmsWrk.setSourceLocNo(param.getSourceLocNo());//婧愬簱浣�
-// }
-// if (!Cools.isEmpty(param.getStaNo())) {
-// wmsWrk.setStaNo(param.getStaNo());//鐩爣绔�
-// }
-// if (!Cools.isEmpty(param.getSourceStaNo())) {
-// wmsWrk.setSourceStaNo(param.getSourceStaNo());//婧愮珯
-// }
-// if (!Cools.isEmpty(param.getMemo())) {
-// wmsWrk.setMemo(param.getMemo());//澶囨敞
-// }
-//
-// if (!wmsWrkService.insert(wmsWrk)) {
-// throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
+ public void taskCreate(taskCreateParam param) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (taskWrk != null) {
+ throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+
+ Date now = new Date();
+ taskWrk = new TaskWrk();
+ taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
+ taskWrk.setIoPri(13D);//浼樺厛绾�
+ taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ }
+ if (!Cools.isEmpty(param.getTargetPoint())) {
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+ }
+ if (!Cools.isEmpty(param.getMemo())) {
+ taskWrk.setMemo(param.getMemo());//澶囨敞
+ }
+
+ if (!taskWrkService.insert(taskWrk)) {
+ throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
}
}
--
Gitblit v1.9.1