xwh提交代码，增加运单下架功能

wms-common/src/main/java/com/lote/wms/common/model/enums/CreateWay.java

@@ -2,7 +2,8 @@ package com.lote.wms.common.model.enums;
 
 public enum CreateWay {
 
-	ADD("add", "单个创建"), EXCEL("excel", "Excel导入"), API("api", "API对接");
+	ADD("add", "单个创建"), EXCEL("excel", "Excel导入"),
+	API("api", "API对接"),INVENT("invent","虚拟上架");
 
 	private String code;
 

wms-core-service/src/main/java/com/lote/wms/outstock/order/service/OutOrderServiceAllocate.java

@@ -31,7 +31,7 @@ public interface OutOrderServiceAllocate {
 	/**
 	 * 取消分配库存
 	 * 
-	 * @param allocateInventoryEnt
+	 * @param orderId
 	 * @param user
 	 * @return
 	 */

wms-core-service/src/main/java/com/lote/wms/outstock/order/service/impl/OutOrderServiceImpl.java

@@ -1652,7 +1652,12 @@ public class OutOrderServiceImpl implements OutOrderService {
 			message.setMsg("出库单号不能为空");
 			return message;
 		}
-		OutOrder order = getByOrderNo(orderNo);
+		Message selectOrder = selectByNo(orderNo);
+		if (!selectOrder.isSuccess()) {
+			return selectOrder;
+		}
+
+		OutOrder order = (OutOrder) selectOrder.getExtend();
 		if (order == null) {
 			message.setMsg("出库单号不存在");
 			return message;

wms-operate/src/main/resources/static/ui/js/outstock/outshelf/outShelf/single.js

@@ -116,6 +116,7 @@ function submitBarcode(){
         data:JSON.stringify(jsonData),
         contentType:"application/json",
         success: function (result) {
+        	console.log(result)
         	if(result.code !=0){
     			$.iMessager.alert('注意', result.msg, 'messager-warning');
     			return;
@@ -174,6 +175,7 @@ function submitOutShelf(){
         data:JSON.stringify(jsonData),
         contentType:"application/json",
         success: function (result) {
+        	console.log(result)
         	isSubmintIng = false;
         	$.iMessager.progress('close');
         	

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

@@ -54,7 +54,8 @@
                 	{'id':'','code':'','name':''},
                 	{'id':'add','code':'add','name':'单个创建'},
                 	{'id':'excel','code':'excel','name':'Excel导入'},
-                	{'id':'api','code':'api','name':'API对接'}
+                	{'id':'api','code':'api','name':'API对接'},
+                	{'id':'invent','code':'invent','name':'虚拟上架'}
                 ],
 				panelHeight:150"> 
 				

wms-operate/src/main/resources/static/ui/views/outstock/outshelf/outShelf/single.html

@@ -68,7 +68,7 @@
 					<span class="btn btn-default wd120">出库单号</span>
 				</th>
 				<th class="wd220"  style="padding-top: 5px;padding-bottom: 2px;">
-					<input type="text" class="form-control wd220" id="outOrderNo" placeholder="输入后请按回车">
+					<input type="text" class="form-control wd220" id="outOrderNo" placeholder="输入订单号或跟踪号(运单号),请按回车">
 					<input type="text" id="outOrderId" style="display: none;">
 				</th>