diff --git a/src/main/java/com/management/controller/GoodsPlanController.java b/src/main/java/com/management/controller/GoodsPlanController.java index de5547a..d28afc7 100644 --- a/src/main/java/com/management/controller/GoodsPlanController.java +++ b/src/main/java/com/management/controller/GoodsPlanController.java @@ -1013,19 +1013,21 @@ public class GoodsPlanController { } //快快拍模式 - String snapShot = trackingNumData.getString("snap_mode__c") != null ? trackingNumData.getString("snap_mode__c") : ""; - - switch (snapShot) { - case "yes": - trackingNumMap.put("f9w5_snapshot", true);//是否插卡 - break; - case "no": - trackingNumMap.put("f9w5_snapshot", false);//是否插卡 - break; - default: - trackingNumMap.put("f9w5_snapshot", null);//是否插卡 - break; - } +// String snapShot = trackingNumData.getString("snap_mode__c") != null ? trackingNumData.getString("snap_mode__c") : ""; +// +// switch (snapShot) { +// case "yes": +// trackingNumMap.put("f9w5_snapshot", true);//是否插卡 +// break; +// case "no": +// trackingNumMap.put("f9w5_snapshot", false);//是否插卡 +// break; +// default: +// trackingNumMap.put("f9w5_snapshot", null);//是否插卡 +// break; +// } + String snapShot = trackingNumData.getString("single_choice__c__r") != null ? trackingNumData.getString("single_choice__c__r") : ""; + trackingNumMap.put("f9w5_snapshotnew", snapShot); //前端智能识别 String isFront = trackingNumData.getString("front_end_intelligent_reco__c") != null ? trackingNumData.getString("front_end_intelligent_reco__c") : ""; @@ -1108,6 +1110,20 @@ public class GoodsPlanController { trackingNumMap.put("f9w5_material_number", trackingNumData.getString("material_code__c__r") != null ? trackingNumData.getString("material_code__c__r") : ""); //平台 trackingNumMap.put("f9w5_smplatform_number", trackingNumData.getString("platform_name_code__c") != null ? trackingNumData.getString("platform_name_code__c") : ""); + //导入证书 + trackingNumMap.put("f9w5_iptcertificate", trackingNumData.getString("import_certificate__c__r") != null ? trackingNumData.getString("import_certificate__c__r") : ""); + //出厂编号 + trackingNumMap.put("f9w5_factorynum", trackingNumData.getString("factory_serial_number__c__r") != null ? trackingNumData.getString("factory_serial_number__c__r") : ""); + //合同号 + trackingNumMap.put("f9w5_contractno", trackingNumData.getString("f9w5_outplatform__c") != null ? trackingNumData.getString("f9w5_outplatform__c") : ""); + //是否开启快拍 + trackingNumMap.put("f9w5_issnapshot", trackingNumData.getString("is_fast_snapshot_enabled__c__r") != null ? trackingNumData.getString("is_fast_snapshot_enabled__c__r") : ""); + //是否插卡 + trackingNumMap.put("f9w5_insertcard", trackingNumData.getString("is_card_inserted__c__r") != null ? trackingNumData.getString("is_card_inserted__c__r") : ""); + //图片上传间隔 + trackingNumMap.put("f9w5_picintermission", trackingNumData.getString("image_upload_interval__c") != null ? trackingNumData.getString("image_upload_interval__c") : ""); + //通道 + trackingNumMap.put("f9w5_channel", trackingNumData.getString("channel__c__r") != null ? trackingNumData.getString("channel__c__r") : ""); //todo 来源单据类型.编码 trackingNumMap.put("sourcebilltype_number", "f9w5_sm_purchaseplan_BT");