From 5b44d1832e93be61b034b7e531f0c954a0018d74 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 19 六月 2023 22:18:05 +0800
Subject: [PATCH] 出入库优化-卡回收
---
igds-web/src/main/resources/static/admin/inout/in-handle.js | 5
igds-web/src/main/resources/templates/admin/inout/in-card-back.html | 13 -
igds-web/src/main/resources/templates/admin/inout/in-card-back202306.html | 380 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 8 +
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 1
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 1
igds-web/src/main/resources/templates/admin/inout/in-handle.html | 3
7 files changed, 397 insertions(+), 14 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index af8e291..e37641b 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -635,7 +635,6 @@
@RequestMapping("/submit-handle")
@Transactional
public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
-
return inoutManager.submitHandle(data);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 6041858..417080f 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -1067,6 +1067,12 @@
}
public PageResponse<InoutData> submitHandle(InoutData data) throws Exception {
+
+
+ if (null == data.getHandleUser()) {
+ data.setHandleUser(ContextUtil.getLoginUserCName());
+ }
+
//鑾峰彇绯荤粺鍙傛暟閰嶇疆
InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf) {
@@ -1294,7 +1300,7 @@
try {
List<InoutPrice> price = inoutService.getPrice(param);
- if(null == price || price.isEmpty()){
+ if (null == price || price.isEmpty()) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鏈幏鍙栧埌绮瀹氫环閰嶇疆淇℃伅");
}
return new PageResponse<>(RespCodeEnum.CODE_0000, price.get(0));
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 263c996..66ea5e9 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -195,6 +195,7 @@
@Override
public String updateDataByHandle(InoutData data) {
data.setUpdateTime(new Date());
+
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-handle.js b/igds-web/src/main/resources/static/admin/inout/in-handle.js
index 342373c..479ab57 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-handle.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-handle.js
@@ -238,6 +238,11 @@
notifyProgress(result.msg, result.data);
} else {
recordData = result.data;
+
+ //璧嬪�煎綋鍓嶇櫥闄嗕汉浣滀负鍊间粨浜�
+ if (!recordData.handleUser) {
+ recordData.handleUser = curUser;
+ }
// 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
form.val("form-data", recordData);
form.render();
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-card-back.html b/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
index 58d1788..0c7eb14 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
@@ -6,21 +6,12 @@
content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
- <title>鍑哄叆搴撶鐞�-绂诲簱</title>
+ <title>鍑哄叆搴撶鐞�-绂诲簱鏀跺崱</title>
<link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
+ th:href="@{../../static/plugins/layui/css/layui.css}">
<link rel="stylesheet" type="text/css"
th:href="@{../../static/admin/inout/style.css}">
-
- <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
- <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
- <object id="LODOP_OB"
- classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0
- style="display: none;">
- <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0
- style="display: none;"></embed>
- </object>
<style>
.display-none {
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-card-back202306.html b/igds-web/src/main/resources/templates/admin/inout/in-card-back202306.html
new file mode 100644
index 0000000..58d1788
--- /dev/null
+++ b/igds-web/src/main/resources/templates/admin/inout/in-card-back202306.html
@@ -0,0 +1,380 @@
+<!DOCTYPE html>
+<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鍑哄叆搴撶鐞�-绂诲簱</title>
+
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/admin/inout/style.css}">
+
+ <!--浣跨敤鎵撳嵃鎻掍欢 闅愯棌褰撳墠鎻掍欢 -->
+ <script th:src="@{../../static/plugins/lodop/LodopFuncs.js}"></script>
+ <object id="LODOP_OB"
+ classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0
+ style="display: none;">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0
+ style="display: none;"></embed>
+ </object>
+
+ <style>
+ .display-none {
+ display: none;
+ }
+
+ .rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+ }
+
+ .qyzj-btnbox .rkbk-quick {
+ margin-top: 15px;
+ }
+ </style>
+
+</head>
+
+<body>
+
+<div class="l-container layui-clear">
+ <div class="rk-main">
+
+ <div class="qyzj-btnbox layui-clear">
+
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
+ <i><img th:src="@{../../static/images/icon-hyd.png}"/></i> 鏌ョ湅鍖栭獙鍗�
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-green"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鏀跺崱鍑哄簱
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-violet"
+ onclick="printBill()">
+ <i><img th:src="@{../../static/images/icon-dayin.png}"/></i>
+ 鎵撳嵃杩囩鍗�
+ </button>
+ </div>
+
+ <!-- 娴佺▼寮曞 -->
+ <div class="rk-step-wrap fr">
+ <ul class="rk-step">
+ <li id="progress-register" class="active rk-step-first">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-dengji.png}"/>
+ </span>
+ <p>鍏ュ簱鐧昏</p>
+ </li>
+ <li id="progress-check" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-zhijian.png}"/>
+ </span>
+ <p>鎵︽牱璐ㄦ</p>
+ </li>
+ <li id="progress-fullWeight" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
+ </span>
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="progress-hand" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-xiehuo.png}"/>
+ </span>
+ <p>鍏ュ簱鍊间粨</p>
+ </li>
+ <li id="progress-emptyWeight" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
+ </span>
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="progress-cardBack" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+
+ </div>
+ <!-- 娴佺▼寮曞EDN -->
+ </div>
+ <!--qyzj-btnbox end-->
+
+ <div class="rkbk-con">
+
+ <div class="radius-6 rkbk-left-wrap fl">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鎵胯繍浜轰俊鎭�</h3>
+ </div>
+ <div class="rkbk-left-form">
+ <form class="layui-form" action="" id="form-basic"
+ lay-filter="form-basic">
+
+ <div class="rkbk-form-box1">
+
+ <div class="rkbk-form-left">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">濮� 鍚�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">韬唤璇佸彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡</label>
+ <div class="layui-input-block">
+ <input type="text" name="userContact" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑虹敓鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="text" name="userBirthday"
+ placeholder="yyyy-MM-dd" autocomplete="off"
+ class="layui-input rkbk-search-input bg-date" id="test1" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎬� 鍒�</label>
+ <div class="layui-input-block rkbk-selBox">
+ <input type="radio" name="userSex" value="鐢�" title="鐢�"
+ checked disabled> <input type="radio" name="userSex"
+ value="濂�" title="濂�" disabled>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">姘� 鏃�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userNation" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+
+ </div>
+ <!--rk-form-left end-->
+
+ <div class="rkbk-photo">
+ <a href="#"><img
+ th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
+ </div>
+
+
+ </div>
+ <!--rkbk-form-box1 end-->
+
+ <div class="rkbk-form-box2" style="padding-top: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍦� 鍧�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userAddress" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="rkbk-quick layui-text-center">
+ <button id="button_readID" type="button"
+ onclick="flushIdCard()"
+ class="rkbk-quick-btn layui-btn btn-blue">璇诲彇韬唤璇�
+ </button>
+ </div>
+ <!--rkbk-form-box2 end-->
+ </form>
+
+ </div>
+ </div>
+
+ </div>
+ <!--rkbk-left end-->
+
+
+ <div class="radius-6 rkbk-right-wrap fr">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>涓氬姟鏁版嵁</h3>
+ </div>
+
+ <div class="rkbk-left-form rkbk-right-form">
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
+
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-ID</label>
+ <input type="text" name="id">
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
+ <input type="text" name="progress">
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
+ <input type="text" name="type">
+ </div>
+
+ <div class="layui-form-item">
+ <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
+ <label class="layui-form-label">鏅烘収鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard"
+ placeholder="鍏堢偣鍑昏鍗★紝鍚庢斁鍗�......" autocomplete="off"
+ class="layui-input">
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+
+ <input type="button" value="鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushData()">
+ <label class="layui-form-label">杞︾墝鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum"
+ placeholder="杈撳叆杞︾墝鍙疯繘琛屾煡璇�" autocomplete="off"
+ class="layui-input">
+ </div>
+
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="depotId" disabled>
+ <option value="">鑷姩鑾峰彇</option>
+ <option th:each="depot,depotSet:${listDepot}"
+ th:value="${depot.id}" th:text="${depot.name}"></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮鍝佺</label>
+ <div class="layui-input-block">
+ <select name="foodVariety" disabled>
+ <option value="">鑷姩鑾峰彇</option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮绛夌骇</label>
+ <div class="layui-input-block">
+ <select name="foodLevel" disabled>
+ <option value="">鑷姩鑾峰彇</option>
+ <option th:each="dic,dicSet:${listFoodLevel}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" name="customerName" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖栭獙缁撴灉</label>
+ <div class="layui-input-block">
+ <input type="text" name="checkStatus" placeholder="鑷姩鑾峰彇"
+ autocomplete="off" class="layui-input rkbk-search-input" disabled>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <!--rkbk-right end-->
+
+ </div>
+ <!--rkbk-con end-->
+
+ </div>
+ <!--rk-main end-->
+
+</div>
+<!--l-container end-->
+
+<script th:inline="javascript">
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ var listDepot = [[${listDepot}]];
+ //褰撳墠鑺傜偣
+ var progress = [[${progress}]];
+ //涓氬姟姝ラ
+ var bizType = [[${bizType}]];
+ var deptId = [[${deptId}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+ var companyId = [[${loginUser.companyId}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ //鍝佺
+ var listFoodVariety = [[${listFoodVariety}]];
+ var listFoodLevel = [[${listFoodLevel}]];
+</script>
+
+
+<script th:src="@{../../static/plugins/layui/layui.js}"></script>
+<script th:src="@{../../static/js/jquery.min.js}"></script>
+<script th:src="@{../../static/js/constant.js}"></script>
+<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-print.js}"></script>
+<script th:src="@{../../static/admin/inout/in-card-back.js}"></script>
+
+<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
+<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
+ <table class="layui-table">
+ <colgroup>
+ <col width="100">
+ </colgroup>
+ <tbody>
+ <tr>
+ <td>杩斿洖淇℃伅</td>
+ <td id="resultMsg" style="color: red;font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鎵胯繍浜�</td>
+ <td id="resultUserName" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>杞︾墝鍙�</td>
+ <td id="resultPlateNum" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>涓嬩竴姝�</td>
+ <td id="resultType" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鏅烘収鍗″彿</td>
+ <td id="resultIntelCard" style="font-weight: bold;"></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-handle.html b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
index 5c6c098..27f1dc3 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
@@ -310,7 +310,7 @@
<label class="layui-form-label color-red">瑁呭嵏浠撳簱</label>
<div class="layui-input-block">
<select name="depotId" id="depotId" lay-filter="select_depotId">
- <option value="">涓嶅彲缂栬緫</option>
+ <option value="">璇烽�夋嫨</option>
<option th:each="depot,depotSet:${listDepot}"
th:value="${depot.id}" th:text="${depot.name}"></option>
</select>
@@ -520,6 +520,7 @@
var bizType = [[${bizType}]];
//userId
var userId = [[${loginUser.username}]];
+ var curUser = [[${loginUser.cname}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
var companyId = [[${loginUser.companyId}]];
--
Gitblit v1.9.3