Merge branch 'master' of lsp/wms into master

wms-core-service/src/main/java/com/lote/wms/outstock/boxed/service/impl/OutBoxedServiceImpl.java

@@ -339,26 +339,18 @@ public class OutBoxedServiceImpl implements OutBoxedService {
 		if (isFinished) {
 			message.setMsg("出库单号:" + orderNo + ",完成称重,请操作下一单");
 			message.setExtend(isFinished);
-		}
 
-		// todo 判断是否为海关查验单，如果是就调用拦截，如果不是就发运
-		if (!StringUtil.isEmpty(order.getExtend1()) && "2".equals(order.getExtend1())) {
-			Message holdUp = outOrderService.holdUp(order.getId(), user);
-			if (holdUp.isSuccess()) {
-				message.setMsg(message.getMsg() + ",该订单为海关查验单,已自动拦截.");
-			} else {
-				message.setMsg(message.getMsg() + ","+holdUp.getMsg());
-			}
-		}
-		// 只有销售订单才自动发
-		if (!StringUtil.isEmpty(order.getExtend1()) && "0".equals(order.getExtend1()) && "1".equals(order.getTypeCode())) {
-			Message shipped = outOrderService.shipped(order.getOrderNo1(), user);
-			if (shipped.isSuccess()) {
-				message.setMsg(message.getMsg() + ",该订单已自动发运.");
-			} else {
-				message.setMsg(message.getMsg() + "," + shipped.getMsg());
-			}
+			// 只有销售订单才自动发
+//			if (!StringUtil.isEmpty(order.getExtend1()) && "0".equals(order.getExtend1()) && "1".equals(order.getTypeCode())) {
+				Message shipped = outOrderService.shipped(order.getOrderNo1(), user);
+				if (shipped.isSuccess()) {
+					message.setMsg(message.getMsg() + ",该订单已自动发运.");
+				} else {
+					message.setMsg(message.getMsg() + "," + shipped.getMsg());
+				}
+//			}
 		}
+
 		message.setSuccess(true);
 		return message;
 	}

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

