Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/CodeNumConstant.java

@@ -4,13 +4,8 @@ public class CodeNumConstant {
 
 	public final static int WAYBILL = 1;//运单号
 	public final static int ORDER = 2;//订单号
-	public final static int PSCC = 3;//配送车次号
-	public final static int PSJH = 4;//配送计划号
-	public final static int LOCATION = 5;//库位号
-	public final static int TRAYS = 6;//托盘号
+	public final static int TRAYS = 8;//托盘号
 	public final static int PACKAGE = 7;//包件号
-	public final static int SHELF = 8;//货架号
-	public final static int PSKH = 9;//配送客户号
 	public final static int ABNORMAL_ORDER = 10;//异常工单号
 	public final static int TRUNKLINEBILLLADING = 11;//干线提货单号
 	public final static int TRUNKLINE_CARS_LOAD = 12;//干线配载批次号