Merge branch 'master' of lsp/wms into master

wms-core-service/src/main/java/com/lote/wms/api/app/model/OpType.java

@@ -59,6 +59,9 @@ public class OpType implements Serializable {
 	// 波次下架步骤2:提交
 	public final static String BATCH_OUT_SHELF_2 = "BATCH_OUT_SHELF_2";
 
+	// 波次下架步骤3:订单列表
+	public final static String BATCH_OUT_SHELF_3 = "BATCH_OUT_SHELF_3";
+
 	// 波次分揀1 查看是否允許揀貨
 	public final static String BATCH_OUT_SHELF_PICK_1 = "BATCH_OUT_SHELF_PICK_1";
 

wms-core-service/src/main/java/com/lote/wms/api/app/service/AppService.java

@@ -49,6 +49,15 @@ public interface AppService {
 	public Message batchOutShelf2(AppRequest request, User user);
 
 	/**
+	 * 获取波次下架订单列表
+	 *
+	 * @param request
+	 * @param user
+	 * @return
+	 */
+	public Message batchOutShelf3(AppRequest request, User user);
+
+	/**
 	 * 
 	 * @param request
 	 * @param user

wms-core-service/src/main/java/com/lote/wms/api/app/service/impl/AppServiceImpl.java

@@ -9,6 +9,9 @@ import javax.annotation.Resource;
 
 import com.lote.wms.base.product.entity.resultvo.ProductBarcodeResultVo;
 import com.lote.wms.common.utils.BeanUtil;
+import com.lote.wms.outstock.order.entity.OutOrder;
+import com.lote.wms.outstock.wave.entity.OutWave;
+import com.lote.wms.outstock.wave.entity.expend.OutWaveExpand;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -310,6 +313,38 @@ public class AppServiceImpl implements AppService {
 	}
 
 	@Override
+	public Message batchOutShelf3(AppRequest request, User user) {
+		String waveNo = request.getMsg();
+
+		Message message = new Message();
+		message.setSuccess(false);
+		if (StringUtil.isEmpty(waveNo)) {
+			message.setMsg("波次号不能为空!");
+			return message;
+		}
+		// 1.查询波次
+		boolean isExist = outWaveService.isExist(waveNo);
+		if (!isExist) {
+			// 如果波次号不存在，判断运单是否存在
+			message = outOrderService.selectByNo(waveNo);
+			if (!message.isSuccess()) {
+				return Message.fail("该波次单号或运单号不存在");
+			}
+			OutOrder order = (OutOrder) message.getExtend();
+			waveNo=order.getWaveNo();
+		}
+		OutWave outWave = outWaveService.getByWaveNo(waveNo);
+		if (outWave == null) {
+			return Message.fail("该波次单号不存在");
+		}
+		message.setSuccess(true);
+		OutWaveExpand printDetail = outWaveService.getPrintDetail(outWave.getId());
+
+		message.setExtend(printDetail);
+		return message;
+	}
+
+	@Override
 	public Message batchOutShelfPick1(AppRequest request, User user) {
 		return outWaveService.selectForSorting(request.getMsg());
 	}

wms-core-service/src/main/java/com/lote/wms/outstock/wave/service/impl/OutWaveServiceImpl.java

@@ -515,12 +515,18 @@ public class OutWaveServiceImpl implements OutWaveService {
 
 			// 添加至待推送
 			sendOutOrderStatusService.add(order, user, OutOrderOpTypeEnum.OUT_WEIGH);
+
+			//称重完成后自动发运
+			Message shipped = outOrderService.shipped(order.getOrderNo1(), user);
+			if (shipped.isSuccess()) {
+				message.setMsg(message.getMsg() + ",该订单已自动发运.");
+			}
 		}
 		int count = outOrderService.countUnWeighByWaveId(waveId);
 		if (count == 0) {
 			message.setExtend(true);
 		}
-		message.setMsg("波次称重成功,影响订单个数:" + list.size());
+		message.setMsg("波次称重成功,该订单已自动发运,影响订单个数:" + list.size());
 		message.setSuccess(true);
 		return message;
 	}

wms-operate/src/main/java/com/lote/wms/controller/api/app/APPController.java

@@ -146,6 +146,10 @@ public class APPController extends AbstractController {
 			if (StringUtil.isEqual(OpType.BATCH_OUT_SHELF_2, opType)) {
 				return appService.batchOutShelf2(request, user);
 			}
+			// 3.获取波次下架订单列表
+			if (StringUtil.isEqual(OpType.BATCH_OUT_SHELF_3, opType)) {
+				return appService.batchOutShelf3(request, user);
+			}
 			// 波次分揀 - 后端返回条码,箱子,商品数量, 由前端自行完成分拣
 			if (StringUtil.isEqual(OpType.BATCH_OUT_SHELF_PICK_1, opType)) {
 				return appService.batchOutShelfPick1(request, user);

wms-operate/src/main/resources/static/ui/js/outstock/wave/outWave/weigh.js

@@ -143,7 +143,7 @@ function submitOrderNo(){
 	 var orderNo = $("#orderNo").val();
 	 if(waveNo == ''){
 		 return;
-	 }	 
+	 }
 	 if(orderNo == ''){
 		 return;
 	 }

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

@@ -137,7 +137,6 @@
 					<input type="text" class="form-control wd220 allowClear" id="barcode" placeholder="输入后请按回车">
 					<input type="text" id="allocationId" style="display: none;">
 				</th>
-				 
 			</tr>
 			
 			<tr>