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/webapp/views/pda/stockOut.html | 36 ++++++++++++++++++------------------
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 22 +++++++++++++++++++++-
2 files changed, 39 insertions(+), 19 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)
+ );
}
}
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 18efddc..514b95c 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -35,7 +35,12 @@
.status-3 {
color: green;
}
-
+ /* 瀹㈡埛 */
+ #custName {
+ padding-left: 2px;
+ line-height: 30px;
+ font-size: 14px;
+ }
/* 涓讳綋 */
main {
border: 1px solid gainsboro;
@@ -78,16 +83,6 @@
<!-- 涓讳綋 -->
<main id="pakout-box">
-<!-- <hr>-->
-<!-- <div class="pakout-item">-->
-<!-- <div class="item-header">-->
-<!-- 鍏閽诲熬铻轰笣4.8*-->
-<!-- </div>-->
-<!-- <div class="item-content">-->
-<!-- <div style="float: left">10绠�</div>-->
-<!-- <div style="float: right">璐т綅锛欰01-1</div>-->
-<!-- </div>-->
-<!-- </div>-->
</main>
<!-- 灏鹃儴 -->
@@ -118,22 +113,27 @@
method: 'POST',
success: function (res) {
if (res.code === 200) {
- if (res.data != null && res.data.length > 0) {
- pakoutData = res.data;
+ if (res.data != null) {
+ pakoutData = res.data.pakouts;
if (pakoutData != null) {
+ // 澶�
+ $('#status').html(res.data.wrkSts$);
+ $('#status').attr("class", "layui-form-label status-" + res.data.wrkSts);
+ $('#custName').html(res.data.custName);
+ // 涓�
var tpl = $("#pakoutDetlTpl").html();
var template = Handlebars.compile(tpl);
- var html = template(pakoutData);
+ var html = template(res.data);
$('#pakout-box').append(html);
}
- console.log(res.data)
$('#confirm').focus();
}
+ } else if (res.code === 201) {
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
- locDetlData = [];
- tableIns.reload({data: locDetlData});
+ pakoutData = [];
+ tips(res.msg, true);
}
}
})
@@ -218,7 +218,7 @@
}
</script>
<script type="text/template" id="pakoutDetlTpl">
- {{#each data}}
+ {{#each pakouts}}
<hr>
<div class="pakout-item">
<div class="item-header">
--
Gitblit v1.9.1