@@ -213,9 +213,10 @@ public interface OutOrderService {
 	 * 判断订单状态, 是否已经完成称重 等
 	 * 
 	 * @param orderNo
+	 * @param user
 	 * @return
 	 */
-	Message selectForWeigh(String orderNo);
+	Message selectForWeigh(String orderNo, User user);
 
 	/**
 	 * 按订单号或者按跟踪号查询 只返回一个订单

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

@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Resource;
 
+import com.lote.wms.outstock.order.dao.OutOrderMapper;
 import org.apache.http.client.ClientProtocolException;
 import org.mybatis.plugin.model.Pager;
 import org.mybatis.plugin.util.PagerUtil;
@@ -82,7 +83,6 @@ import com.lote.wms.outstock.boxed.entity.OutBoxed;
 import com.lote.wms.outstock.boxed.entity.OutBoxedItem;
 import com.lote.wms.outstock.boxed.service.OutBoxedItemService;
 import com.lote.wms.outstock.boxed.service.OutBoxedService;
-import com.lote.wms.outstock.order.dao.OutOrderMapper;
 import com.lote.wms.outstock.order.entity.OutOrder;
 import com.lote.wms.outstock.order.entity.OutOrderBusinessType;
 import com.lote.wms.outstock.order.entity.OutOrderCriteria;
@@ -147,6 +147,9 @@ public class OutOrderServiceImpl implements OutOrderService {
 	@Autowired
 	private OutOrderMapper outOrderMapper;
 
+	@Autowired
+	private OutOrderService outOrderService;
+
 	@Resource
 	private WarehouseService warehouseService;
 
@@ -890,9 +893,6 @@ public class OutOrderServiceImpl implements OutOrderService {
 	 * 处理从单号库获取单号
 	 * 
 	 * @param order
-	 * @param message
-	 * @param user
-	 * @param opType
 	 * @return
 	 */
 	private TrackingNo getTrackingNoFromDB(OutOrder order) {
@@ -1433,7 +1433,7 @@ public class OutOrderServiceImpl implements OutOrderService {
 	}
 
 	@Override
-	public Message selectForWeigh(String orderNo) {
+	public Message selectForWeigh(String orderNo, User user) {
 		Message message = new Message();
 		message.setSuccess(false);
 
@@ -1478,6 +1478,16 @@ public class OutOrderServiceImpl implements OutOrderService {
 			message.setMsg("该订单未完成下架,不能操作称重");
 			return message;
 		}
+		// todo 判断是否为海关查验单，如果是就调用拦截，如果不是就发运
+		if (StringUtil.isNotNull(order.getExtend1()) && "2".equals(order.getExtend1())) {
+			Message holdUp = outOrderService.holdUp(order.getId(), user);
+			if (holdUp.isSuccess()) {
+				message.setMsg("该订单为海关查验单,已自动拦截.");
+			} else {
+				message.setMsg(holdUp.getMsg());
+			}
+			return message;
+		}
 
 		int boxNum = outBoxedService.countByOutOrderId(order.getId());// 不会计算空的箱子
 		if (boxNum < 1) {// 订单从未装箱

wms-operate/src/main/java/com/lote/wms/controller/operate/outstock/order/OutOrderController.java

@@ -218,7 +218,8 @@ public class OutOrderController extends AbstractController {
 	/**
 	 * 设置仓库
 	 * 
-	 * @param ids
+	 * @param orderIds
+	 * @param warehouseCode
 	 * @return
 	 */
 	@ResponseBody
@@ -234,7 +235,8 @@ public class OutOrderController extends AbstractController {
 	 *
 	 * 只能设置单号为空的出库单
 	 * 
-	 * @param ids
+	 * @param orderIds
+	 * @param shipwayCode
 	 * @return
 	 */
 	@ResponseBody
@@ -267,7 +269,7 @@ public class OutOrderController extends AbstractController {
 	 * 
 	 * 批量容易死锁,难以控制重复申请和并发
 	 * 
-	 * @param ids
+	 * @param id
 	 * @return
 	 */
 	@ResponseBody
@@ -323,7 +325,8 @@ public class OutOrderController extends AbstractController {
 	/**
 	 * 更新打印拣货单状态
 	 * 
-	 * @param orderIdList
+	 * @param isUpdateStatus
+	 * @param orderIds
 	 * @return
 	 */
 	@RequestMapping("printOutShelfUpdate")
@@ -383,7 +386,7 @@ public class OutOrderController extends AbstractController {
 	@RequestMapping(value = "/selectForWeigh", method = RequestMethod.POST)
 	@ResponseBody
 	public Result selectForWeigh(String orderNo) {
-		return MessageToResultAdapt.toResult(outOrderService.selectForWeigh(orderNo));
+		return MessageToResultAdapt.toResult(outOrderService.selectForWeigh(orderNo, getUser()));
 	}
 
 	/**
@@ -452,7 +455,7 @@ public class OutOrderController extends AbstractController {
 	/**
 	 * 手工建波次
 	 * 
-	 * @param idList
+	 * @param orderIdList
 	 * @return
 	 */
 	@RequestMapping("createWaveByManual")
@@ -465,7 +468,7 @@ public class OutOrderController extends AbstractController {
 	/**
 	 * 退出波次
 	 * 
-	 * @param idList
+	 * @param orderIdList
 	 * @return
 	 */
 	@RequestMapping("exitWave")
@@ -508,7 +511,8 @@ public class OutOrderController extends AbstractController {
 	 * 设置备注
 	 *
 	 * 
-	 * @param ids
+	 * @param orderId
+	 * @param remark
 	 * @return
 	 */
 	@ResponseBody
@@ -577,7 +581,7 @@ public class OutOrderController extends AbstractController {
 	/**
 	 * 格式化前端输入的单号
 	 * 
-	 * @param ids
+	 * @param orderNos
 	 * @return
 	 */
 	@ResponseBody