Merge remote-tracking branch 'origin/master'

wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/SpelUtil.java

@@ -106,8 +106,9 @@ public class SpelUtil {
                     Expression expression = SpelUtil.SPEL_PARSER.parseExpression(skip);
                     value = expression.getValue(context, String.class);
                 }catch (Exception ex){
-                    ex.printStackTrace();
-                    throw new BadRequestException("当前业务数据没有映射字段"+field+" 对应的数据"+skip);
+                    value ="";
+                   // ex.printStackTrace();
+//                    throw new BadRequestException("当前业务数据没有映射字段"+field+" 对应的数据"+skip);
                 }
             }else if(skip.contains("#V[")){
                 //直接指定参数#V['value'] = value

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java

@@ -64,6 +64,8 @@ public class PdaOutController {
         result.add(MapOf.of("text","生产用料清单","value","PRD_PPBOM"));
         result.add(MapOf.of("text","生产补料单","value","PRD_FeedMtrl"));
         result.add(MapOf.of("text","委外用料清单","value","SUB_PPBOM"));
+        result.add(MapOf.of("text","标准发货通知单","value","SAL_DELIVERYNOTICE"));
+        //result.add(MapOf.of("text","寄售发货通知单","value","SAL_DELIVERYNOTICE"));
         result.add(MapOf.of("text","采购退料申请单","value","PUR_MRAPP"));
         result.add(MapOf.of("text","直接调拨出库单","value","STK_TransferDirect"));
         result.add(MapOf.of("text","简单领料申请单","value","ka7c19edf9d4b4b39b8cc4a06802163b0"));