From 52c94f01b291968f331fc0d2def2f7dd885609cb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 四月 2024 09:01:20 +0800
Subject: [PATCH] #平转立
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 4
src/main/webapp/views/pda/combLToP.html | 3
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8 +
src/main/webapp/views/pda/matQuery2.html | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 273 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 46507e6..acc9872 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -21,6 +21,8 @@
// 鐢熶骇鍗曞彿
private String mnemonic;
+
+
private String billNo;
// 灏忚溅鍙栬揣鐐�
@@ -28,6 +30,8 @@
private Integer move;
+
+
public Integer getMove() {
return move;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b80fd1d..6fd4489 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -326,6 +326,13 @@
// 濡傛灉鐢熸垚鍗曞彿涓嶄负绌烘彃鍏ョ敓浜у崟鍙�
if (!Cools.isEmpty(combMat.getMnemonic())) {
waitPakin.setMnemonic(combMat.getMnemonic());
+ }else {
+ throw new CoolException("鐢熶骇鍗曞彿涓虹┖,璇疯緭鍏�");
+ }
+ if (!Cools.isEmpty(combMat.getMnemonic())) {
+ waitPakin.setSupplier(combMat.getSupplier());
+ }else {
+ throw new CoolException("閫氱煡鍗曞彿涓虹┖,璇疯緭鍏�");
}
if (!waitPakinService.insert(waitPakin)) {
@@ -336,6 +343,7 @@
locNormalEntityWrapper.eq("matnr",waitPakin.getMatnr());
locNormalEntityWrapper.eq("mnemonic",waitPakin.getMnemonic());
locNormalEntityWrapper.eq("state","1");
+ locNormalEntityWrapper.eq("supplier",waitPakin.getSupplier());
LocNormal locNormal = locNormalService.selectOne(locNormalEntityWrapper);
if (Cools.isEmpty(locNormal)){
throw new CoolException("鏈壘鍒板钩搴撶浉鍚屽簱瀛�");
diff --git a/src/main/webapp/views/pda/combLToP.html b/src/main/webapp/views/pda/combLToP.html
index b0676be..f84df57 100644
--- a/src/main/webapp/views/pda/combLToP.html
+++ b/src/main/webapp/views/pda/combLToP.html
@@ -76,6 +76,7 @@
cols: [[
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
+ {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿'},
{field: 'count', align: 'center', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
@@ -108,7 +109,7 @@
title: '鎻愬彇鐗╂枡',
shade: [0.3,'#000'],
area: ['90%', '90%'],
- content: 'matQuery.html',
+ content: 'matQuery2.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
},
diff --git a/src/main/webapp/views/pda/matQuery2.html b/src/main/webapp/views/pda/matQuery2.html
new file mode 100644
index 0000000..d87b048
--- /dev/null
+++ b/src/main/webapp/views/pda/matQuery2.html
@@ -0,0 +1,259 @@
+<!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/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>
+
+ .form-box {
+ padding: 15px 5px 5px 5px;
+ font-size: 16px;
+ text-align: center;
+ }
+
+ .form-item {
+ margin-bottom: 10px;
+ }
+
+ .form-box span {
+ font-size: 16px;
+ display: inline-block;
+ text-align: right;
+ }
+ .form-box input {
+ width: 160px;
+ padding-left: 5px;
+ height: 30px;
+ border: 1px solid #777777;
+ overflow:hidden;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ }
+ #confirm {
+ margin-top: 10px;
+ padding: 5px 20px;
+ }
+
+ .number-tool {
+ margin-left: 10px;
+ padding: 1px 0 1px 5px;
+ display: inline-block;
+ width: 120px;
+ }
+ .number-tool:after {
+ clear: both;
+ content: "";
+ display: table;
+ }
+ .number-tool button {
+ background-color: #fff;
+ margin-top: 3px;
+ font-size: 16px;
+ height: 25px;
+ float: left;
+ width: 25px;
+ border: 1px solid #777777;
+ }
+ .number-tool input {
+ text-align: center;
+ height: 30px;
+ float: left;
+ margin: 0 5px;
+ width: 40px;
+ padding: 0;
+ }
+ </style>
+</head>
+<body>
+
+<div class="form-box">
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">缂栫爜</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="4" style="width: 165px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">瑙勬牸</span>
+ </td>
+ <td style="text-align: left">
+ <input id="str2" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">鐢熶骇鍗�</span>
+ </td>
+ <td style="text-align: left">
+ <input id="mnemonic" type="text" autocomplete="off">
+ </td>
+ </tr>
+ </table>
+</div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">閫氱煡鍗�</span>
+ </td>
+ <td style="text-align: left">
+ <input id="supplier" type="text" autocomplete="off">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <!--<div class="form-item">-->
+ <!--<span>鍗曚綅</span>-->
+ <!--<input id="str1" type="text" disabled="disabled">-->
+ <!--</div>-->
+ <div class="form-item">
+ <span style="vertical-align: middle">鏁伴噺</span>
+ <div class="number-tool" style="vertical-align: middle">
+ <button onclick="reduce()">-</button><input id="count" type="number" min="1" onblur="checkCount()"><button onclick="add()">+</button>
+ </div>
+ </div>
+ <button id="confirm" onclick="confirm()">鎻愬彇</button>
+</div>
+
+</body>
+<script>
+ var layer;
+ layui.use(['table', 'laydate', 'form'], function () {
+ var layer = layui.layer;
+ });
+
+ var countDom = $('#count');
+ var initMatCount = 1;
+ var pageCurr;
+
+ /**
+ * 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡璇︽儏
+ */
+ function find(el){
+ if (isEmpty(el.value)) {
+ return;
+ }
+ $.ajax({
+ url: baseUrl + "/matCode/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ id: el.value
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null) {
+ $('#matName').val(res.data.matName);
+ $('#str1').val(res.data.str1);
+ $('#str2').val(res.data.str2);
+ countDom.val(initMatCount);
+ $('#count').focus().select();
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ alert(res.msg)
+ }
+ }
+ })
+ }
+
+ /**
+ * 鎻愬彇
+ */
+ function confirm(){
+ var data = {
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ count: countDom.val(),
+ mnemonic: $("#mnemonic").val(),
+ supplier: $("#supplier").val()
+ };
+ var pdaUrl = window.document.referrer;
+ if (pdaUrl.indexOf("areaType") == -1) {
+ if (isEmpty(data.mnemonic)) {
+ layer.msg("璇疯緭鍏ョ敓浜у崟鍙�");
+ return;
+ }
+ if (isEmpty(data.supplier)) {
+ layer.msg("璇疯緭鍏ラ�氱煡鍗曞彿");
+ return;
+ }
+ }
+
+ parent.addTableData(data);
+ parent.layer.close(parent.matCodeLayerIdx);
+ }
+
+ window.onload = function(){document.getElementById("matNo").focus();}
+ $(document).on('click','#confirm', function () {
+ })
+
+ // $('body').keydown(function () {
+ // if (event.keyCode === 13) {
+ // $("#confirm").click();
+ // }
+ // });
+
+ function add() {
+ countDom.val(Number(countDom.val()) + 1);
+ }
+ function reduce() {
+ if (countDom.val() <= initMatCount) {
+ return;
+ }
+ countDom.val(countDom.val() - 1);
+ }
+
+
+ document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) {
+ confirm();
+ }
+ }
+
+ // 鏍℃鏈�灏忔暟閲�
+ function checkCount() {
+ var countValue = $("#count").val();
+ if (countValue <= 0) {
+ $("#count").val(1);
+ }
+ }
+
+</script>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1