清关资料

@@ -11,6 +11,7 @@ import com.yoho.ufo.model.ChannelSkuCompareReq;
 import com.yoho.ufo.model.ChannelSkuCompareRspBo;
 import com.yoho.ufo.model.ChannelSkuCompareRspBo;
 import com.yoho.ufo.order.service.impl.exportbean.OrderInfoForPackageNum;
 import com.yoho.ufo.order.service.impl.exportbean.OrderInfoForPackageNum;
 import com.yoho.ufo.service.IBusinessExportService;
 import com.yoho.ufo.service.IBusinessExportService;
+import com.yoho.ufo.service.model.ApiResponse;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yoho.ufo.service.model.PageResponseBO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +26,7 @@ import java.util.Map;
 /**
 /**
  * Created by li.ma on 2019/7/19.
  * Created by li.ma on 2019/7/19.
  */
  */
-@Service
+@Service(value = "ClearanceRecordService")
 public class ClearanceRecordService implements IBusinessExportService {
 public class ClearanceRecordService implements IBusinessExportService {
     private static final Logger LOGGER = LoggerFactory.getLogger(ClearanceRecordService.class);
     private static final Logger LOGGER = LoggerFactory.getLogger(ClearanceRecordService.class);
 
 
@@ -71,6 +72,9 @@ public class ClearanceRecordService implements IBusinessExportService {
                 throw new ServiceException(400, "没有要导出的数据");
                 throw new ServiceException(400, "没有要导出的数据");
             }
             }
 
 
+            if (request.getOrderCode() == null && StringUtils.isEmpty(request.getWaybillCode())) {
+                throw new ServiceException(400, "没有要导出的数据");
+            }
 
 
             ClearanceRecord clearanceRecord = clearanceRecordMapper.selectByOrderCode(request);
             ClearanceRecord clearanceRecord = clearanceRecordMapper.selectByOrderCode(request);
             if (null == clearanceRecord) {
             if (null == clearanceRecord) {

@@ -93,6 +93,7 @@
         <entry key="couponServiceImpl" value-ref="couponServiceImpl"></entry>
         <entry key="couponServiceImpl" value-ref="couponServiceImpl"></entry>
         <entry key="channelSkuCompareServiceImpl" value-ref="channelSkuCompareServiceImpl"/>
         <entry key="channelSkuCompareServiceImpl" value-ref="channelSkuCompareServiceImpl"/>
         <entry key="productPoolDetailsServiceImpl" value-ref="productPoolDetailsServiceImpl"/>
         <entry key="productPoolDetailsServiceImpl" value-ref="productPoolDetailsServiceImpl"/>
+        <entry key="ClearanceRecordService" value-ref="ClearanceRecordService"/>
     </util:map>
     </util:map>
     
     
 </beans>  
 </beans>  

@@ -90,7 +90,7 @@
                 // var params = {"poolId": poolId.toString()};
                 // var params = {"poolId": poolId.toString()};
 
 
                 var param = getParams();
                 var param = getParams();
-                window.open(contextPath + "/batch/export.do?type=ClearanceRecordService&queryConf=" + JSON.stringify(param));
+                window.open(contextPath + "/batch/export.do?type=ClearanceRecordService&queryConf=" + escape(JSON.stringify(param)));
             }
             }
         });
         });
 
 
@@ -98,7 +98,7 @@
          * 提取出搜索参数
          * 提取出搜索参数
          */
          */
         function getParams() {
         function getParams() {
-            var waybillCode = $("#sellerWaybillCode").val();
+            var waybillCode = $("#waybillCode").val();
             var orderCode = $("#orderCode").val();
             var orderCode = $("#orderCode").val();
             var param = {};
             var param = {};
             if (undefined !== orderCode && null !== orderCode && "" !== orderCode) {
             if (undefined !== orderCode && null !== orderCode && "" !== orderCode) {