From 16df414db25bf21058077e37ad3bc28bba1cbb10 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 08 八月 2021 15:52:43 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 84 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 78 insertions(+), 6 deletions(-)
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 b1100d0..fd7b482 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -1,16 +1,22 @@
package zy.cloud.wms.manager.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import zy.cloud.wms.common.model.BillDto;
+import zy.cloud.wms.common.service.erp.ErpR;
+import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
@@ -23,6 +29,7 @@
/**
* Created by vincent on 2021/2/25
*/
+@Slf4j
@RestController
@RequestMapping("/work")
public class WorkController extends BaseController {
@@ -37,11 +44,20 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private OrderService orderService;
+ @Autowired
+ private ErpService erpService;
+
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
public R stockPakin(@RequestBody PakinParam number) {
return workService.stockPakin(number, getUserId());
+ }
+
+ @RequestMapping("/stock/pakout")
+ @ManagerAuth(memo = "鍑哄簱")
+ public R stockPakout(@RequestBody PakoutParam number) {
+ return workService.stockPakout(number, getUserId());
}
@RequestMapping("/stock/in")
@@ -83,7 +99,7 @@
@RequestMapping("/pakout/get")
@ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
public R getPakout(@RequestParam String docNumber) {
- List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1,2));
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1, 2));
if (Cools.isEmpty(pakouts)) {
return R.parse(BaseRes.EMPTY);
}
@@ -95,8 +111,8 @@
return R.ok().add(Cools
.add("number", pakouts.get(0).getDocNum())
.add("wrkSts", pakouts.get(0).getWrkSts())
- .add("wrkSts$", wrkSts==null?"鏈煡":wrkSts.getStsName())
- .add("custName", Cools.isEmpty(pakouts.get(0).getCustName())?"-":pakouts.get(0).getCustName())
+ .add("wrkSts$", wrkSts == null ? "鏈煡" : wrkSts.getStsName())
+ .add("custName", Cools.isEmpty(pakouts.get(0).getCustName()) ? "-" : pakouts.get(0).getCustName())
.add("pakouts", pakouts)
);
}
@@ -115,7 +131,7 @@
@RequestMapping("/hand/control/pakout")
@ManagerAuth(memo = "鎵嬪姩澶勭悊鎷ｈ揣鍗�")
- public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
+ public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type) {
if (type == 1) {
return workService.completePakout(wrkNo, getUserId());
} else if (type == 2) {
@@ -136,7 +152,7 @@
}
@RequestMapping("/order/init")
- @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+ @ManagerAuth(memo = "鐢熸垚璁㈠崟")
public R initOrder(@RequestBody InitOrderParam param) {
return workService.initOrder(param, getUserId());
}
@@ -144,7 +160,13 @@
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockTransfer(@RequestBody AsrsTransferParam number) {
- return R.error();
+ return workService.asrsStockTransfer(number, getUserId());
+ }
+
+ @RequestMapping("/stock/transfer/locMode")
+ @ManagerAuth(memo = "搴撳瓨璋冩嫧-绔嬪簱妯″紡")
+ public R stockTransferLocMode(@RequestBody AsrsTransferParam number) {
+ return workService.asrsStockTransferLocMode(number, getUserId());
}
@RequestMapping("/stock/check")
@@ -159,6 +181,55 @@
return workService.stockCheckAuditing(checkId, getUserId());
}
+ @RequestMapping("/stock/checks/auditing")
+ @ManagerAuth(memo = "鐩樼偣璁板綍鎵归噺瀹℃牳")
+ public R checksAuditing(@RequestParam(value = "checkIds[]") Long[] checkIds) {
+ int success = 0;
+ for (Long checkId : checkIds) {
+ R r = workService.stockCheckAuditing(checkId, getUserId());
+ if (String.valueOf(r.get("code")).equals("200")) {
+ success++;
+ }
+ }
+ return R.ok("瀹℃牳鎴愬姛鏁伴噺锛�" + success);
+ }
+
+ // 鐩樼偣涓婁紶
+ @RequestMapping("/check/upload")
+ @ManagerAuth(memo = "鐩樼偣涓婁紶")
+ public R checkUpload(@RequestBody CheckUploadParam params) {
+ List<BillDto> dtos = new ArrayList<>();
+ if (params.getMats().size() > 0) {
+ for (Mat matList : params.getMats()) {
+ BillDto dto = new BillDto();
+ dto.setMatnr(matList.getMatnr());
+ dto.setQty(matList.getCount().doubleValue());
+ dtos.add(dto);
+ }
+ } else {
+ throw new CoolException("鏁版嵁寮傚父");
+ }
+ int docId;
+ String docNum;
+ if (params.getType().equals("1")) { // 鐩樼泩
+ docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 14; // 鎶ユ孩鍗�
+ } else if (params.getType().equals("2")) { // 鐩樹簭
+ docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 9; // 鎶ユ崯鍗�
+ } else {
+ throw new CoolException("鏁版嵁寮傚父");
+ }
+ // erp涓婁紶鐩樼泩鐩樹簭
+ ErpR erpR = erpService.uploadBill(dtos, docId, docNum);
+ if (!erpR.getSuccess()) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg());
+ }
+ String dotsStr = JSON.toJSONString(dtos);
+ log.info("鐩樼偣涓婁紶锛岀被鍨嬶細" + (docId == 14 ? "鐩樼泩" : "鐩樹簭") + "锛屽崟鍙凤細" + docNum + "锛屼笂浼犵墿鏂欐竻鍗�:" + dotsStr);
+ log.info("===============================================================================================");
+ return R.ok().add("涓婃姤鑷砮rp鎴愬姛");
+ }
/******************************************************************************************************/
@@ -207,6 +278,7 @@
List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
return R.ok().add(items);
}
+
// 鑾峰彇鎵�鏈夐」鐩�
@RequestMapping("/item/all/get/kv")
@ManagerAuth
--
Gitblit v1.9.1