From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html | 446 +++++++++++++++++++++++++++---------------------------
1 files changed, 223 insertions(+), 223 deletions(-)
diff --git a/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
index b1d550d..226021f 100644
--- a/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
+++ b/zy-asrs-openapi/src/main/webapp/views/generateOrderPakIn.html
@@ -1,224 +1,224 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱璁㈠崟</title>
- <link rel="stylesheet" href="../static/css/element.css">
- <link rel="stylesheet" href="../static/css/common.css">
- <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/vue.min.js"></script>
- <script type="text/javascript" src="../static/js/showdown.min.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
- <script type="text/javascript" src="../static/js/element.js"></script>
-</head>
-<body>
- <div id="app">
- <div id="content"></div>
- <div class="slider">
- <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
- <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
- <el-divider></el-divider>
- <div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
- <div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
- <div><el-button type="text" @click="switchPage('reportStock.html')">搴撳瓨涓婃姤</el-button></div>
- <div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
- <el-divider></el-divider>
- <div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
- <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
- <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
- <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
- <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
- <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
- <el-divider></el-divider>
- <div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
- </div>
-
- <el-dialog title="瀵嗛挜绠＄悊" :visible.sync="keyTableVisible">
- <el-table :data="keyTableData" v-loading="loading">
- <el-table-column property="hostId$" label="浠撳簱"></el-table-column>
- <el-table-column property="signKey" label="绛惧悕瀵嗛挜" width="150"></el-table-column>
- <el-table-column property="appKey" label="鎺ュ彛璇锋眰瀵嗛挜" width="250"></el-table-column>
- <el-table-column property="createTime$" label="鏃堕棿" width="200"></el-table-column>
- <el-table-column label="鎿嶄綔" width="400">
- <template slot-scope="scope">
- <el-button size="mini" @click="generateSignKey(scope.row.hostId)">绛惧悕瀵嗛挜</el-button>
- <el-button size="mini" @click="generateAppKey(scope.row.hostId)">鎺ュ彛瀵嗛挜</el-button>
- <el-switch
- v-model="scope.row.signStatus"
- @change="switchChange(scope.row.hostId,scope.row.signStatus)"
- active-text="寮�鍚鍚�"
- inactive-text="鍏抽棴绛惧悕">
- </el-switch>
- </template>
- </el-table-column>
- </el-table>
- </el-dialog>
- </div>
-
- <script>
- showdown.setOption('tables', true);
- var converter = new showdown.Converter()
-
- var app = new Vue({
- el: '#app',
- data: {
- keyTableVisible: false,
- keyTableData: [],
- loading: true,
- },
- created() {
- this.init()
- },
- methods: {
- init() {
- this.introduceClick()
- },
- introduceClick() {
- $.ajax({
- url: "md/generateOrderPakIn.md",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- // $("#content").html(marked.parse(res))
- // console.log(converter.makeHtml(res))
- $("#content").html(converter.makeHtml(res))
- }
- });
- },
- keyList() {
- let that = this
- this.keyTableVisible = true
- $.ajax({
- url: baseUrl + "/hostKey/list/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {},
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- let tmp = []
- res.data.forEach((item, index) => {
- item.signStatus = item.signStatus == 1 ? true : false;
- tmp.push(item)
- });
- that.keyTableData = tmp
- that.loading = false
- }
- });
- },
- generateSignKey(hostId) {
- let that = this
- this.$confirm('姝ゆ搷浣滃皢瑕嗙洊鍘熺鍚嶅瘑閽�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- $.ajax({
- url: baseUrl + "/hostKey/generateSignKey/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- hostId: hostId
- },
- dataType: 'json',
- contentType: 'application/json;charset=UTF-8',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- that.$message({
- type: 'success',
- message: '鐢熸垚鎴愬姛'
- });
-
- that.keyTableData.forEach((item, index) => {
- if (item.hostId == hostId) {
- item.signKey = res.data.signKey
- }
- });
- } else {
- that.$message({
- type: 'error',
- message: res.msg
- });
- }
- }
- });
- }).catch(() => {
- //鍙栨秷
- });
- },
- generateAppKey(hostId) {
- let that = this
- this.$confirm('姝ゆ搷浣滃皢瑕嗙洊鍘熸帴鍙ｅ瘑閽�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- $.ajax({
- url: baseUrl + "/hostKey/generateAppKey/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- hostId: hostId
- },
- dataType: 'json',
- contentType: 'application/json;charset=UTF-8',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- that.$message({
- type: 'success',
- message: '鐢熸垚鎴愬姛'
- });
-
- that.keyTableData.forEach((item, index) => {
- if (item.hostId == hostId) {
- item.appKey = res.data.appKey
- }
- });
- } else {
- that.$message({
- type: 'error',
- message: res.msg
- });
- }
- }
- });
- }).catch(() => {
- //鍙栨秷
- });
- },
- switchChange(hostId, signStatus) {
- let that = this
- //绛惧悕鏍￠獙寮�鍏�
- $.ajax({
- url: baseUrl + "/hostKey/switchSign/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- hostId: hostId,
- signStatus: signStatus ? 1 : 0,
- },
- dataType: 'json',
- contentType: 'application/json;charset=UTF-8',
- method: 'GET',
- success: function (res) {
- if (res.code === 200) {
- that.$message({
- type: 'success',
- message: '鍒囨崲鎴愬姛'
- });
- } else {
- that.$message({
- type: 'error',
- message: res.msg
- });
- }
- }
- });
- },
- switchPage(url) {
- location.href = url
- },
- }
- })
- </script>
-</body>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>API寮�鏀惧钩鍙� - 鐢熸垚鍏ュ簱璁㈠崟</title>
+ <link rel="stylesheet" href="../static/css/element.css">
+ <link rel="stylesheet" href="../static/css/common.css">
+ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../static/js/vue.min.js"></script>
+ <script type="text/javascript" src="../static/js/showdown.min.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
+ <script type="text/javascript" src="../static/js/element.js"></script>
+</head>
+<body>
+ <div id="app">
+ <div id="content"></div>
+ <div class="slider">
+ <div><el-button type="text" @click="switchPage('index.html')">绠�浠�</el-button></div>
+ <div><el-button type="text" @click="switchPage('default.html')">瑙勮寖璇存槑</el-button></div>
+ <el-divider></el-divider>
+ <div><el-button type="text" @click="switchPage('reportCompleted.html')">璁㈠崟瀹屾垚涓婃姤</el-button></div>
+ <div><el-button type="text" @click="switchPage('reportCancel.html')">璁㈠崟鍙栨秷涓婃姤</el-button></div>
+ <div><el-button type="text" @click="switchPage('reportStock.html')">搴撳瓨涓婃姤</el-button></div>
+ <div><el-button type="text" @click="switchPage('reportApiManage.html')">涓婃姤API绠＄悊</el-button></div>
+ <el-divider></el-divider>
+ <div><el-button type="text" @click="switchPage('getOrderType.html')">鑾峰彇璁㈠崟绫诲瀷</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderStatus.html')">鑾峰彇璁㈠崟鐘舵�佸垪琛�</el-button></div>
+ <div><el-button type="text" @click="switchPage('getOrderList.html')">鑾峰彇璁㈠崟鍒楄〃</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakIn.html')">鐢熸垚鍏ュ簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('generateOrderPakOut.html')">鐢熸垚鍑哄簱璁㈠崟</el-button></div>
+ <div><el-button type="text" @click="switchPage('createMat.html')">娣诲姞鐗╂枡淇℃伅</el-button></div>
+ <el-divider></el-divider>
+ <div><el-button type="text" @click="keyList()">瀵嗛挜绠＄悊</el-button></div>
+ </div>
+
+ <el-dialog title="瀵嗛挜绠＄悊" :visible.sync="keyTableVisible">
+ <el-table :data="keyTableData" v-loading="loading">
+ <el-table-column property="hostId$" label="浠撳簱"></el-table-column>
+ <el-table-column property="signKey" label="绛惧悕瀵嗛挜" width="150"></el-table-column>
+ <el-table-column property="appKey" label="鎺ュ彛璇锋眰瀵嗛挜" width="250"></el-table-column>
+ <el-table-column property="createTime$" label="鏃堕棿" width="200"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="400">
+ <template slot-scope="scope">
+ <el-button size="mini" @click="generateSignKey(scope.row.hostId)">绛惧悕瀵嗛挜</el-button>
+ <el-button size="mini" @click="generateAppKey(scope.row.hostId)">鎺ュ彛瀵嗛挜</el-button>
+ <el-switch
+ v-model="scope.row.signStatus"
+ @change="switchChange(scope.row.hostId,scope.row.signStatus)"
+ active-text="寮�鍚鍚�"
+ inactive-text="鍏抽棴绛惧悕">
+ </el-switch>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
+ </div>
+
+ <script>
+ showdown.setOption('tables', true);
+ var converter = new showdown.Converter()
+
+ var app = new Vue({
+ el: '#app',
+ data: {
+ keyTableVisible: false,
+ keyTableData: [],
+ loading: true,
+ },
+ created() {
+ this.init()
+ },
+ methods: {
+ init() {
+ this.introduceClick()
+ },
+ introduceClick() {
+ $.ajax({
+ url: "md/generateOrderPakIn.md",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ // $("#content").html(marked.parse(res))
+ // console.log(converter.makeHtml(res))
+ $("#content").html(converter.makeHtml(res))
+ }
+ });
+ },
+ keyList() {
+ let that = this
+ this.keyTableVisible = true
+ $.ajax({
+ url: baseUrl + "/hostKey/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {},
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ let tmp = []
+ res.data.forEach((item, index) => {
+ item.signStatus = item.signStatus == 1 ? true : false;
+ tmp.push(item)
+ });
+ that.keyTableData = tmp
+ that.loading = false
+ }
+ });
+ },
+ generateSignKey(hostId) {
+ let that = this
+ this.$confirm('姝ゆ搷浣滃皢瑕嗙洊鍘熺鍚嶅瘑閽�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/hostKey/generateSignKey/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostId: hostId
+ },
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message({
+ type: 'success',
+ message: '鐢熸垚鎴愬姛'
+ });
+
+ that.keyTableData.forEach((item, index) => {
+ if (item.hostId == hostId) {
+ item.signKey = res.data.signKey
+ }
+ });
+ } else {
+ that.$message({
+ type: 'error',
+ message: res.msg
+ });
+ }
+ }
+ });
+ }).catch(() => {
+ //鍙栨秷
+ });
+ },
+ generateAppKey(hostId) {
+ let that = this
+ this.$confirm('姝ゆ搷浣滃皢瑕嗙洊鍘熸帴鍙ｅ瘑閽�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ $.ajax({
+ url: baseUrl + "/hostKey/generateAppKey/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostId: hostId
+ },
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message({
+ type: 'success',
+ message: '鐢熸垚鎴愬姛'
+ });
+
+ that.keyTableData.forEach((item, index) => {
+ if (item.hostId == hostId) {
+ item.appKey = res.data.appKey
+ }
+ });
+ } else {
+ that.$message({
+ type: 'error',
+ message: res.msg
+ });
+ }
+ }
+ });
+ }).catch(() => {
+ //鍙栨秷
+ });
+ },
+ switchChange(hostId, signStatus) {
+ let that = this
+ //绛惧悕鏍￠獙寮�鍏�
+ $.ajax({
+ url: baseUrl + "/hostKey/switchSign/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ hostId: hostId,
+ signStatus: signStatus ? 1 : 0,
+ },
+ dataType: 'json',
+ contentType: 'application/json;charset=UTF-8',
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ that.$message({
+ type: 'success',
+ message: '鍒囨崲鎴愬姛'
+ });
+ } else {
+ that.$message({
+ type: 'error',
+ message: res.msg
+ });
+ }
+ }
+ });
+ },
+ switchPage(url) {
+ location.href = url
+ },
+ }
+ })
+ </script>
+</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1