波次称重自动发运

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

@@ -465,6 +465,7 @@ public class OutWaveServiceImpl implements OutWaveService {
 		String productdigest = orderGp.getProductDigest();// 2019-04-20更准确
 
 		List<OutOrder> list = outOrderService.listByWaveIdAndProductDigest(waveId, productdigest);
+		int shippedSize = 0;	//自动发运订单数
 		Long now = System.currentTimeMillis();
 		for (OutOrder order : list) {
 			if (StringUtil.isEquals(order.getIsCancel(), BaseConstant.Y)) {
@@ -485,6 +486,11 @@ public class OutWaveServiceImpl implements OutWaveService {
 			if (order.getOutWeight() != null && order.getOutWeight() > 0) {
 				continue;
 			}
+			//判断是否为海关查验单，如果是就调用拦截，如果不是就发运
+			if (StringUtil.isNotNull(order.getExtend1()) && "2".equals(order.getExtend1())) {
+				outOrderService.holdUp(order.getId(), user);
+				continue;
+			}
 			order.setOutWeight(outWeight);
 			order.setOutWeightTime(new Date(now));
 
@@ -510,12 +516,18 @@ public class OutWaveServiceImpl implements OutWaveService {
 
 			// 添加至待推送
 			sendOutOrderStatusService.add(order, user, OutOrderOpTypeEnum.OUT_WEIGH);
+
+			//称重完成后自动发运
+			Message shipped = outOrderService.shipped(order.getOrderNo1(), user);
+			if (shipped.isSuccess()) {
+				shippedSize += 1;
+			}
 		}
 		int count = outOrderService.countUnWeighByWaveId(waveId);
 		if (count == 0) {
 			message.setExtend(true);
 		}
-		message.setMsg("波次称重成功,影响订单个数:" + list.size());
+		message.setMsg("波次称重成功,影响订单个数:" + list.size() + ",自动发运订单数:" + shippedSize);
 		message.setSuccess(true);
 		return message;
 	}