From f4d4d3084e30f0752e4723b795712dd271a8d640 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 三月 2021 13:14:11 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 a5eae33..8ee9867 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -2,6 +2,8 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,10 +12,12 @@
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
+import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
+import zy.cloud.wms.manager.service.WrkStsService;
import java.util.List;
@@ -28,6 +32,8 @@
private WorkService workService;
@Autowired
private PakoutService pakoutService;
+ @Autowired
+ private WrkStsService wrkStsService;
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -57,7 +63,21 @@
@ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
public R getPakout(@RequestParam String docNumber) {
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
- return R.ok().add(pakouts);
+ if (Cools.isEmpty(pakouts)) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ Long sts = pakouts.get(0).getWrkSts();
+ if (sts == 1) {
+ sts =2L;
+ }
+ WrkSts wrkSts = wrkStsService.selectById(sts);
+ 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("pakouts", pakouts)
+ );
}
}
--
Gitblit v1.9.1