From 1eafa8ae1794e2aa74c3714aa84aa609fa00d508 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 一月 2022 15:52:41 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/CstmrController.java | 25 +++++
src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java | 2
src/main/webapp/views/pda/pakout.html | 40 +++++++
src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java | 7 +
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/webapp/views/index.html | 2
src/main/webapp/views/pda/selectCstmr.html | 191 ++++++++++++++++++++++++++++++++++++++
src/main/java/zy/cloud/wms/common/utils/VersionUtils.java | 2
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 2
src/main/webapp/views/login.html | 2
src/main/webapp/static/js/pakout/pakout.js | 4
11 files changed, 269 insertions(+), 10 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
index efad1c9..e5a8e55 100644
--- a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
+++ b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
@@ -73,7 +73,7 @@
pakout.setBatch(mat.getBatch());
pakout.setUnit(mat.getUnit());
pakout.setBarcode(mat.getBarcode());
- pakout.setCustName(mat.getCustName());
+// pakout.setCustName(mat.getCustName());
pakout.setItemNum(mat.getItemNum());
pakout.setCount(mat.getCount());
pakout.setPrice(mat.getPrice());
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
index 44e6716..761c509 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Cstmr;
+import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.service.CstmrService;
import java.util.*;
@@ -24,6 +25,30 @@
@Autowired
private CstmrService cstmrService;
+ @RequestMapping(value = "/cstmr/list/pda/auth")
+ @ManagerAuth
+ public R pdaList(@RequestParam(required = false)Long cstmrId){
+ EntityWrapper<Cstmr> wrapper = new EntityWrapper<>();
+// wrapper.eq("id", cstmrId);
+ wrapper.orderBy("create_time", false);
+ hostEq(wrapper);
+ List<Cstmr> cstmrs = cstmrService.selectList(wrapper);
+ return R.ok().add(cstmrs);
+ }
+
+ @RequestMapping(value = "/cstmr/search/pda/auth")
+ @ManagerAuth
+ public R pdaSearch(@RequestParam(required = false)String condition){
+ EntityWrapper<Cstmr> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like("name", condition);
+ }
+ wrapper.orderBy("create_time", false);
+ hostEq(wrapper);
+ List<Cstmr> cstmrs = cstmrService.selectList(wrapper);
+ return R.ok().add(cstmrs);
+ }
+
@RequestMapping(value = "/cstmr/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java b/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java
index bc5a5fa..87bfabf 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java
@@ -21,6 +21,8 @@
import zy.cloud.wms.manager.service.CstmrService;
import zy.cloud.wms.manager.service.OrderDetlService;
import zy.cloud.wms.manager.service.OrderService;
+import zy.cloud.wms.system.entity.Host;
+import zy.cloud.wms.system.service.HostService;
import java.util.*;
@@ -37,6 +39,8 @@
private OrderDetlService orderDetlService;
@Autowired
private CstmrService cstmrService;
+ @Autowired
+ private HostService hostService;
@RequestMapping(value = "/delivery/head/page/auth")
@ManagerAuth
@@ -77,6 +81,7 @@
}
Date now = new Date();
+ Host host = hostService.selectById(getHostId());
// 杩斿洖瑙嗗浘瀵硅薄
List<Map<String, Object>> vos = new ArrayList<>();
length = Optional.ofNullable(length).orElse(10);
@@ -94,7 +99,7 @@
vo.setCstmrContacts(cstmr.getContacts());
vo.setCstmrAddr(cstmr.getAddr());
}
- vo.setCompany("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
+ vo.setCompany(host.getMemo());
vo.setOrderId(orderId);
vo.setOrderNo(order.getOrderNo());
vo.setTime(DateUtils.convert(now, DateUtils.yyyyMMdd_F));
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java
index 2c1f60f..70de930 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java
@@ -17,4 +17,6 @@
private Double count;
+ private String cstmr;
+
}
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 04e01b6..84194f1 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
@@ -167,7 +167,7 @@
null, // SKC
null, // 鍗曟嵁绫诲瀷
null, // 鍗曟嵁缂栧彿
- null, // 瀹㈡埛鍚嶇О
+ param.getCstmr(), // 瀹㈡埛鍚嶇О
null, // 鍝侀」鏁�
null, // 鏁伴噺
null, // 閲嶉噺
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 530a05b..dee703c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -158,7 +158,7 @@
select * from man_loc_detl mld left join man_node mn on mld.node_id = mn.id
where 1=1
and mn.uuid = #{uuid}
- and mld.hostId = #{hostId}
+ and mld.host_id = #{hostId}
and mld.status = 1
order by mld.create_time
</select>
diff --git a/src/main/webapp/static/js/pakout/pakout.js b/src/main/webapp/static/js/pakout/pakout.js
index 0e07249..13f8b1a 100644
--- a/src/main/webapp/static/js/pakout/pakout.js
+++ b/src/main/webapp/static/js/pakout/pakout.js
@@ -32,10 +32,10 @@
,{field: 'model', align: 'center',title: '鍨嬪彿', hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'barcode', align: 'center',title: 'SKC', hide: false}
+ ,{field: 'barcode', align: 'center',title: 'SKC', hide: true}
,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: true}
+ ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'count', align: 'center',title: '鏁伴噺', hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index d4cd5d9..9eeff36 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -79,7 +79,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2021 娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙� all rights reserved.
+ copyright 漏 2021 缁嶅叴瀛氭儬绉戞妧鏈夐檺鍏徃 all rights reserved.
<span class="pull-right">Version 1.0.0</span>
</div>
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 36fb6ab..15f9642 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -164,7 +164,7 @@
</form>
</div>
</div>
- <div class="loginbm">鎶�鏈敮鎸侊細 娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙� CopyRight@ 2021 </div>
+ <div class="loginbm">鎶�鏈敮鎸侊細 缁嶅叴瀛氭儬绉戞妧鏈夐檺鍏徃 CopyRight@ 2021 </div>
</div>
<!--鍒濆鍖栧姞杞藉眰-->
diff --git a/src/main/webapp/views/pda/pakout.html b/src/main/webapp/views/pda/pakout.html
index 570aacf..ee8966d 100644
--- a/src/main/webapp/views/pda/pakout.html
+++ b/src/main/webapp/views/pda/pakout.html
@@ -17,6 +17,14 @@
height: 40px;
}
+ #selectBtn {
+ float: right;
+ vertical-align: middle;
+ padding: 1px 3px;
+ height: 26px;
+ }
+
+
.number-tool {
margin-left: 10px;
padding: 1px 0 1px 5px;
@@ -104,6 +112,12 @@
<span>鍚嶇О</span>
<input id="maktx" type="text" disabled="disabled" style="width: 70%">
</div>
+ <div class="form-item">
+ <span>瀹㈡埛</span>
+ <input id="cstmr" type="text" disabled="disabled" style="width: 60%">
+ <input id="cstmrId" type="hidden">
+ <button id="selectBtn">閫�</button>
+ </div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
@@ -150,7 +164,7 @@
offset: '20px',
title: '鐩存帴鍑哄簱',
shadeClose: true,
- area: ['80%', '200px'],
+ area: ['80%', '240px'],
content: $("#pakout"),
success: function (layero, index) {
$('#matnr').val(data.matnr);
@@ -251,6 +265,25 @@
}
}
+ function findBySelect(val, cstmrId) {
+ $("#cstmr").val(val);
+ $("#cstmrId").val(cstmrId);
+ layer.close(cstmrSelectIdx);
+ }
+
+ var cstmrSelectIdx;
+ $(document).on('click','#selectBtn', function () {
+ cstmrSelectIdx = layer.open({
+ type: 2,
+ title: false,
+ area: ['80%', '58%'],
+ content: 'selectCstmr.html',
+ success: function(layero, index){
+ $('.layui-layer-setwin .layui-layer-close2').hide();
+ }
+ });
+ })
+
/************************************* 寮圭獥 ****************************************/
var countDom = $('#count');
@@ -273,6 +306,7 @@
function yes(){
var matnr = $('#matnr').val();
var count = $('#count').val();
+ var cstmr = $('#cstmr').val();
for (var j=0;j<locDetlData.length;j++){
if (matnr === locDetlData[j].matnr) {
if (count <= minCount) {
@@ -293,13 +327,15 @@
data: JSON.stringify({
nodeUuid: nodeUuid,
matnr: matnr,
- count: count
+ count: count,
+ cstmr: cstmr
}),
contentType:'application/json;charset=UTF-8',
async: false,
method: 'POST',
success: function (res) {
layer.close(anfmeLayer);
+ $('#cstmr').val('');
if (res.code === 200) {
tips("鍑哄簱鎴愬姛");
findLoc(document.getElementById("locNo"));
diff --git a/src/main/webapp/views/pda/selectCstmr.html b/src/main/webapp/views/pda/selectCstmr.html
new file mode 100644
index 0000000..bf0a8f9
--- /dev/null
+++ b/src/main/webapp/views/pda/selectCstmr.html
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
+ <title>鍟嗗搧閫夋嫨</title>
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/layui/layer_mobile/layer.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+ <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+ <style>
+ html {
+ height: 100%;
+ }
+ body {
+ height: 100%;
+ background-color: #f1f1f1;
+ padding: 5px;
+ position: relative;
+ }
+
+ /*header {*/
+ /* position: absolute;*/
+ /*}*/
+ main {
+ padding-bottom: 5px;
+ }
+
+ /* 澶撮儴鎼滅储鏍� */
+ .search-box {
+ height: 36px;
+ padding: 3px 15px;
+ }
+ .search-box input {
+ border: none;
+ border-radius: 20px;
+ height: 30px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ width: 73%;
+ padding-left: 15px;
+ vertical-align: middle;
+ }
+ .search-box button {
+ border: none;
+ background-color: white;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ height: 33px;
+ margin-left: 5px;
+ border-radius: 20px;
+ width: 15%;
+ vertical-align: middle;
+ }
+ .search-box button:hover {
+ background-color: #dedede;
+ }
+
+ /* 涓讳綋 */
+
+ /* 褰掔被鏍囩 */
+ .box-cstmr-item {
+ height: 100px;
+ border-bottom: 1px solid #dedede;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ margin-top: 2px;
+ }
+ .box-cstmr-item:hover {
+ background-color: #eaeaea;
+ }
+ .box-cstmr-item-label {
+ padding: 5px 10px;
+ border-bottom: 1px solid #f6f6f6;
+ }
+ .box-cstmr-item-content {
+ font-size: x-large;
+ font-weight: bold;
+ padding: 15px 0 0 20px;
+ }
+</style>
+</head>
+<body>
+
+<header>
+ <div class="search-box">
+ <input id="search-msg" type="text" placeholder="璇疯緭鍏ュ鎴峰悕绉�">
+ <button onclick="search()">
+ <i class="layui-icon"></i>
+ </button>
+ </div>
+</header>
+
+<main id="main-contain">
+</main>
+
+</body>
+<script>
+ $(function () {
+ showCstmr();
+ })
+
+ // 鎼滅储
+ function search(){
+ var condition = $('#search-msg').val();
+ $.ajax({
+ url: baseUrl + "/cstmr/search/pda/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: condition
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null && res.data.length > 0) {
+ var tplDom = $("#matTpl");
+ var tpl = tplDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#main-contain').html(html);
+ } else {
+ $('#main-contain').html('<div style="text-align: center; margin-top: 15px"><span style="font-size: large">鏆傛棤鍟嗗搧</span></div>');
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ parent.layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+
+ // 褰掔被鐐瑰嚮
+ $(document).on('click','.box-cstmr-item', function () {
+ var cstmrId = $(this).children('input').get(0).value;
+ var cstmrName = $(this).children('.box-cstmr-item-content').get(0).innerHTML;
+ parent.findBySelect(cstmrName,cstmrId)
+ })
+
+ // 灞曠ず褰掔被
+ function showCstmr(){
+ $.ajax({
+ url: baseUrl + "/cstmr/list/pda/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null && res.data.length > 0) {
+ var tplDom = $("#cstmrTpl");
+ var tpl = tplDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#main-contain').html(html);
+ toTop();
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ parent.layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+
+
+ function toTop() {
+ window.scrollTo({
+ left: 0,
+ top: 0,
+ behavior: 'smooth'
+ })
+ }
+
+
+</script>
+<script type="text/template" id="cstmrTpl">
+ {{#each data}}
+ <div class="box-cstmr-item">
+ <input name="cstmrId" type="hidden" value="{{this.id}}">
+ <div class="box-cstmr-item-label">
+ <span class="layui-badge layui-badge-green pull-right">瀹㈡埛</span>
+ </div>
+ <div class="box-cstmr-item-content">{{this.name}}</div>
+ </div>
+ {{/each}}
+</script>
+</html>
--
Gitblit v1.9.1