From 46c887694fdde580355014847da7e39b4ab301cc Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期二, 05 三月 2024 15:37:25 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 1
Pda/View/SoSetting/productOut.html | 976 ++++++++++++++++++++++++++++++++++++++++-----------------
Pda/View/AsnSetting/productEnterQuantity.html | 4
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 14
Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs | 8
5 files changed, 709 insertions(+), 294 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index f9fd720..d8d62b5 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -248,7 +248,7 @@
</table>
<!-- 鍒嗛〉 -->
<table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
- <tr style="display: ;">
+ <tr >
<td class="page-prev">涓婁竴椤�</td>
<td class="page-num page-num-select">1</td>
<td class="page-num">2</td>
@@ -404,7 +404,7 @@
</table>
<!-- 鍒嗛〉 -->
<table id="tableBoxPages1" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
- <tr style="display: ;">
+ <tr>
<td class="page-prev">涓婁竴椤�</td>
<td class="page-num page-num-select">1</td>
<td class="page-num">2</td>
diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index 36c385b..dbc2b7b 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -135,6 +135,17 @@
.layui-form-switch {
margin-top: 0;
}
+ ul {
+ list-style-type: none;
+ padding: 0;
+ }
+
+ li {
+ cursor: pointer;
+ background-color: lightgray;
+ padding: 10px;
+ margin-bottom: 5px;
+ }
</style>
<link rel="stylesheet" href="/css/adapter.css" />
</head>
@@ -158,227 +169,386 @@
</ul>
</div>
- <div id="" class="layout-bill-info">
- <form class="layui-form" action="" style="height: auto;">
+ <ul>
+ <li id="option1">鏍囩</li>
+ <li id="option2">鏁伴噺</li>
+ </ul>
- <div id="layout-bill" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label lableWidth">鍑哄簱鍗曪細</label>
- <div class="layui-input-block" id="selectDiv">
- <select id="bar" lay-filter="getbar" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
- <div id="layout-skuLotNo" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label lableWidth">鐗╂枡 - 鎵规锛�</label>
- <div class="layui-input-block">
- <select id="skuLotNo" lay-filter="getSkuLotNo" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
- <div id="" class="layout-tab-page">
- <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
- <div class="layui-input-block" style="width: 50%;margin-left:50%;">
- <input id="planQty" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
- </td>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 50%">瀹屾垚鏁伴噺锛�</label>
- <div class="layui-input-block" style="width: 50%;margin-left:50%;">
- <input id="finishQty" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
+ <br />
- </td>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 34%;">鍑哄簱鍙ｏ細</label>
- <div class="layui-input-block" style="width: 66%;margin-left:34%;">
- <input id="outModel" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 17%;">瑙勬牸锛�</label>
- <div class="layui-input-block" style="width: 83%;margin-left:17%;">
- <input id="standard" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
- </td>
-
- </tr>
- </table>
- </div>
+ <!-- 鏈夌爜 -->
+ <div id="content1">
+
+ <div id="" class="layout-bill-info">
+ <form class="layui-form" action="" style="height: auto;">
- <div id="layout-pallet" class="layui-form-item layout-input">
- <label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="palletNo" type="text" lay-verify="stock" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" autocomplete="off"
- class="layui-input" style="height:24px">
- </div>
- </div>
- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鏄惁鏁存墭鍑哄簱锛�</label>
- <div class="layui-input-block">
- <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="鏄瘄鍚�"
- lay-filter="IsZhengTuo">
- </div>
- </div>
- <div id="BoxDIv" class="layout-tab-page">
- <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <div class="layui-form-item layout-input">
- <label class="layui-form-label lableWidth">澶栫鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="boxNo" type="text" placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </td>
- </tr>
- <!-- <tr>
- <td>
- <div class="layui-form-item layout-input" style="margin-top: 6px;">
- <label class="layui-form-label lableWidth">鍐呯鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="boxNo2" type="text" placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </td>
- </tr> -->
- <tr>
- <td>
- <div class="layui-form-item layout-input" style="margin-top: 6px;">
- <label class="layui-form-label lableWidth">杩芥函鏉＄爜锛�</label>
- <div class="layui-input-block">
- <input id="boxNo3" type="text" lang langholder placeholder="璇锋壂鎻忚拷婧潯鐮�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
- <div id="" class="layout-tab-page">
- <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label lableWidth">寰呮嫞鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="pickQty" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
- </div>
- </div>
- </td>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label lableWidth">宸叉嫞鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="pickedQty" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
- </div>
- </div>
- </td>
- <!-- <td>
- <div class="layui-form-item ">
- <label class="layui-form-label lableWidth">绠卞唴鏁伴噺锛�</label>
- <div class="layui-input-block">
- <input id="boxQty" class="layui-input" style="border: 0;"
- type="text" lay-verify="" disabled placeholder="">
- </div>
- </div>
- </td> -->
- </tr>
- </table>
- </td>
- </tr>
- </table>
- <table class="layout-tab-content">
- <tr>
- <td style="width: 33%;"></td>
- <td>
- <button class="layout-btn layout-btn-red" lang type="button" lay-submit
- lay-filter="formPickScatter">鎷ｈ揣</button>
- </td>
- <td style="width: 33%;"></td>
- <!-- <td>
- <div id="layout-qty" class="layui-form-item out-scatter-num" style="margin-top: 15px;">
- <label class="layui-form-label lableWidth" >鎷ｈ揣鏁伴噺锛�</label>
- <div id="" class="local-input">
- <div class="layui-input-block">
- <input id="qty" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
- autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
- oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
- </div>
- </div>
- <div id="" class="local-ok">
- <button type="button" lay-submit lay-filter="formPickScatter">纭</button>
- </div>
- </div>
- </td> -->
- </tr>
- </table>
- <div id="" style="text-align: right;margin-top: 10px;">
- <div id="" class="cut-line">
- <img src="/assets/fengexian.png">
+ <div id="layout-bill" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鍑哄簱鍗曪細</label>
+ <div class="layui-input-block" id="selectDiv">
+ <select id="bar" lay-filter="getbar" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
</div>
</div>
- </div>
+ <div id="layout-skuLotNo" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鐗╂枡 - 鎵规锛�</label>
+ <div class="layui-input-block">
+ <select id="skuLotNo" lay-filter="getSkuLotNo" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div id="" class="layout-tab-page">
+ <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 50%;margin-left:50%;">
+ <input id="planQty" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 50%">瀹屾垚鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 50%;margin-left:50%;">
+ <input id="finishQty" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
- </form>
+ </td>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 34%;">鍑哄簱鍙ｏ細</label>
+ <div class="layui-input-block" style="width: 66%;margin-left:34%;">
+ <input id="outModel" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 17%;">瑙勬牸锛�</label>
+ <div class="layui-input-block" style="width: 83%;margin-left:17%;">
+ <input id="standard" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+
+ <div id="layout-pallet" class="layui-form-item layout-input">
+ <label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="palletNo" type="text" lay-verify="stock" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" autocomplete="off"
+ class="layui-input" style="height:24px">
+ </div>
+ </div>
+ <div id="" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>鏄惁鏁存墭鍑哄簱锛�</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="鏄瘄鍚�"
+ lay-filter="IsZhengTuo">
+ </div>
+ </div>
+ <div id="BoxDIv" class="layout-tab-page">
+ <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div class="layui-form-item layout-input">
+ <label class="layui-form-label lableWidth">澶栫鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="boxNo" type="text" placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+ <!-- <tr>
+ <td>
+ <div class="layui-form-item layout-input" style="margin-top: 6px;">
+ <label class="layui-form-label lableWidth">鍐呯鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="boxNo2" type="text" placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr> -->
+ <tr>
+ <td>
+ <div class="layui-form-item layout-input" style="margin-top: 6px;">
+ <label class="layui-form-label lableWidth">杩芥函鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="boxNo3" type="text" lang langholder placeholder="璇锋壂鎻忚拷婧潯鐮�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="" class="layout-tab-page">
+ <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label lableWidth">寰呮嫞鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="pickQty" type="text" lay-verify="" disabled
+ placeholder="" class="layui-input">
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label lableWidth">宸叉嫞鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="pickedQty" type="text" lay-verify="" disabled
+ placeholder="" class="layui-input">
+ </div>
+ </div>
+ </td>
+ <!-- <td>
+ <div class="layui-form-item ">
+ <label class="layui-form-label lableWidth">绠卞唴鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="boxQty" class="layui-input" style="border: 0;"
+ type="text" lay-verify="" disabled placeholder="">
+ </div>
+ </div>
+ </td> -->
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ <table class="layout-tab-content">
+ <tr>
+ <td style="width: 33%;"></td>
+ <td>
+ <button class="layout-btn layout-btn-red" lang type="button" lay-submit
+ lay-filter="formPickScatter">鎷ｈ揣</button>
+ </td>
+ <td style="width: 33%;"></td>
+ <!-- <td>
+ <div id="layout-qty" class="layui-form-item out-scatter-num" style="margin-top: 15px;">
+ <label class="layui-form-label lableWidth" >鎷ｈ揣鏁伴噺锛�</label>
+ <div id="" class="local-input">
+ <div class="layui-input-block">
+ <input id="qty" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
+ autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
+ oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ </div>
+ </div>
+ <div id="" class="local-ok">
+ <button type="button" lay-submit lay-filter="formPickScatter">纭</button>
+ </div>
+ </div>
+ </td> -->
+ </tr>
+ </table>
+ <div id="" style="text-align: right;margin-top: 10px;">
+ <div id="" class="cut-line">
+ <img src="/assets/fengexian.png">
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+
+ <div class="layout-tbl-paging" id="">
+ <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
+ <tr id="tableHead">
+ <th style="width: 54%;">瀹瑰櫒缂栫爜</th>
+ <th style="width: 20%;">绠卞唴<br>鏁伴噺</th>
+ <th style="width: 20%;">宸叉嫞<br>鏁伴噺</th>
+ <!-- <th style="width: 14%;">宸叉嫞<br>鏁伴噺</th> -->
+ <!-- <th style="width: 8%;">鎷ｈ揣</th> -->
+ </tr>
+ <tr id="boxCell" style="display: none;">
+ <td name="boxNo">AG000001</td>
+ <td name="qty">30</td>
+ <td name="pickedQty">30</td>
+ </tr>
+ </table>
+
+ <!-- 鍒嗛〉 -->
+ <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td class="page-prev">涓婁竴椤�</td>
+ <td class="page-num page-num-select">1</td>
+ <td class="page-num">2</td>
+ <td class="page-num">3</td>
+ <td class="page-num">4</td>
+ <td class="page-num">5</td>
+ <td class="page-next">涓嬩竴椤�</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ <!-- 鏃犵爜 -->
+ <div id="content2">
+
+ <div id="" class="layout-bill-info">
+ <form class="layui-form" action="" style="height: auto;">
+
+ <div id="layout-bill2" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鍑哄簱鍗曪細</label>
+ <div class="layui-input-block" id="selectDiv2">
+ <select id="bar2" lay-filter="getbar2" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div id="layout-skuLotNo2" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鐗╂枡 - 鎵规锛�</label>
+ <div class="layui-input-block">
+ <select id="skuLotNo2" lay-filter="getSkuLotNo2" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div id="" class="layout-tab-page">
+ <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 50%;margin-left:50%;">
+ <input id="planQty2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 50%">瀹屾垚鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 50%;margin-left:50%;">
+ <input id="finishQty2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 17%;">瑙勬牸锛�</label>
+ <div class="layui-input-block" style="width: 83%;margin-left:17%;">
+ <input id="standard2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+
+ <div id="layout-pallet" class="layui-form-item layout-input">
+ <label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="palletNo2" type="text" lay-verify="stock" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" autocomplete="off"
+ class="layui-input" style="height:24px">
+ </div>
+ </div>
+ <div class="layui-form-item layout-input" style="display: flex; justify-content: space-between;">
+ <div style="width: 48%;">
+ <label class="layui-form-label" style="width: 34%;">鍑哄簱鍙ｏ細</label>
+ <div class="layui-input-block" style="width: 66%;margin-left:34%;">
+ <input id="outModel2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input" > <!-- style="border: 0px;" -->
+ </div>
+ </div>
+ <div style="width: 48%;">
+ <label class="layui-form-label" style="width: 70px;">宸叉嫞鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 120px; margin-left:70px;">
+ <input id="pickedQty2" type="text" lay-verify="" disabled
+ placeholder="" class="layui-input" >
+ </div>
+ </div>
+ </div>
+
+ <div id="" class="layout-tab-page">
+
+ <table class="layout-tab-content">
+ <tr>
+ <td>
+ <div id="layout-qty" class="layui-form-item out-scatter-num" >
+ <label class="layui-form-label lableWidth" >鎷ｈ揣鏁伴噺锛�</label>
+ <div id="" class="local-input">
+ <div class="layui-input-block">
+ <input id="pickQty2" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
+ autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
+ oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ </div>
+ </div>
+ <div id="" class="local-ok">
+ <button type="button" lay-submit lay-filter="formPickScatter2">纭</button>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <div id="" style="text-align: right;margin-top: 10px;">
+ <div id="" class="cut-line">
+ <img src="/assets/fengexian.png">
+ </div>
+ </div>
+ </div>
+
+ </form>
+ </div>
+
+ <div class="layout-tbl-paging" id="">
+ <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
+ <tr id="tableHead">
+ <th style="width: 54%;">鐗╂枡缂栫爜</th>
+ <th style="width: 20%;">鎵樺唴<br>鏁伴噺</th>
+ <th style="width: 20%;">宸叉嫞<br>鏁伴噺</th>
+ <!-- <th style="width: 14%;">宸叉嫞<br>鏁伴噺</th> -->
+ <!-- <th style="width: 8%;">鎷ｈ揣</th> -->
+ </tr>
+ <tr id="boxCell2" style="display: none;">
+ <td name="SkuNo2">AG000001</td>
+ <td name="qty2">30</td>
+ <td name="pickedQty2">30</td>
+ </tr>
+ </table>
+
+ <!-- 鍒嗛〉 -->
+ <table id="tableBoxPages2" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td class="page-prev">涓婁竴椤�</td>
+ <td class="page-num page-num-select">1</td>
+ <td class="page-num">2</td>
+ <td class="page-num">3</td>
+ <td class="page-num">4</td>
+ <td class="page-num">5</td>
+ <td class="page-next">涓嬩竴椤�</td>
+ </tr>
+ </table>
+ </div>
</div>
- <div class="layout-tbl-paging" id="">
- <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
- <tr id="tableHead">
- <th style="width: 54%;">瀹瑰櫒缂栫爜</th>
- <th style="width: 20%;">绠卞唴<br>鏁伴噺</th>
- <th style="width: 20%;">宸叉嫞<br>鏁伴噺</th>
- <!-- <th style="width: 14%;">宸叉嫞<br>鏁伴噺</th> -->
- <!-- <th style="width: 8%;">鎷ｈ揣</th> -->
- </tr>
- <tr id="boxCell" style="display: none;">
- <td name="boxNo">AG000001</td>
- <td name="qty">30</td>
- <td name="pickedQty">30</td>
- </tr>
- </table>
-
- <!-- 鍒嗛〉 -->
- <table id="tableBoxPages" class="tbl-box-pages" border="" cellspacing="" cellpadding="">
- <tr>
- <td class="page-prev">涓婁竴椤�</td>
- <td class="page-num page-num-select">1</td>
- <td class="page-num">2</td>
- <td class="page-num">3</td>
- <td class="page-num">4</td>
- <td class="page-num">5</td>
- <td class="page-next">涓嬩竴椤�</td>
- </tr>
- </table>
- </div>
</div>
</div>
@@ -392,6 +562,38 @@
<script>
layui.use(['form', 'jquery'], function () {
var form = layui.form;
+
+ /* 鏍囩鍒囨崲浠ｇ爜 */
+
+ var xianshiyemian = 0;
+
+ $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#content2').hide();
+ $(document).ready(function () {
+ $('#option1').click(function () {
+ // qingkong();
+ xianshiyemian = 0;
+ $('#content1').show();
+ $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+
+ $('#content2').hide();
+ $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $("#palletNo").focus();//鍏夋爣榛樿閫変腑
+ });
+
+ $('#option2').click(function () {
+ // qingkong();
+ xianshiyemian = 1;
+ $('#content1').hide();
+ $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
+
+ $('#content2').show();
+ $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
+ $("#palletNo2").focus();//鍏夋爣榛樿閫変腑
+ });
+ });
+
//褰撳墠鍒嗛〉
var curPageIndex = 1
@@ -856,94 +1058,284 @@
setCurPage(1)
}
- //璁剧疆褰撳墠鍒嗛〉
- function setCurPage(pageIndex){
- let totalTrNum = $("#tableBoxList tr").length
- if(totalTrNum <= 2 ){
- //console.log("tableBoxList 涓虹┖ totalTrNum: " + totalTrNum)
- //curPageIndex = 1
- return
- }
-
- let pageNum = getBoxPageNum()
- if(pageIndex > pageNum){
- //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
- //curPageIndex = 1
- return
- }
-
- let startIndex = (pageIndex - 1) * 10 + 1
- let n = totalTrNum - startIndex
- let endIndex = 0
- if(n > 9){
- endIndex = startIndex + 9
+ //璁剧疆褰撳墠鍒嗛〉
+ function setCurPage(pageIndex){
+ let totalTrNum = $("#tableBoxList tr").length
+ if(totalTrNum <= 2 ){
+ //console.log("tableBoxList 涓虹┖ totalTrNum: " + totalTrNum)
+ //curPageIndex = 1
+ return
+ }
+
+ let pageNum = getBoxPageNum()
+ if(pageIndex > pageNum){
+ //console.log("璁剧疆鐨勯〉鐮佽秴鍑洪〉鏁�, pageIndex : " + pageIndex)
+ //curPageIndex = 1
+ return
+ }
+
+ let startIndex = (pageIndex - 1) * 10 + 1
+ let n = totalTrNum - startIndex
+ let endIndex = 0
+ if(n > 9){
+ endIndex = startIndex + 9
+ }else{
+ endIndex = startIndex + n
+ }
+ //console.log("startIndex is "+startIndex)
+ //console.log("endIndex is "+endIndex)
+ //startIndex =2
+ //endIndex = 2
+ let trs = $("#tableBoxList tr")
+ //console.log("琛屾暟 "+trs.length)
+ let d = 0
+ for(let i = 2; i < trs.length; i++){
+ //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
+ let t = trs.eq(i)
+ d = t.attr('index')
+ if(d >= startIndex && d <= endIndex){
+ //console.log("闇�瑕佹樉绀�")
+ //鏄剧ず琛�
+ t.show()
}else{
- endIndex = startIndex + n
+ //闅愯棌琛�
+ t.hide()
}
- //console.log("startIndex is "+startIndex)
- //console.log("endIndex is "+endIndex)
- //startIndex =2
- //endIndex = 2
- let trs = $("#tableBoxList tr")
- //console.log("琛屾暟 "+trs.length)
- let d = 0
- for(let i = 2; i < trs.length; i++){
- //console.log("琛岀储寮� " + trs.eq(i).attr('index'))
- let t = trs.eq(i)
- d = t.attr('index')
- if(d >= startIndex && d <= endIndex){
- //console.log("闇�瑕佹樉绀�")
- //鏄剧ず琛�
- t.show()
- }else{
- //闅愯棌琛�
- t.hide()
- }
- }
-
- curPageIndex = pageIndex
-
- let ptr = $("#tableBoxPages tr")
- for(let i = 1; i < pageNum+1; i++){
- ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
- if(i == curPageIndex){
- ptr.eq(0).find("td").eq(i).addClass("page-num-select")
- }
- }
- //console.log("totalTrNum is " + totalTrNum)
}
- function onClickPrevPage(){
- //console.log("涓婁竴椤垫寜閽鐐瑰嚮")
- if(curPageIndex == 1){
- return
+ curPageIndex = pageIndex
+
+ let ptr = $("#tableBoxPages tr")
+ for(let i = 1; i < pageNum+1; i++){
+ ptr.eq(0).find("td").eq(i).removeClass("page-num-select")
+ if(i == curPageIndex){
+ ptr.eq(0).find("td").eq(i).addClass("page-num-select")
}
- setCurPage(curPageIndex - 1)
+ }
+ //console.log("totalTrNum is " + totalTrNum)
+ }
+
+ function onClickPrevPage(){
+ //console.log("涓婁竴椤垫寜閽鐐瑰嚮")
+ if(curPageIndex == 1){
+ return
+ }
+ setCurPage(curPageIndex - 1)
+ }
+
+ function onClickNextPage(){
+ //console.log("涓嬩竴椤垫寜閽鐐瑰嚮")
+ let n = getBoxPageNum()
+ if(curPageIndex == n){
+ return
+ }
+ setCurPage(curPageIndex + 1)
+ }
+
+ function getBoxPageNum()
+ {
+ let num = $("#tableBoxList tr").length
+ if(num <= 2 ){
+ return 0
}
- function onClickNextPage(){
- //console.log("涓嬩竴椤垫寜閽鐐瑰嚮")
- let n = getBoxPageNum()
- if(curPageIndex == n){
- return
- }
- setCurPage(curPageIndex + 1)
+ let pageNum = Math.floor(num / 10);
+ if(num % 10 > 0){
+ pageNum += 1;
}
-
- function getBoxPageNum()
- {
- let num = $("#tableBoxList tr").length
- if(num <= 2 ){
- return 0
- }
-
- let pageNum = Math.floor(num / 10);
- if(num % 10 > 0){
- pageNum += 1;
- }
-
- return pageNum
+
+ return pageNum
+ }
+
+
+ //鏁伴噺鏍囩-------------------------------------------------------------------------------
+
+ function clear21() {
+ $('#outModel2').val("");//鍑哄簱鍙�
+ $('#standard2').val("");//瑙勬牸
+
+ $('#pickQty2').val("");//寰呮嫞鏁伴噺
+ $('#pickedQty2').val("");//宸叉嫞鏁伴噺
+ }
+ function clear22() {
+ //鐗╂枡鎵规
+ $("#skuLotNo2").empty()
+ $("#skuLotNo2").append('<option value =>' + '</option>');
+ form.render('select');
+ }
+ function clear23() {
+ $("#planQty2").val(""); //璁″垝鏁伴噺
+ $("#finishQty2").val("");//瀹屾垚鏁伴噺
+ }
+ function clear24() {
+ $('#boxNo2').val("");//绠辩爜
+ $('#boxQty2').val("");//绠卞唴鏁伴噺
+ }
+
+
+ //褰撴墭鐩樻潯鐮佽緭鍏ユ鏂囨湰鏀瑰彉鏃�,妫�鏌ヤ竴涓嬫墭鐩樼姸鎬�
+ $("#palletNo2").on('input', function () {
+ if ($("#palletNo2").val() == "" || $("#palletNo2").val().length < 8) {
+ return
}
+ if ($("#palletNo2").val().length >= 8) {
+ $("#palletNo2").val($("#palletNo2").val().substr(-8))
+ }
+ checkPalletState2()
+ })
+ //妫�鏌ユ墭鐩樼姸鎬�
+ function checkPalletState2() {
+ var param = {
+ "PalletNo": $("#palletNo2").val()
+ }
+ synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ updateBillList2();
+ if ($('#bar').val() == "") {
+ clear21();
+ return;
+ } else {
+ updateSkuLotNoList2();
+ updateQtyList2();
+ getBar2();
+ GetBoxInfo();
+ }
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+ //鍒濆鍖栨覆鏌� 鍑哄簱鍗�
+ function updateBillList2() {
+ $("#bar2").empty()
+ $("#bar2").append('<option value =>' + '</option>');
+ form.render('select');
+
+ var param = {
+ PalletNo: $("#palletNo2").val(),
+ };
+ synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#bar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
+ } else {
+ $("#bar2").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ }
+ }
+ form.render('select');
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }
+
+ //鍒濆鍖栨覆鏌� 鐗╂枡-鎵规
+ function updateSkuLotNoList2() {
+ clear22();
+ var param = {
+ PalletNo: $("#palletNo2").val(),
+ SoNo: $("#bar2").val(),
+ };
+ synData(IP + "/PdaSo/GetSoSkuLotNoListByPallet", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#skuLotNo2").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');
+
+ } else {
+ $("#skuLotNo2").append('<option value =' + res.data[i].SoDetailId + '>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');
+ }
+ }
+ form.render('select');
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ //鍒濆鍖栨覆鍗曟嵁鐨勮鍒掓暟閲忓拰瀹屾垚鏁伴噺
+ function updateQtyList2() {
+ clear23();
+ var param = {
+ SoDetailId: $("#skuLotNo2").val(),
+ };
+ synData(IP + "/PdaSo/GetPlanAndFinishQty", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
+ $("#planQty2").val(res.data.PlanQty)
+ $("#finishQty2").val(res.data.FinishQty)
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ //鏍规嵁鍗曟嵁鑾峰彇鍑哄簱鍙ｃ�佽鏍笺�佸緟妫�鏁伴噺銆佸凡鎷ｆ暟閲�
+ function getBar2() {
+ clear21();
+
+ var param = {
+ PalletNo: $("#palletNo2").val(),
+ SoDetailId: $("#skuLotNo2").val(),
+ }
+ synData(IP + "/PdaSo/GetOutlets", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ let data = res.data
+ console.log(res.data);
+ $('#outModel2').val(res.data.OutModel);
+ $('#standard2').val(res.data.Standard);
+
+ $('#pickQty2').val(res.data.PickQty);
+ $('#pickedQty2').val(res.data.PickedQty);
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+
+ }
+
+ //鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
+ function GetBoxInfo() {
+ let param2 = {
+ "SoDetailId": $("#skuLotNo2").val(),
+ "PalletNo": $("#palletNo2").val(),
+ "BoxNo": $("#boxNo").val(),
+ "BoxNo3": $("#boxNo3").val(),
+ }
+ synData(IP + "/PdaSo/GetDataComBoxInfo", param2, 'post', function (res) {
+ if (res.code == 0) {
+ tableData = deepCopy(res.data)
+
+ refreshTable(tableData)
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
})
</script>
diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
index b82d1c7..5fff76d 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
+++ b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
@@ -12,6 +12,7 @@
public string Standard { get; set; } // 瑙勬牸
public decimal PickQty { get; set; } // 鎵樼洏寰呮嫞鏁伴噺
public decimal? PickedQty { get; set; } // 鎵樼洏宸叉嫞鏁伴噺
+ public string SkuNo { get; set; } // 鐗╂枡缂栧彿
}
public class BoxInfo
{
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 049f241..3b6a538 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -278,7 +278,19 @@
}
}
+ //鑾峰彇搴撳唴鏃犵鐮佺殑鎵樼洏鍒嗛厤淇℃伅
+ public List<OutPdaInfo> GetAllotPlnInfo(string soDetailId, string palletNo)
+ {
+ try
+ {
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ throw new NotImplementedException();
+ }
//鍑哄簱pda鎷ｈ揣
public void SoSetPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, int userId)
@@ -977,5 +989,7 @@
throw new Exception(e.Message);
}
}
+
+
}
}
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
index 1c72785..9f96645 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
@@ -58,6 +58,14 @@
List<BoxInfo> GetDataComBoxInfo(string soDetailId,string palletNo, string boxNo, string boxNo3);
/// <summary>
+ /// 鑾峰彇搴撳唴鏃犵鐮佺殑鎵樼洏鍒嗛厤淇℃伅
+ /// </summary>
+ /// <param name="soDetailId">鍑哄簱鍗曟槑缁咺D</param>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ List<OutPdaInfo> GetAllotPlnInfo(string soDetailId,string palletNo);
+
+ /// <summary>
/// 鍑哄簱pda鎷ｈ揣
/// </summary>
/// <param name="soNo">鍑哄簱鍗�</param>
--
Gitblit v1.8.0