wms-core-service/src/main/java/com/lote/wms/instock/order/service/impl/InOrderImportServiceImpl.java

@@ -238,6 +238,7 @@ public class InOrderImportServiceImpl implements InOrderImportService {
 		return message;
 	}
 
+
 	/**
 	 * 解析成方便读取的格式
 	 * 

wms-operate/src/main/java/com/lote/wms/controller/operate/instock/order/InOrderController.java

@@ -372,4 +372,8 @@ public class InOrderController extends AbstractController {
 		return MessageToResultAdapt.toResult(message);
 	}
 
+
+
+
+
 }

wms-operate/src/main/resources/static/ui/js/instock/order/inOrder/importDate.js

@@ -0,0 +1,3 @@
+//submitFile
+$("#submitFile").click(function() {
+})

wms-operate/src/main/resources/static/ui/views/instock/order/inOrder/importDate.html

@@ -0,0 +1,38 @@
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
+<link type="text/css" href="/ui/css/smtable.css" rel="stylesheet" />
+<form id="import-formImport" name="formImport" enctype="multipart/form-data" action="/instock/order/importDate"  method="post">
+	<table class="editTable" style="margin-left: 10px;">
+	    <tr>
+	        <td class="label">请选择需要导入的文件</td>
+	        <td>
+	            <input id="importFile" type="text" name="file" 
+	                   data-toggle="topjui-filebox"
+	                   data-options="buttonIcon:'fa fa-folder'">
+	        </td>
+	    </tr>
+		<tr>
+	        <td colspan="4">
+	            <div class="divider">
+	                <span>Excel模板最后更新于2021-02-04,务必使用最新模板文件.<a href="http://wms.amiciscs.com:90/fileserver/download?name=1Utw70tszL1560412449664.xlsx"><b>点击下载</b></a></span>
+	            </div>
+	        </td>
+	    </tr>
+	</table>
+</form>
+
+<!-- 结果区 -->
+<div id="import-importResult" style="width:790px;height:400px;overflow: auto">
+	<table id="import-resultTable" style="width:750px;text-align: left;margin-left:10px; margin-top: 5px;display: none;" class="smtable">	
+		<thead>
+			<tr>
+				<th style="width:50px;font-weight: bold;">行号</th>
+				<th style="width:80px;font-weight: bold;">校验结果</th>
+				<th style="width:600px;font-weight: bold;">详情</th>
+			</tr>
+		</thead>
+		<tbody id="import-resultBody">
+			
+		</tbody>
+	</table>
+</div>
+<script type="text/javascript" src="/ui/js/instock/order/inOrder/importDate.js?v=001"></script>

wms-operate/src/main/resources/static/ui/views/instock/order/inOrder/list.html

@@ -99,7 +99,7 @@
 	       		<div id="printOrder">订单信息</div>
 	            <div id="printReceipt">收货记录</div>
 	            <div id="printShelf">上架记录</div>
-			</div>	
+			</div>
 		</div>    
 	     <!-- 表格工具栏结束 -->
 	</div>

wms-operate/src/main/resources/static/ui/views/inventory/inventory/inventory/list.html

@@ -79,7 +79,7 @@
 			</div>
 			
     		<a id="freeze" href="javascript:void(0)" style="width: 85px;">冻结</a>
-    		<a id="unFreeze" href="javascript:void(0)" style="width: 85px;">解冻</a> 
+    		<a id="unFreeze" href="javascript:void(0)" style="width: 85px;">解冻</a>
 <!--    		<a id="updInventory" href="javascript:void(0)">调整数量</a>-->
     		<!-- 冻结库存的部分数量,通过设置冻结0,解开冻结 -->
     		<a id="freezeQty" href="javascript:void(0)">冻结数量</a>