From eb13b96cc3b01a3d44fbce6a730004e158418ab5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 14:06:58 +0800
Subject: [PATCH] #
---
/dev/null | 28 ---------
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 6 -
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 2
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 67 +---------------------
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 4 -
src/main/resources/application.yml | 5 -
src/main/java/zy/cloud/wms/common/service/MainService.java | 59 -------------------
7 files changed, 10 insertions(+), 161 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index a2007e9..3791840 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -7,15 +7,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import zy.cloud.wms.common.config.CodeCoolException;
import zy.cloud.wms.common.model.OrderStoDto;
-import zy.cloud.wms.common.service.asrs.AsrsService;
-import zy.cloud.wms.common.service.asrs.entity.Result;
-import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
-import zy.cloud.wms.manager.entity.param.StockTransferParam;
-import zy.cloud.wms.manager.entity.result.PakoutVo;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
@@ -40,8 +34,6 @@
private CustOrderService custOrderService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private AsrsService asrsService;
@Transactional
public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
@@ -50,17 +42,7 @@
}
List<StoPreTab> res = new ArrayList<>();
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
- if (!Cools.isEmpty(transferParams)) {
- // 鏌ョ湅绔嬪簱搴撳瓨
- Result result = asrsService.stockTransferPrew(transferParams);
- if (result.getCode() == 500) {
- throw new CodeCoolException("20001-" + String.valueOf(result.getMsg()));
- }
- if (result.getCode() == 200) {
- res = (List<StoPreTab>) result.getData();
- }
- }
+ locDetlService.checkLocDetlCount(dto.getNumber());
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
@@ -115,44 +97,7 @@
/******************************* 绔嬪簱鎷ｈ揣鍗� ********************************/
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
- if (!Cools.isEmpty(transferParams)) {
- // 鏌ョ湅绔嬪簱搴撳瓨
- Result1 result = asrsService.stockTransfer(transferParams);
- if (result.getCode() == 500) {
- if (Cools.isEmpty(result.getData())) {
- throw new CoolException(result.getMsg());
- } else {
- throw new CodeCoolException("20001-" + result.getData());
- }
- }
- if (result.getCode() == 200) {
- for (PakoutVo vo : result.getData()) {
- // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
- Mat mat = matService.selectByMatnr(vo.getMatnr());
- if (null == mat) {
- throw new CoolException(vo.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + dto.getNumber() +"鍗曟嵁鍥犳涓柇锛�");
- }
- Pakout pakout = new Pakout();
- pakout.setWrkSts(1L);
- pakout.setAnfme(vo.getAnfme());
- pakout.setZpallet(vo.getZpallet());
- pakout.setLocNo(vo.getLocNo());
- pakout.setNodeId(-1L);
- pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
- VersionUtils.setPakout(pakout, mat);
- pakout.setDocId(getDocId(dto.getNumber())); // 鍗曟嵁绫诲瀷
- pakout.setDocNum(dto.getNumber()); // 鍗曟嵁缂栧彿
- pakout.setCreateTime(now);
- pakout.setUpdateTime(now);
- pakout.setStatus(1);
- if (!pakoutService.insert(pakout)) {
- throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
- }
- }
-
- }
- }
+ locDetlService.checkLocDetlCount(dto.getNumber());
/******************************* 骞充粨鎷ｈ揣鍗� ********************************/
for (CustOrder custOrder : dto.getCustOrders()) {
diff --git a/src/main/java/zy/cloud/wms/common/service/asrs/AsrsService.java b/src/main/java/zy/cloud/wms/common/service/asrs/AsrsService.java
deleted file mode 100644
index c6590d1..0000000
--- a/src/main/java/zy/cloud/wms/common/service/asrs/AsrsService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package zy.cloud.wms.common.service.asrs;
-
-import com.alibaba.fastjson.JSON;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import zy.cloud.wms.common.service.asrs.entity.Result;
-import zy.cloud.wms.common.service.asrs.entity.Result1;
-import zy.cloud.wms.manager.entity.param.StockTransferParam;
-import zy.cloud.wms.manager.utils.HttpHandler;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * Created by vincent on 2021/3/20
- */
-@Service("asrsService")
-public class AsrsService {
-
- @Value("${asrs.baseUrl}")
- private String asrsBaseUrl;
-
- public Result stockTransferPrew(List<StockTransferParam> params) {
- try {
- String response = new HttpHandler.Builder()
- .setUri(asrsBaseUrl)
- .setPath("/open/api/stockOut/prew")
- .setJson(JSON.toJSONString(params))
- .build()
- .doPost();
- return JSON.parseObject(response, Result.class);
- } catch (IOException e) {
- e.printStackTrace();
- return new Result(500, "鏈嶅姟鍣ㄥ紓甯�", null);
- }
- }
-
- public Result1 stockTransfer(List<StockTransferParam> params) {
- try {
- String response = new HttpHandler.Builder()
- .setUri(asrsBaseUrl)
- .setPath("/open/api/stockOut")
- .setJson(JSON.toJSONString(params))
- .build()
- .doPost();
- return JSON.parseObject(response, Result1.class);
- } catch (IOException e) {
- e.printStackTrace();
- return new Result1(500, "鏈嶅姟鍣ㄥ紓甯�", null);
- }
- }
-
-}
diff --git a/src/main/java/zy/cloud/wms/common/service/asrs/entity/Result.java b/src/main/java/zy/cloud/wms/common/service/asrs/entity/Result.java
deleted file mode 100644
index bb31cd6..0000000
--- a/src/main/java/zy/cloud/wms/common/service/asrs/entity/Result.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package zy.cloud.wms.common.service.asrs.entity;
-
-import lombok.Data;
-import zy.cloud.wms.manager.entity.StoPreTab;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2021/3/20
- */
-@Data
-public class Result {
-
- private Integer code;
-
- private String msg;
-
- private List<StoPreTab> data;
-
- public Result() {
- }
-
- public Result(Integer code, String msg, List<StoPreTab> data) {
- this.code = code;
- this.msg = msg;
- this.data = data;
- }
-}
diff --git a/src/main/java/zy/cloud/wms/common/service/asrs/entity/Result1.java b/src/main/java/zy/cloud/wms/common/service/asrs/entity/Result1.java
deleted file mode 100644
index cda8c58..0000000
--- a/src/main/java/zy/cloud/wms/common/service/asrs/entity/Result1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package zy.cloud.wms.common.service.asrs.entity;
-
-import lombok.Data;
-import zy.cloud.wms.manager.entity.result.PakoutVo;
-
-import java.util.List;
-
-/**
- * Created by vincent on 2021/3/20
- */
-@Data
-public class Result1 {
-
- private Integer code;
-
- private String msg;
-
- private List<PakoutVo> data;
-
- public Result1() {
- }
-
- public Result1(Integer code, String msg, List<PakoutVo> data) {
- this.code = code;
- this.msg = msg;
- this.data = data;
- }
-}
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index 2b94282..d013ee5 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -9,10 +9,8 @@
import lombok.extern.slf4j.Slf4j;
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 org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.CustOrderMapper;
@@ -30,8 +28,8 @@
* Created by vincent on 2020/11/27
*/
@Slf4j
-@Component
-@RestController
+//@Component
+//@RestController
public class ErpScheduler {
public static final String URI = "http://8.133.182.21:8080/api";
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 06f9fcf..40ab8f9 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -147,7 +147,7 @@
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockTransfer(@RequestBody AsrsTransferParam number) {
- return workService.asrsStockTransfer(number, getUserId());
+ return R.error();
}
@RequestMapping("/stock/check")
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
index a2c2d56..eb8fefd 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -29,10 +29,6 @@
R initOrder(InitOrderParam param, Long userId);
- R stockTransfer(String number, Long userId);
-
- R asrsStockTransfer(AsrsTransferParam param, Long userId);
-
R stockCheck(StoCheckParam param, Long userId);
R stockCheckAuditing(Long checkId, Long userId);
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 547e5f9..df67520 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -1,18 +1,18 @@
package zy.cloud.wms.manager.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.*;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import zy.cloud.wms.common.config.CodeCoolException;
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.model.MatnrDto;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
-import zy.cloud.wms.common.service.asrs.AsrsService;
-import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
@@ -44,8 +44,6 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private MatService matService;
- @Autowired
- private AsrsService asrsService;
@Autowired
private ErpService erpService;
@Autowired
@@ -503,63 +501,6 @@
}
}
return R.ok("鐢熸垚閿�鍞鍗�" + param.getNumber() + "鎴愬姛");
- }
-
- @Override
- @Transactional
- public R stockTransfer(String number, Long userId) {
- List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1));
- boolean asrs = false;
- List<StockTransferParam> params = new ArrayList<>();
- for (CustOrder custOrder : custOrders) {
- Double count = locDetlService.selectCountByMatnr(custOrder.getUserCode());
- if (count == null) {
- count = 0.0D;
- }
- if (count < custOrder.getQty()) {
- if (!asrs) { asrs = true; }
- StockTransferParam param = new StockTransferParam();
- param.setMatnr(custOrder.getUserCode());
- param.setAnfme(custOrder.getQty() - count);
- params.add(param);
- }
- }
- if (asrs) {
-// if (asrsService.stockTransfer(params)) {
-// for (StockTransferParam param : params) {
-// // 淇敼閿�鍞鍗曞緟鍑烘暟閲�
-// if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
-// throw new CoolException("淇敼閿�鍞鍗曞緟鍑烘暟閲忓け璐�");
-// }
-// }
-// return R.ok("搴撳瓨璋冩嫧鎴愬姛");
-// } else {
-// return R.error("绔嬪簱璋冩嫧澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- }
- return R.error("鏆備笉缂鸿揣锛屼笉闇�瑕佺珛搴撹皟鎷�");
- }
-
- @Override
- public R asrsStockTransfer(AsrsTransferParam param, Long userId) {
- if (Cools.isEmpty(param.getNode_id(), param.getMatnr(), param.getSafe_qua(), param.getAmount())) {
- return R.error("鏁伴噺閿欒");
- }
- List<StockTransferParam> params = new ArrayList<>();
- StockTransferParam transferParam = new StockTransferParam();
- transferParam.setMatnr(param.getMatnr());
- transferParam.setAnfme(Arith.subtract(2, param.getSafe_qua(), param.getAmount()));
- transferParam.setAllotNo(param.getNode_id()+ "_" +param.getMatnr());
- params.add(transferParam);
- Result1 result = asrsService.stockTransfer(params);
- if (result.getCode() == 500) {
- if (Cools.isEmpty(result.getData())) {
- throw new CoolException(result.getMsg());
- } else {
- throw new CodeCoolException("20001-" + result.getData());
- }
- }
- return R.ok("琛ヤ粨鎴愬姛锛岀瓑寰呯珛搴撹皟鎷�");
}
@Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 750fc4a..d16af2a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+ url: jdbc:sqlserver://192.168.2.250:1433;databasename=jswms
username: sa
password: sa@123
mvc:
@@ -51,6 +51,3 @@
secret: 84CHL7tF21LbU1qpaP0jn9mIAZP9bv
bucket: tjdt
endpoint: http://oss-cn-hangzhou.aliyuncs.com
-
-asrs:
- baseUrl: http://localhost:8081/htwms
--
Gitblit v1.9.1